@@ -202,6 +202,7 @@ static struct pci_driver vfio_pci_driver = {
.remove = vfio_pci_remove,
.sriov_configure = vfio_pci_sriov_configure,
.err_handler = &vfio_pci_core_err_handlers,
+ .tsm_handler = &vfio_pci_core_tsm_handlers,
.driver_managed_dma = true,
};
@@ -20,6 +20,7 @@
#include <linux/mutex.h>
#include <linux/notifier.h>
#include <linux/pci.h>
+#include <linux/pci-tsm.h>
#include <linux/pfn_t.h>
#include <linux/pm_runtime.h>
#include <linux/slab.h>
@@ -1452,6 +1453,31 @@ static int vfio_pci_ioctl_ioeventfd(struct vfio_pci_core_device *vdev,
ioeventfd.fd);
}
+static void vfio_pci_core_tsm_disable_mmio(struct pci_dev *pdev)
+{
+ struct vfio_pci_core_device *vdev = dev_get_drvdata(&pdev->dev);
+
+ down_write(&vdev->memory_lock);
+ vfio_pci_dma_buf_move(vdev, true);
+ up_write(&vdev->memory_lock);
+}
+
+static void vfio_pci_core_tsm_recover_mmio(struct pci_dev *pdev)
+{
+ struct vfio_pci_core_device *vdev = dev_get_drvdata(&pdev->dev);
+
+ down_write(&vdev->memory_lock);
+ if (__vfio_pci_memory_enabled(vdev))
+ vfio_pci_dma_buf_move(vdev, false);
+ up_write(&vdev->memory_lock);
+}
+
+struct pci_tsm_handlers vfio_pci_core_tsm_handlers = {
+ .disable_mmio = vfio_pci_core_tsm_disable_mmio,
+ .recover_mmio = vfio_pci_core_tsm_recover_mmio,
+};
+EXPORT_SYMBOL_GPL(vfio_pci_core_tsm_handlers);
+
static int vfio_pci_ioctl_tsm_bind(struct vfio_pci_core_device *vdev,
void __user *arg)
{
@@ -111,6 +111,7 @@ void vfio_pci_core_release_dev(struct vfio_device *core_vdev);
int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev);
void vfio_pci_core_unregister_device(struct vfio_pci_core_device *vdev);
extern const struct pci_error_handlers vfio_pci_core_err_handlers;
+extern struct pci_tsm_handlers vfio_pci_core_tsm_handlers;
int vfio_pci_core_sriov_configure(struct vfio_pci_core_device *vdev,
int nr_virtfn);
long vfio_pci_core_ioctl(struct vfio_device *core_vdev, unsigned int cmd,
VFIO invalidates MMIOs on disable_mmio() so that KVM could unmap them from S-EPT. VFIO re-validate MMIOs on recover_mmio() so that KVM could map them again for shared assigned device. For now these handlers are mainly for Intel TDX Connect, but should have no impact since other platform TSM drivers don't call these handlers. Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com> --- drivers/vfio/pci/vfio_pci.c | 1 + drivers/vfio/pci/vfio_pci_core.c | 26 ++++++++++++++++++++++++++ include/linux/vfio_pci_core.h | 1 + 3 files changed, 28 insertions(+)