mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 04:13:53 -06:00

- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= =cjz8 -----END PGP SIGNATURE----- Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging Accel & Exec patch queue - Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= # =cjz8 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits) util/qemu-timer: fix indentation meson: Do not define CONFIG_DEVICES on user emulation system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header system/numa: Remove unnecessary 'exec/cpu-common.h' header hw/xen: Remove unnecessary 'exec/cpu-common.h' header target/mips: Drop left-over comment about Jazz machine target/mips: Remove tswap() calls in semihosting uhi_fstat_cb() target/xtensa: Remove tswap() calls in semihosting simcall() helper accel/tcg: Un-inline translator_is_same_page() accel/tcg: Include missing 'exec/translation-block.h' header accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h' accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h' qemu/coroutine: Include missing 'qemu/atomic.h' header exec/translation-block: Include missing 'qemu/atomic.h' header accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h' exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined target/sparc: Move sparc_restore_state_to_opc() to cpu.c target/sparc: Uninline cpu_get_tb_cpu_state() target/loongarch: Declare loongarch_cpu_dump_state() locally user: Move various declarations out of 'exec/exec-all.h' ... Conflicts: hw/char/riscv_htif.c hw/intc/riscv_aplic.c target/s390x/cpu.c Apply sysemu header path changes to not in the pull request. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
275 lines
7.4 KiB
C
275 lines
7.4 KiB
C
/*
|
|
* VFIO based AP matrix device assignment
|
|
*
|
|
* Copyright 2018 IBM Corp.
|
|
* Author(s): Tony Krowiak <akrowiak@linux.ibm.com>
|
|
* Halil Pasic <pasic@linux.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include CONFIG_DEVICES /* CONFIG_IOMMUFD */
|
|
#include <linux/vfio.h>
|
|
#include <sys/ioctl.h>
|
|
#include "qapi/error.h"
|
|
#include "hw/vfio/vfio-common.h"
|
|
#include "system/iommufd.h"
|
|
#include "hw/s390x/ap-device.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/event_notifier.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "qemu/module.h"
|
|
#include "qemu/option.h"
|
|
#include "qemu/config-file.h"
|
|
#include "kvm/kvm_s390x.h"
|
|
#include "migration/vmstate.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/s390x/ap-bridge.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "qom/object.h"
|
|
|
|
#define TYPE_VFIO_AP_DEVICE "vfio-ap"
|
|
|
|
struct VFIOAPDevice {
|
|
APDevice apdev;
|
|
VFIODevice vdev;
|
|
EventNotifier req_notifier;
|
|
};
|
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)
|
|
|
|
static void vfio_ap_compute_needs_reset(VFIODevice *vdev)
|
|
{
|
|
vdev->needs_reset = false;
|
|
}
|
|
|
|
/*
|
|
* We don't need vfio_hot_reset_multi and vfio_eoi operations for
|
|
* vfio-ap device now.
|
|
*/
|
|
struct VFIODeviceOps vfio_ap_ops = {
|
|
.vfio_compute_needs_reset = vfio_ap_compute_needs_reset,
|
|
};
|
|
|
|
static void vfio_ap_req_notifier_handler(void *opaque)
|
|
{
|
|
VFIOAPDevice *vapdev = opaque;
|
|
Error *err = NULL;
|
|
|
|
if (!event_notifier_test_and_clear(&vapdev->req_notifier)) {
|
|
return;
|
|
}
|
|
|
|
qdev_unplug(DEVICE(vapdev), &err);
|
|
|
|
if (err) {
|
|
warn_reportf_err(err, VFIO_MSG_PREFIX, vapdev->vdev.name);
|
|
}
|
|
}
|
|
|
|
static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
|
|
unsigned int irq, Error **errp)
|
|
{
|
|
int fd;
|
|
size_t argsz;
|
|
IOHandler *fd_read;
|
|
EventNotifier *notifier;
|
|
g_autofree struct vfio_irq_info *irq_info = NULL;
|
|
VFIODevice *vdev = &vapdev->vdev;
|
|
|
|
switch (irq) {
|
|
case VFIO_AP_REQ_IRQ_INDEX:
|
|
notifier = &vapdev->req_notifier;
|
|
fd_read = vfio_ap_req_notifier_handler;
|
|
break;
|
|
default:
|
|
error_setg(errp, "vfio: Unsupported device irq(%d)", irq);
|
|
return false;
|
|
}
|
|
|
|
if (vdev->num_irqs < irq + 1) {
|
|
error_setg(errp, "vfio: IRQ %u not available (number of irqs %u)",
|
|
irq, vdev->num_irqs);
|
|
return false;
|
|
}
|
|
|
|
argsz = sizeof(*irq_info);
|
|
irq_info = g_malloc0(argsz);
|
|
irq_info->index = irq;
|
|
irq_info->argsz = argsz;
|
|
|
|
if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO,
|
|
irq_info) < 0 || irq_info->count < 1) {
|
|
error_setg_errno(errp, errno, "vfio: Error getting irq info");
|
|
return false;
|
|
}
|
|
|
|
if (event_notifier_init(notifier, 0)) {
|
|
error_setg_errno(errp, errno,
|
|
"vfio: Unable to init event notifier for irq (%d)",
|
|
irq);
|
|
return false;
|
|
}
|
|
|
|
fd = event_notifier_get_fd(notifier);
|
|
qemu_set_fd_handler(fd, fd_read, NULL, vapdev);
|
|
|
|
if (!vfio_set_irq_signaling(vdev, irq, 0, VFIO_IRQ_SET_ACTION_TRIGGER, fd,
|
|
errp)) {
|
|
qemu_set_fd_handler(fd, NULL, NULL, vapdev);
|
|
event_notifier_cleanup(notifier);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
|
|
unsigned int irq)
|
|
{
|
|
Error *err = NULL;
|
|
EventNotifier *notifier;
|
|
|
|
switch (irq) {
|
|
case VFIO_AP_REQ_IRQ_INDEX:
|
|
notifier = &vapdev->req_notifier;
|
|
break;
|
|
default:
|
|
error_report("vfio: Unsupported device irq(%d)", irq);
|
|
return;
|
|
}
|
|
|
|
if (!vfio_set_irq_signaling(&vapdev->vdev, irq, 0,
|
|
VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) {
|
|
warn_reportf_err(err, VFIO_MSG_PREFIX, vapdev->vdev.name);
|
|
}
|
|
|
|
qemu_set_fd_handler(event_notifier_get_fd(notifier),
|
|
NULL, NULL, vapdev);
|
|
event_notifier_cleanup(notifier);
|
|
}
|
|
|
|
static void vfio_ap_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
ERRP_GUARD();
|
|
Error *err = NULL;
|
|
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev);
|
|
VFIODevice *vbasedev = &vapdev->vdev;
|
|
|
|
if (!vfio_device_get_name(vbasedev, errp)) {
|
|
return;
|
|
}
|
|
|
|
if (!vfio_attach_device(vbasedev->name, vbasedev,
|
|
&address_space_memory, errp)) {
|
|
goto error;
|
|
}
|
|
|
|
if (!vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err)) {
|
|
/*
|
|
* Report this error, but do not make it a failing condition.
|
|
* Lack of this IRQ in the host does not prevent normal operation.
|
|
*/
|
|
warn_report_err(err);
|
|
}
|
|
|
|
return;
|
|
|
|
error:
|
|
error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
|
|
g_free(vbasedev->name);
|
|
}
|
|
|
|
static void vfio_ap_unrealize(DeviceState *dev)
|
|
{
|
|
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev);
|
|
|
|
vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX);
|
|
vfio_detach_device(&vapdev->vdev);
|
|
g_free(vapdev->vdev.name);
|
|
}
|
|
|
|
static const Property vfio_ap_properties[] = {
|
|
DEFINE_PROP_STRING("sysfsdev", VFIOAPDevice, vdev.sysfsdev),
|
|
#ifdef CONFIG_IOMMUFD
|
|
DEFINE_PROP_LINK("iommufd", VFIOAPDevice, vdev.iommufd,
|
|
TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),
|
|
#endif
|
|
};
|
|
|
|
static void vfio_ap_reset(DeviceState *dev)
|
|
{
|
|
int ret;
|
|
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev);
|
|
|
|
ret = ioctl(vapdev->vdev.fd, VFIO_DEVICE_RESET);
|
|
if (ret) {
|
|
error_report("%s: failed to reset %s device: %s", __func__,
|
|
vapdev->vdev.name, strerror(errno));
|
|
}
|
|
}
|
|
|
|
static const VMStateDescription vfio_ap_vmstate = {
|
|
.name = "vfio-ap",
|
|
.unmigratable = 1,
|
|
};
|
|
|
|
static void vfio_ap_instance_init(Object *obj)
|
|
{
|
|
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(obj);
|
|
VFIODevice *vbasedev = &vapdev->vdev;
|
|
|
|
/*
|
|
* vfio-ap devices operate in a way compatible with discarding of
|
|
* memory in RAM blocks, as no pages are pinned in the host.
|
|
* This needs to be set before vfio_get_device() for vfio common to
|
|
* handle ram_block_discard_disable().
|
|
*/
|
|
vfio_device_init(vbasedev, VFIO_DEVICE_TYPE_AP, &vfio_ap_ops,
|
|
DEVICE(vapdev), true);
|
|
|
|
/* AP device is mdev type device */
|
|
vbasedev->mdev = true;
|
|
}
|
|
|
|
#ifdef CONFIG_IOMMUFD
|
|
static void vfio_ap_set_fd(Object *obj, const char *str, Error **errp)
|
|
{
|
|
vfio_device_set_fd(&VFIO_AP_DEVICE(obj)->vdev, str, errp);
|
|
}
|
|
#endif
|
|
|
|
static void vfio_ap_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
device_class_set_props(dc, vfio_ap_properties);
|
|
#ifdef CONFIG_IOMMUFD
|
|
object_class_property_add_str(klass, "fd", NULL, vfio_ap_set_fd);
|
|
#endif
|
|
dc->vmsd = &vfio_ap_vmstate;
|
|
dc->desc = "VFIO-based AP device assignment";
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
dc->realize = vfio_ap_realize;
|
|
dc->unrealize = vfio_ap_unrealize;
|
|
dc->hotpluggable = true;
|
|
device_class_set_legacy_reset(dc, vfio_ap_reset);
|
|
dc->bus_type = TYPE_AP_BUS;
|
|
}
|
|
|
|
static const TypeInfo vfio_ap_info = {
|
|
.name = TYPE_VFIO_AP_DEVICE,
|
|
.parent = TYPE_AP_DEVICE,
|
|
.instance_size = sizeof(VFIOAPDevice),
|
|
.instance_init = vfio_ap_instance_init,
|
|
.class_init = vfio_ap_class_init,
|
|
};
|
|
|
|
static void vfio_ap_type_init(void)
|
|
{
|
|
type_register_static(&vfio_ap_info);
|
|
}
|
|
|
|
type_init(vfio_ap_type_init)
|