vfio/pci: Latch all module parameters per device

The vfio-pci module parameters of disable_idle_d3, nointxmask, and
disable_vga latch vfio-pci policy into vfio-pci-core globals each time
the vfio-pci module is initialized.  The disable_idle_d3 parameter has
already migrated to a per-device flag in order to provide consistency
for refcounted PM operations for the lifetime of the device
registration.

Pull the remaining vfio-pci module-parameter policy out of vfio-pci-core
into per-device flags set at device initialization.

This also restores the mutable aspect of the disable_idle_d3 and
nointxmask module parameters for vfio-pci, with the caveat that the
parameters are latched into the device at probe.

A notable change for variant drivers is that their devices are no longer
affected by vfio-pci module parameters and those drivers may need to
adopt similar module parameters if any devices have a hidden dependency
on vfio-pci setting non-default policy.

Assisted-by: Claude:claude-opus-4-8
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Alex Williamson <alex.williamson@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20260615191241.688297-6-alex.williamson@nvidia.com
Signed-off-by: Alex Williamson <alex@shazbot.org>

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 0c771064c0b84424d4cc39fbcf162366028553e3..830369ff878dbe6b93c7d114f0700e74fe87a36b 100644 (file)
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -125,9 +125,30 @@ static int vfio_pci_open_device(struct vfio_device *core_vdev)
        return 0;
 }
 
+static int vfio_pci_init_dev(struct vfio_device *core_vdev)
+{
+       struct vfio_pci_core_device *vdev =
+               container_of(core_vdev, struct vfio_pci_core_device, vdev);
+
+       /*
+        * These behaviors originated in vfio-pci and moved into
+        * vfio-pci-core when the driver was split; vfio-pci remains the
+        * only driver that toggles them.  Latch our module parameters per
+        * device at init time so that later parameter changes do not
+        * affect already-initialized devices.
+        */
+       vdev->nointxmask = nointxmask;
+       vdev->disable_idle_d3 = disable_idle_d3;
+#ifdef CONFIG_VFIO_PCI_VGA
+       vdev->disable_vga = disable_vga;
+#endif
+
+       return vfio_pci_core_init_dev(core_vdev);
+}
+
 static const struct vfio_device_ops vfio_pci_ops = {
        .name           = "vfio-pci",
-       .init           = vfio_pci_core_init_dev,
+       .init           = vfio_pci_init_dev,
        .release        = vfio_pci_core_release_dev,
        .open_device    = vfio_pci_open_device,
        .close_device   = vfio_pci_core_close_device,
@@ -256,13 +277,6 @@ static void __init vfio_pci_fill_ids(void)
 static int __init vfio_pci_init(void)
 {
        int ret;
-       bool is_disable_vga = true;
-
-#ifdef CONFIG_VFIO_PCI_VGA
-       is_disable_vga = disable_vga;
-#endif
-
-       vfio_pci_core_set_params(nointxmask, is_disable_vga, disable_idle_d3);
 
        /* Register and scan for devices */
        ret = pci_register_driver(&vfio_pci_driver);

diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index dab82c0785808162c092fce05473cebac9e16df3..db36d903dcd40e75e7a499f3ee93cf3dba05cc6c 100644 (file)
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -38,10 +38,6 @@
 #define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"
 #define DRIVER_DESC "core driver for VFIO based PCI devices"
 
-static bool nointxmask;
-static bool disable_vga;
-static bool disable_idle_d3;
-
 static void vfio_pci_eventfd_rcu_free(struct rcu_head *rcu)
 {
        struct vfio_pci_eventfd *eventfd =
@@ -92,10 +88,10 @@ struct vfio_pci_vf_token {
        int                     users;
 };
 
-static inline bool vfio_vga_disabled(void)
+static inline bool vfio_vga_disabled(struct vfio_pci_core_device *vdev)
 {
 #ifdef CONFIG_VFIO_PCI_VGA
-       return disable_vga;
+       return vdev->disable_vga;
 #else
        return true;
 #endif
@@ -111,11 +107,12 @@ static inline bool vfio_vga_disabled(void)
  */
 static unsigned int vfio_pci_set_decode(struct pci_dev *pdev, bool single_vga)
 {
+       struct vfio_pci_core_device *vdev = dev_get_drvdata(&pdev->dev);
        struct pci_dev *tmp = NULL;
        unsigned char max_busnr;
        unsigned int decodes;
 
-       if (single_vga || !vfio_vga_disabled() || pci_is_root_bus(pdev->bus))
+       if (single_vga || !vfio_vga_disabled(vdev) || pci_is_root_bus(pdev->bus))
                return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM |
                       VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM;
 
@@ -562,7 +559,7 @@ int vfio_pci_core_enable(struct vfio_pci_core_device *vdev)
        if (!vdev->pci_saved_state)
                pci_dbg(pdev, "%s: Couldn't store saved state\n", __func__);
 
-       if (likely(!nointxmask)) {
+       if (likely(!vdev->nointxmask)) {
                if (vfio_pci_nointx(pdev)) {
                        pci_info(pdev, "Masking broken INTx support\n");
                        vdev->nointx = true;
@@ -602,7 +599,7 @@ int vfio_pci_core_enable(struct vfio_pci_core_device *vdev)
                vdev->has_dyn_msix = false;
        }
 
-       if (!vfio_vga_disabled() && vfio_pci_is_vga(pdev))
+       if (!vfio_vga_disabled(vdev) && vfio_pci_is_vga(pdev))
                vdev->has_vga = true;
 
        vfio_pci_core_map_bars(vdev);
@@ -2144,8 +2141,6 @@ int vfio_pci_core_init_dev(struct vfio_device *core_vdev)
        init_rwsem(&vdev->memory_lock);
        xa_init(&vdev->ctx);
 
-       vdev->disable_idle_d3 = disable_idle_d3;
-
        return 0;
 }
 EXPORT_SYMBOL_GPL(vfio_pci_core_init_dev);
@@ -2616,15 +2611,6 @@ static void vfio_pci_dev_set_try_reset(struct vfio_device_set *dev_set)
        }
 }
 
-void vfio_pci_core_set_params(bool is_nointxmask, bool is_disable_vga,
-                             bool is_disable_idle_d3)
-{
-       nointxmask = is_nointxmask;
-       disable_vga = is_disable_vga;
-       disable_idle_d3 = is_disable_idle_d3;
-}
-EXPORT_SYMBOL_GPL(vfio_pci_core_set_params);
-
 static void vfio_pci_core_cleanup(void)
 {
        vfio_pci_uninit_perm_bits();

diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h
index 985b8af5a04b9b728d9bf67d385f80e9508a38bf..9a1674c152aa29df697ed6807cd36ffe43c2cc2d 100644 (file)
--- a/include/linux/vfio_pci_core.h
+++ b/include/linux/vfio_pci_core.h
@@ -127,6 +127,8 @@ struct vfio_pci_core_device {
        bool                    nointx:1;
        bool                    needs_pm_restore:1;
        bool                    disable_idle_d3:1;
+       bool                    nointxmask:1;
+       bool                    disable_vga:1;
        /* Flags modified at runtime - dedicated storage unit */
        bool                    needs_reset;
        bool                    pm_intx_masked;
@@ -161,8 +163,6 @@ int vfio_pci_core_register_dev_region(struct vfio_pci_core_device *vdev,
                                      unsigned int type, unsigned int subtype,
                                      const struct vfio_pci_regops *ops,
                                      size_t size, u32 flags, void *data);
-void vfio_pci_core_set_params(bool nointxmask, bool is_disable_vga,
-                             bool is_disable_idle_d3);
 void vfio_pci_core_close_device(struct vfio_device *core_vdev);
 int vfio_pci_core_init_dev(struct vfio_device *core_vdev);
 void vfio_pci_core_release_dev(struct vfio_device *core_vdev);