- Revert "linux-user: Print tid not pid with strace" - gpex-acpi: Remove duplicate DSM #5 - smmuv3: Use default bus for arm-smmuv3-accel - smmuv3: Change arm-smmuv3-nested name to arm-smmuv3-accel - smmu-common: Return sysmem address space only for vfio-pci - smmuv3: realize get_pasid_cap and set ssidsize with pasid - vfio: Synthesize vPASID capability to VM - backend/iommufd: Report PASID capability - pci: Get pasid capability from vIOMMU - smmuv3: Add support for page fault handling - kvm: Translate MSI doorbell address only if it is valid - hw/arm/smmuv3: Enable sva/stall IDR features - iommufd.h: Updated to openeuler olk-6.6 kernel - tests/data/acpi/virt: Update IORT acpi table - hw/arm/virt-acpi-build: Add IORT RMR regions to handle MSI nested binding - tests/qtest: Allow IORT acpi table to change - hw/arm/virt-acpi-build: Build IORT with multiple SMMU nodes - hw/arm/smmuv3: Associate a pci bus with a SMMUv3 Nested device - hw/arm/smmuv3: Add initial support for SMMUv3 Nested device - hw/arm/virt: Add an SMMU_IO_LEN macro - hw/pci-host/gpex: [needs kernel fix] Allow to generate preserve boot config DSM #5 - tests/data/acpi: Update DSDT acpi tables - acpi/gpex: Fix PCI Express Slot Information function 0 returned value - tests/qtest: Allow DSDT acpi tables to change - hw/arm/smmuv3: Forward cache invalidate commands via iommufd - hw/arm/smmu-common: Replace smmu_iommu_mr with smmu_find_sdev - hw/arm/smmuv3: Add missing STE invalidation - hw/arm/smmuv3: Add smmu_dev_install_nested_ste() for CFGI_STE - hw/arm/smmuv3: Check idr registers for STE_S1CDMAX and STE_S1STALLD - hw/arm/smmuv3: Read host SMMU device info - hw/arm/smmuv3: Ignore IOMMU_NOTIFIER_MAP for nested-smmuv3 - hw/arm/smmu-common: Return sysmem if stage-1 is bypassed - hw/arm/smmu-common: Add iommufd helpers - hw/arm/smmu-common: Add set/unset_iommu_device callback - hw/arm/smmu-common: Extract smmu_get_sbus and smmu_get_sdev helpers - hw/arm/smmu-common: Bypass emulated IOTLB for a nested SMMU - hw/arm/smmu-common: Add a nested flag to SMMUState - backends/iommufd: Introduce iommufd_viommu_invalidate_cache - backends/iommufd: Introduce iommufd_vdev_alloc - backends/iommufd: Introduce iommufd_backend_alloc_viommu - vfio/iommufd: Implement [at|de]tach_hwpt handlers - vfio/iommufd: Implement HostIOMMUDeviceClass::realize_late() handler - HostIOMMUDevice: Introduce realize_late callback - vfio/iommufd: Add properties and handlers to TYPE_HOST_IOMMU_DEVICE_IOMMUFD - backends/iommufd: Add helpers for invalidating user-managed HWPT - Update iommufd.h header for vSVA - vfio/common: Allow disabling device dirty page tracking - vfio/migration: Don't block migration device dirty tracking is unsupported - vfio/iommufd: Implement VFIOIOMMUClass::query_dirty_bitmap support - vfio/iommufd: Implement VFIOIOMMUClass::set_dirty_tracking support - vfio/iommufd: Probe and request hwpt dirty tracking capability - vfio/{iommufd, container}: Invoke HostIOMMUDevice::realize() during attach_device() - vfio/iommufd: Add hw_caps field to HostIOMMUDeviceCaps - vfio/{iommufd,container}: Remove caps::aw_bits - HostIOMMUDevice: Store the VFIO/VDPA agent - vfio/iommufd: Introduce auto domain creation - vfio/ccw: Don't initialize HOST_IOMMU_DEVICE with mdev - vfio/ap: Don't initialize HOST_IOMMU_DEVICE with mdev - vfio/iommufd: Return errno in iommufd_cdev_attach_ioas_hwpt() - backends/iommufd: Extend iommufd_backend_get_device_info() to fetch HW capabilities - vfio/iommufd: Don't initialize nor set a HOST_IOMMU_DEVICE with mdev - vfio/pci: Extract mdev check into an helper - intel_iommu: Check compatibility with host IOMMU capabilities - intel_iommu: Implement [set|unset]_iommu_device() callbacks - intel_iommu: Extract out vtd_cap_init() to initialize cap/ecap - vfio/pci: Pass HostIOMMUDevice to vIOMMU - hw/pci: Introduce pci_device_[set|unset]_iommu_device() - hw/pci: Introduce helper function pci_device_get_iommu_bus_devfn() - vfio: Create host IOMMU device instance - backends/iommufd: Implement HostIOMMUDeviceClass::get_cap() handler - vfio/container: Implement HostIOMMUDeviceClass::get_cap() handler - vfio/iommufd: Implement HostIOMMUDeviceClass::realize() handler - backends/iommufd: Introduce helper function iommufd_backend_get_device_info() - vfio/container: Implement HostIOMMUDeviceClass::realize() handler - range: Introduce range_get_last_bit() - backends/iommufd: Introduce TYPE_HOST_IOMMU_DEVICE_IOMMUFD[_VFIO] devices - vfio/container: Introduce TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO device - backends/host_iommu_device: Introduce HostIOMMUDeviceCaps - backends: Introduce HostIOMMUDevice abstract - vfio/iommufd: Remove CONFIG_IOMMUFD usage - vfio/spapr: Extend VFIOIOMMUOps with a release handler - vfio/spapr: Only compile sPAPR IOMMU support when needed - vfio/iommufd: Introduce a VFIOIOMMU iommufd QOM interface - vfio/spapr: Introduce a sPAPR VFIOIOMMU QOM interface - vfio/container: Intoduce a new VFIOIOMMUClass::setup handler - vfio/container: Introduce a VFIOIOMMU legacy QOM interface - vfio/container: Introduce a VFIOIOMMU QOM interface - vfio/container: Initialize VFIOIOMMUOps under vfio_init_container() - vfio/container: Introduce vfio_legacy_setup() for further cleanups - docs/devel: Add VFIO iommufd backend documentation - vfio: Introduce a helper function to initialize VFIODevice - vfio/ccw: Move VFIODevice initializations in vfio_ccw_instance_init - vfio/ap: Move VFIODevice initializations in vfio_ap_instance_init - vfio/platform: Move VFIODevice initializations in vfio_platform_instance_init - vfio/pci: Move VFIODevice initializations in vfio_instance_init - hw/i386: Activate IOMMUFD for q35 machines - kconfig: Activate IOMMUFD for s390x machines - hw/arm: Activate IOMMUFD for virt machines - vfio: Make VFIOContainerBase poiner parameter const in VFIOIOMMUOps callbacks - vfio/ccw: Make vfio cdev pre-openable by passing a file handle - vfio/ccw: Allow the selection of a given iommu backend - vfio/ap: Make vfio cdev pre-openable by passing a file handle - vfio/ap: Allow the selection of a given iommu backend - vfio/platform: Make vfio cdev pre-openable by passing a file handle - vfio/platform: Allow the selection of a given iommu backend - vfio/pci: Make vfio cdev pre-openable by passing a file handle - vfio/pci: Allow the selection of a given iommu backend - vfio/iommufd: Enable pci hot reset through iommufd cdev interface - vfio/pci: Introduce a vfio pci hot reset interface - vfio/pci: Extract out a helper vfio_pci_get_pci_hot_reset_info - vfio/iommufd: Add support for iova_ranges and pgsizes - vfio/iommufd: Relax assert check for iommufd backend - vfio/iommufd: Implement the iommufd backend - vfio/common: return early if space isn't empty - util/char_dev: Add open_cdev() - backends/iommufd: Introduce the iommufd object - vfio/spapr: Move hostwin_list into spapr container - vfio/spapr: Move prereg_listener into spapr container - vfio/spapr: switch to spapr IOMMU BE add/del_section_window - vfio/spapr: Introduce spapr backend and target interface - vfio/container: Implement attach/detach_device - vfio/container: Move iova_ranges to base container - vfio/container: Move dirty_pgsizes and max_dirty_bitmap_size to base container - vfio/container: Move listener to base container - vfio/container: Move vrdl_list to base container - vfio/container: Move pgsizes and dma_max_mappings to base container - vfio/container: Convert functions to base container - vfio/container: Move per container device list in base container - vfio/container: Switch to IOMMU BE set_dirty_page_tracking/query_dirty_bitmap API - vfio/container: Move space field to base container - vfio/common: Move giommu_list in base container - vfio/common: Introduce vfio_container_init/destroy helper - vfio/container: Switch to dma_map|unmap API - vfio/container: Introduce a empty VFIOIOMMUOps - vfio: Introduce base object for VFIOContainer and targeted interface - cryptodev: Fix error handling in cryptodev_lkcf_execute_task() - hw/xen: Fix xen_bus_realize() error handling - hw/misc/aspeed_hace: Fix buffer overflow in has_padding function - target/s390x: Fix a typo in s390_cpu_class_init() - hw/sd/sdhci: free irq on exit - hw/ufs: free irq on exit - hw/pci-host/designware: Fix ATU_UPPER_TARGET register access - target/i386: Make invtsc migratable when user sets tsc-khz explicitly - target/i386: Construct CPUID 2 as stateful iff times > 1 - target/i386: Enable fdp-excptn-only and zero-fcs-fds - target/i386: Don't construct a all-zero entry for CPUID[0xD 0x3f] - i386/cpuid: Remove subleaf constraint on CPUID leaf 1F - target/i386: pass X86CPU to x86_cpu_get_supported_feature_word - target/i386: Raise the highest index value used for any VMCS encoding - target/i386: Add VMX control bits for nested FRED support - target/i386: Delete duplicated macro definition CR4_FRED_MASK - target/i386: Add get/set/migrate support for FRED MSRs - target/i386: enumerate VMX nested-exception support - vmxcap: add support for VMX FRED controls - target/i386: mark CR4.FRED not reserved - target/i386: add support for FRED in CPUID enumeration - target/i386: fix feature dependency for WAITPKG - target/i386: Add more features enumerated by CPUID.7.2.EDX - net: fix build when libbpf is disabled, but libxdp is enabled - hw/nvme: fix invalid endian conversion - hw/nvme: fix invalid check on mcl - backends/cryptodev: Do not ignore throttle/backends Errors - backends/cryptodev: Do not abort for invalid session ID - virtcca: add kvm isolation when get tmi version. - qga: Don't daemonize before channel is initialized - qga: Add log to guest-fsfreeze-thaw command - backends: VirtCCA: cvm_gpa_start supports both 1GB and 3GB - BUGFIX: Enforce isolation for virtcca_shared_hugepage - arm: VirtCCA: qemu CoDA support UEFI boot - arm: VirtCCA: Compatibility with older versions of TMM and the kernel - arm: VirtCCA: qemu uefi boot support kae - arm: VirtCCA: CVM support UEFI boot Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 85fd7a435d8203dde56fedc4c8f500e41faf132c)
208 lines
6.8 KiB
Diff
208 lines
6.8 KiB
Diff
From de17750e24d4e583e9f392bbe47e4bd1aa81d6bc Mon Sep 17 00:00:00 2001
|
|
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Date: Sat, 11 Jan 2025 10:52:45 +0800
|
|
Subject: [PATCH] vfio/iommufd: Enable pci hot reset through iommufd cdev
|
|
interface
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Implement the newly introduced pci_hot_reset callback named
|
|
iommufd_cdev_pci_hot_reset to do iommufd specific check and
|
|
reset operation.
|
|
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
|
Tested-by: Eric Auger <eric.auger@redhat.com>
|
|
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
|
|
---
|
|
hw/vfio/iommufd.c | 150 +++++++++++++++++++++++++++++++++++++++++++
|
|
hw/vfio/trace-events | 1 +
|
|
2 files changed, 151 insertions(+)
|
|
|
|
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
|
|
index 01b448e840..6e53e013ef 100644
|
|
--- a/hw/vfio/iommufd.c
|
|
+++ b/hw/vfio/iommufd.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "sysemu/reset.h"
|
|
#include "qemu/cutils.h"
|
|
#include "qemu/chardev_open.h"
|
|
+#include "pci.h"
|
|
|
|
static int iommufd_cdev_map(VFIOContainerBase *bcontainer, hwaddr iova,
|
|
ram_addr_t size, void *vaddr, bool readonly)
|
|
@@ -468,9 +469,158 @@ static void iommufd_cdev_detach(VFIODevice *vbasedev)
|
|
close(vbasedev->fd);
|
|
}
|
|
|
|
+static VFIODevice *iommufd_cdev_pci_find_by_devid(__u32 devid)
|
|
+{
|
|
+ VFIODevice *vbasedev_iter;
|
|
+
|
|
+ QLIST_FOREACH(vbasedev_iter, &vfio_device_list, global_next) {
|
|
+ if (vbasedev_iter->bcontainer->ops != &vfio_iommufd_ops) {
|
|
+ continue;
|
|
+ }
|
|
+ if (devid == vbasedev_iter->devid) {
|
|
+ return vbasedev_iter;
|
|
+ }
|
|
+ }
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
+static VFIOPCIDevice *
|
|
+iommufd_cdev_dep_get_realized_vpdev(struct vfio_pci_dependent_device *dep_dev,
|
|
+ VFIODevice *reset_dev)
|
|
+{
|
|
+ VFIODevice *vbasedev_tmp;
|
|
+
|
|
+ if (dep_dev->devid == reset_dev->devid ||
|
|
+ dep_dev->devid == VFIO_PCI_DEVID_OWNED) {
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ vbasedev_tmp = iommufd_cdev_pci_find_by_devid(dep_dev->devid);
|
|
+ if (!vbasedev_tmp || !vbasedev_tmp->dev->realized ||
|
|
+ vbasedev_tmp->type != VFIO_DEVICE_TYPE_PCI) {
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ return container_of(vbasedev_tmp, VFIOPCIDevice, vbasedev);
|
|
+}
|
|
+
|
|
+static int iommufd_cdev_pci_hot_reset(VFIODevice *vbasedev, bool single)
|
|
+{
|
|
+ VFIOPCIDevice *vdev = container_of(vbasedev, VFIOPCIDevice, vbasedev);
|
|
+ struct vfio_pci_hot_reset_info *info = NULL;
|
|
+ struct vfio_pci_dependent_device *devices;
|
|
+ struct vfio_pci_hot_reset *reset;
|
|
+ int ret, i;
|
|
+ bool multi = false;
|
|
+
|
|
+ trace_vfio_pci_hot_reset(vdev->vbasedev.name, single ? "one" : "multi");
|
|
+
|
|
+ if (!single) {
|
|
+ vfio_pci_pre_reset(vdev);
|
|
+ }
|
|
+ vdev->vbasedev.needs_reset = false;
|
|
+
|
|
+ ret = vfio_pci_get_pci_hot_reset_info(vdev, &info);
|
|
+
|
|
+ if (ret) {
|
|
+ goto out_single;
|
|
+ }
|
|
+
|
|
+ assert(info->flags & VFIO_PCI_HOT_RESET_FLAG_DEV_ID);
|
|
+
|
|
+ devices = &info->devices[0];
|
|
+
|
|
+ if (!(info->flags & VFIO_PCI_HOT_RESET_FLAG_DEV_ID_OWNED)) {
|
|
+ if (!vdev->has_pm_reset) {
|
|
+ for (i = 0; i < info->count; i++) {
|
|
+ if (devices[i].devid == VFIO_PCI_DEVID_NOT_OWNED) {
|
|
+ error_report("vfio: Cannot reset device %s, "
|
|
+ "depends on device %04x:%02x:%02x.%x "
|
|
+ "which is not owned.",
|
|
+ vdev->vbasedev.name, devices[i].segment,
|
|
+ devices[i].bus, PCI_SLOT(devices[i].devfn),
|
|
+ PCI_FUNC(devices[i].devfn));
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ ret = -EPERM;
|
|
+ goto out_single;
|
|
+ }
|
|
+
|
|
+ trace_vfio_pci_hot_reset_has_dep_devices(vdev->vbasedev.name);
|
|
+
|
|
+ for (i = 0; i < info->count; i++) {
|
|
+ VFIOPCIDevice *tmp;
|
|
+
|
|
+ trace_iommufd_cdev_pci_hot_reset_dep_devices(devices[i].segment,
|
|
+ devices[i].bus,
|
|
+ PCI_SLOT(devices[i].devfn),
|
|
+ PCI_FUNC(devices[i].devfn),
|
|
+ devices[i].devid);
|
|
+
|
|
+ /*
|
|
+ * If a VFIO cdev device is resettable, all the dependent devices
|
|
+ * are either bound to same iommufd or within same iommu_groups as
|
|
+ * one of the iommufd bound devices.
|
|
+ */
|
|
+ assert(devices[i].devid != VFIO_PCI_DEVID_NOT_OWNED);
|
|
+
|
|
+ tmp = iommufd_cdev_dep_get_realized_vpdev(&devices[i], &vdev->vbasedev);
|
|
+ if (!tmp) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (single) {
|
|
+ ret = -EINVAL;
|
|
+ goto out_single;
|
|
+ }
|
|
+ vfio_pci_pre_reset(tmp);
|
|
+ tmp->vbasedev.needs_reset = false;
|
|
+ multi = true;
|
|
+ }
|
|
+
|
|
+ if (!single && !multi) {
|
|
+ ret = -EINVAL;
|
|
+ goto out_single;
|
|
+ }
|
|
+
|
|
+ /* Use zero length array for hot reset with iommufd backend */
|
|
+ reset = g_malloc0(sizeof(*reset));
|
|
+ reset->argsz = sizeof(*reset);
|
|
+
|
|
+ /* Bus reset! */
|
|
+ ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_PCI_HOT_RESET, reset);
|
|
+ g_free(reset);
|
|
+ if (ret) {
|
|
+ ret = -errno;
|
|
+ }
|
|
+
|
|
+ trace_vfio_pci_hot_reset_result(vdev->vbasedev.name,
|
|
+ ret ? strerror(errno) : "Success");
|
|
+
|
|
+ /* Re-enable INTx on affected devices */
|
|
+ for (i = 0; i < info->count; i++) {
|
|
+ VFIOPCIDevice *tmp;
|
|
+
|
|
+ tmp = iommufd_cdev_dep_get_realized_vpdev(&devices[i], &vdev->vbasedev);
|
|
+ if (!tmp) {
|
|
+ continue;
|
|
+ }
|
|
+ vfio_pci_post_reset(tmp);
|
|
+ }
|
|
+out_single:
|
|
+ if (!single) {
|
|
+ vfio_pci_post_reset(vdev);
|
|
+ }
|
|
+ g_free(info);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
const VFIOIOMMUOps vfio_iommufd_ops = {
|
|
.dma_map = iommufd_cdev_map,
|
|
.dma_unmap = iommufd_cdev_unmap,
|
|
.attach_device = iommufd_cdev_attach,
|
|
.detach_device = iommufd_cdev_detach,
|
|
+ .pci_hot_reset = iommufd_cdev_pci_hot_reset,
|
|
};
|
|
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
|
|
index 3340c93af0..8fdde54456 100644
|
|
--- a/hw/vfio/trace-events
|
|
+++ b/hw/vfio/trace-events
|
|
@@ -174,3 +174,4 @@ iommufd_cdev_detach_ioas_hwpt(int iommufd, const char *name) " [iommufd=%d] Succ
|
|
iommufd_cdev_fail_attach_existing_container(const char *msg) " %s"
|
|
iommufd_cdev_alloc_ioas(int iommufd, int ioas_id) " [iommufd=%d] new IOMMUFD container with ioasid=%d"
|
|
iommufd_cdev_device_info(char *name, int devfd, int num_irqs, int num_regions, int flags) " %s (%d) num_irqs=%d num_regions=%d flags=%d"
|
|
+iommufd_cdev_pci_hot_reset_dep_devices(int domain, int bus, int slot, int function, int dev_id) "\t%04x:%02x:%02x.%x devid %d"
|
|
--
|
|
2.41.0.windows.1
|
|
|