Driver overrides are the standard mechanism for binding vfio drivers to devices. With the introduction of the support_driver_override flag in the core driver struct, it's now required for drivers to declare themselves as driver_override compatible, otherwise driver_override bindings will be denied or generate a kernel taint. Set the support_driver_override flag on the driver struct across all vfio drivers. Cc: Yishai Hadas Cc: Longfang Liu Cc: Ankit Agrawal Cc: Brett Creeley Cc: Giovanni Cabiddu Cc: MichaƂ Winiarski Cc: Julian Ruess Cc: Nipun Gupta Cc: Nikhil Agarwal Cc: Eric Auger Cc: Mostafa Saleh Cc: Pranjal Shrivastava Cc: Ioana Ciornei Cc: qat-linux@intel.com Cc: virtualization@lists.linux.dev Cc: intel-xe@lists.freedesktop.org Cc: kvm@vger.kernel.org Signed-off-by: Alex Williamson --- Uwe, this should cover all the vfio drivers that expect to use driver_override. Thanks, Alex drivers/vfio/cdx/main.c | 1 + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 3 ++- drivers/vfio/pci/ism/main.c | 3 ++- drivers/vfio/pci/mlx5/main.c | 3 ++- drivers/vfio/pci/nvgrace-gpu/main.c | 3 ++- drivers/vfio/pci/pds/pci_drv.c | 3 ++- drivers/vfio/pci/qat/main.c | 3 ++- drivers/vfio/pci/vfio_pci.c | 3 ++- drivers/vfio/pci/virtio/main.c | 3 ++- drivers/vfio/pci/xe/main.c | 3 ++- drivers/vfio/platform/vfio_amba.c | 1 + drivers/vfio/platform/vfio_platform.c | 1 + 13 files changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/vfio/cdx/main.c b/drivers/vfio/cdx/main.c index 28dc8c825600..fb7679bf92fd 100644 --- a/drivers/vfio/cdx/main.c +++ b/drivers/vfio/cdx/main.c @@ -358,6 +358,7 @@ static struct cdx_driver vfio_cdx_driver = { .match_id_table = vfio_cdx_table, .driver = { .name = "vfio-cdx", + .support_driver_override = true, }, .driver_managed_dma = true, }; diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc.c b/drivers/vfio/fsl-mc/vfio_fsl_mc.c index 15b05b8c0c90..1603f81e0257 100644 --- a/drivers/vfio/fsl-mc/vfio_fsl_mc.c +++ b/drivers/vfio/fsl-mc/vfio_fsl_mc.c @@ -597,6 +597,7 @@ static struct fsl_mc_driver vfio_fsl_mc_driver = { .remove = vfio_fsl_mc_remove, .driver = { .name = "vfio-fsl-mc", + .support_driver_override = true, }, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c index c82c59246a3f..5c56aff8db01 100644 --- a/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +++ b/drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c @@ -1737,7 +1737,8 @@ static struct pci_driver hisi_acc_vfio_pci_driver = { .id_table = hisi_acc_vfio_pci_table, .probe = hisi_acc_vfio_pci_probe, .remove = hisi_acc_vfio_pci_remove, - .driver = { .pm = pm_ptr(&hisi_acc_vf_pm_ops) }, + .driver = { .pm = pm_ptr(&hisi_acc_vf_pm_ops), + .support_driver_override = true }, .err_handler = &hisi_acc_vf_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/ism/main.c b/drivers/vfio/pci/ism/main.c index cce3bdf1f070..263b377e87c4 100644 --- a/drivers/vfio/pci/ism/main.c +++ b/drivers/vfio/pci/ism/main.c @@ -399,7 +399,8 @@ static struct pci_driver ism_vfio_pci_driver = { .id_table = ism_device_table, .probe = ism_vfio_pci_probe, .remove = ism_vfio_pci_remove, - .driver = { .pm = pm_ptr(&ism_vfio_pm_ops) }, + .driver = { .pm = pm_ptr(&ism_vfio_pm_ops), + .support_driver_override = true }, .err_handler = &ism_vfio_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/mlx5/main.c b/drivers/vfio/pci/mlx5/main.c index 18a6d224b1fd..63c89e461be8 100644 --- a/drivers/vfio/pci/mlx5/main.c +++ b/drivers/vfio/pci/mlx5/main.c @@ -1451,7 +1451,8 @@ static struct pci_driver mlx5vf_pci_driver = { .id_table = mlx5vf_pci_table, .probe = mlx5vf_pci_probe, .remove = mlx5vf_pci_remove, - .driver = { .pm = pm_ptr(&mlx5vf_pm_ops) }, + .driver = { .pm = pm_ptr(&mlx5vf_pm_ops), + .support_driver_override = true }, .err_handler = &mlx5vf_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace-gpu/main.c index 5ddec340b73b..946da32c61ff 100644 --- a/drivers/vfio/pci/nvgrace-gpu/main.c +++ b/drivers/vfio/pci/nvgrace-gpu/main.c @@ -1438,7 +1438,8 @@ static struct pci_driver nvgrace_gpu_vfio_pci_driver = { .id_table = nvgrace_gpu_vfio_pci_table, .probe = nvgrace_gpu_probe, .remove = nvgrace_gpu_remove, - .driver = { .pm = pm_ptr(&nvgrace_gpu_pm_ops) }, + .driver = { .pm = pm_ptr(&nvgrace_gpu_pm_ops), + .support_driver_override = true }, .err_handler = &nvgrace_gpu_vfio_pci_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/pds/pci_drv.c b/drivers/vfio/pci/pds/pci_drv.c index cf7e33d4d17b..1fcef987f1b0 100644 --- a/drivers/vfio/pci/pds/pci_drv.c +++ b/drivers/vfio/pci/pds/pci_drv.c @@ -184,7 +184,8 @@ static struct pci_driver pds_vfio_pci_driver = { .id_table = pds_vfio_pci_table, .probe = pds_vfio_pci_probe, .remove = pds_vfio_pci_remove, - .driver = { .pm = pm_ptr(&pds_vfio_pm_ops) }, + .driver = { .pm = pm_ptr(&pds_vfio_pm_ops), + .support_driver_override = true }, .err_handler = &pds_vfio_pci_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/qat/main.c b/drivers/vfio/pci/qat/main.c index 69448fa57df4..8a616f9b6494 100644 --- a/drivers/vfio/pci/qat/main.c +++ b/drivers/vfio/pci/qat/main.c @@ -695,7 +695,8 @@ static struct pci_driver qat_vf_vfio_pci_driver = { .id_table = qat_vf_vfio_pci_table, .probe = qat_vf_vfio_pci_probe, .remove = qat_vf_vfio_pci_remove, - .driver = { .pm = pm_ptr(&qat_vf_pm_ops) }, + .driver = { .pm = pm_ptr(&qat_vf_pm_ops), + .support_driver_override = true }, .err_handler = &qat_vf_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index e7c012febe91..fde2c3fc88eb 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -260,7 +260,8 @@ static struct pci_driver vfio_pci_driver = { .remove = vfio_pci_remove, .sriov_configure = vfio_pci_sriov_configure, .err_handler = &vfio_pci_err_handlers, - .driver = { .pm = pm_ptr(&vfio_pci_pm_ops) }, + .driver = { .pm = pm_ptr(&vfio_pci_pm_ops), + .support_driver_override = true }, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/virtio/main.c b/drivers/vfio/pci/virtio/main.c index 123ff5193812..1e02a8fd4a61 100644 --- a/drivers/vfio/pci/virtio/main.c +++ b/drivers/vfio/pci/virtio/main.c @@ -222,7 +222,8 @@ static struct pci_driver virtiovf_pci_driver = { .id_table = virtiovf_pci_table, .probe = virtiovf_pci_probe, .remove = virtiovf_pci_remove, - .driver = { .pm = pm_ptr(&virtiovf_pm_ops) }, + .driver = { .pm = pm_ptr(&virtiovf_pm_ops), + .support_driver_override = true }, .err_handler = &virtiovf_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/pci/xe/main.c b/drivers/vfio/pci/xe/main.c index 7dab3e024aa8..e0ab61f604de 100644 --- a/drivers/vfio/pci/xe/main.c +++ b/drivers/vfio/pci/xe/main.c @@ -592,7 +592,8 @@ static struct pci_driver xe_vfio_pci_driver = { .id_table = xe_vfio_pci_table, .probe = xe_vfio_pci_probe, .remove = xe_vfio_pci_remove, - .driver = { .pm = pm_ptr(&xe_vfio_pm_ops) }, + .driver = { .pm = pm_ptr(&xe_vfio_pm_ops), + .support_driver_override = true }, .err_handler = &xe_vfio_pci_err_handlers, .driver_managed_dma = true, }; diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c index fa754f203b2d..2c87caf1b7f7 100644 --- a/drivers/vfio/platform/vfio_amba.c +++ b/drivers/vfio/platform/vfio_amba.c @@ -137,6 +137,7 @@ static struct amba_driver vfio_amba_driver = { .id_table = vfio_amba_ids, .drv = { .name = "vfio-amba", + .support_driver_override = true, }, .driver_managed_dma = true, }; diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c index a4d3ace3e02d..93d06032cdde 100644 --- a/drivers/vfio/platform/vfio_platform.c +++ b/drivers/vfio/platform/vfio_platform.c @@ -116,6 +116,7 @@ static struct platform_driver vfio_platform_driver = { .remove = vfio_platform_remove, .driver = { .name = "vfio-platform", + .support_driver_override = true, }, .driver_managed_dma = true, }; -- 2.54.0