[RFC 18/29] nvkm/vgpu: introduce pci_driver.sriov_configure() in nvkm
Zhi Wang
zhiw at nvidia.com
Sun Sep 22 12:49:40 UTC 2024
The kernel PCI core provides a sysfs UAPI for the user to specify
number of VFs to be enabled.
To support the UAPI, the driver is required to implement
pci_driver.sriov_configure(). The num of VFs are only able to be
changed where there is no active vGPUs.
Implement the pci_driver.sriov_configure() in nvkm. Introduce a
blocking call chain to let NVIDIA vGPU manager handle this event.
Signed-off-by: Zhi Wang <zhiw at nvidia.com>
---
.../nouveau/include/nvkm/vgpu_mgr/vgpu_mgr.h | 1 +
drivers/gpu/drm/nouveau/nvkm/device/pci.c | 14 +++++++++++
.../gpu/drm/nouveau/nvkm/vgpu_mgr/vgpu_mgr.c | 25 +++++++++++++++++++
include/drm/nvkm_vgpu_mgr_vfio.h | 5 ++++
4 files changed, 45 insertions(+)
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/vgpu_mgr/vgpu_mgr.h b/drivers/gpu/drm/nouveau/include/nvkm/vgpu_mgr/vgpu_mgr.h
index 882965fd25ce..388758fa7ce8 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/vgpu_mgr/vgpu_mgr.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/vgpu_mgr/vgpu_mgr.h
@@ -40,5 +40,6 @@ void nvkm_vgpu_mgr_fini(struct nvkm_device *device);
void nvkm_vgpu_mgr_populate_gsp_vf_info(struct nvkm_device *device,
void *info);
void nvkm_vgpu_mgr_init_vfio_ops(struct nvkm_vgpu_mgr *vgpu_mgr);
+int nvkm_vgpu_mgr_pci_sriov_configure(struct nvkm_device *device, int num_vfs);
#endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/device/pci.c
index 1543902b20e9..f39d2727d653 100644
--- a/drivers/gpu/drm/nouveau/nvkm/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/device/pci.c
@@ -1766,6 +1766,9 @@ nvkm_device_pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
struct nvkm_device *device;
int ret, bits;
+ if (pci_dev->is_virtfn)
+ return -EINVAL;
+
if (vga_switcheroo_client_probe_defer(pci_dev))
return -EPROBE_DEFER;
@@ -1867,6 +1870,16 @@ nvkm_device_pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
return ret;
}
+static int nvkm_device_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
+{
+ struct nvkm_device *device = pci_get_drvdata(dev);
+
+ if (!nvkm_vgpu_mgr_is_enabled(device))
+ return -ENODEV;
+
+ return nvkm_vgpu_mgr_pci_sriov_configure(device, num_vfs);
+}
+
static struct pci_device_id
nvkm_device_pci_id_table[] = {
{
@@ -1889,6 +1902,7 @@ nvkm_device_pci_driver = {
.probe = nvkm_device_pci_probe,
.remove = nvkm_device_pci_remove,
.driver.pm = &nvkm_device_pci_pm,
+ .sriov_configure = nvkm_device_pci_sriov_configure,
};
MODULE_DEVICE_TABLE(pci, nvkm_device_pci_id_table);
diff --git a/drivers/gpu/drm/nouveau/nvkm/vgpu_mgr/vgpu_mgr.c b/drivers/gpu/drm/nouveau/nvkm/vgpu_mgr/vgpu_mgr.c
index 3654bd43b68a..47c459f93950 100644
--- a/drivers/gpu/drm/nouveau/nvkm/vgpu_mgr/vgpu_mgr.c
+++ b/drivers/gpu/drm/nouveau/nvkm/vgpu_mgr/vgpu_mgr.c
@@ -207,3 +207,28 @@ void nvkm_vgpu_mgr_populate_gsp_vf_info(struct nvkm_device *device,
v = nvkm_rd32(device, 0x88000 + 0xbfc);
vf_info->b64bitBar2 = IS_BAR_64(v);
}
+
+/**
+ * nvkm_vgpu_mgr_pci_sriov_configure - Configure SRIOV VFs
+ * @device: the nvkm_device pointer
+ * @num_vfs: Number of VFs
+ *
+ * Returns: 0 on success, negative on failure.
+ */
+int nvkm_vgpu_mgr_pci_sriov_configure(struct nvkm_device *device, int num_vfs)
+{
+ struct nvkm_vgpu_mgr *vgpu_mgr = &device->vgpu_mgr;
+ struct nvidia_vgpu_vfio_handle_data *vfio = &vgpu_mgr->vfio_handle_data;
+ struct pci_dev *pdev = nvkm_to_pdev(device);
+ int ret;
+
+ if (vfio->priv)
+ return -EBUSY;
+
+ if (num_vfs)
+ ret = pci_enable_sriov(pdev, num_vfs);
+ else
+ pci_disable_sriov(pdev);
+
+ return ret ? ret : num_vfs;
+}
diff --git a/include/drm/nvkm_vgpu_mgr_vfio.h b/include/drm/nvkm_vgpu_mgr_vfio.h
index d9ed2cd202ff..5c2c650c2df9 100644
--- a/include/drm/nvkm_vgpu_mgr_vfio.h
+++ b/include/drm/nvkm_vgpu_mgr_vfio.h
@@ -6,8 +6,13 @@
#ifndef __NVKM_VGPU_MGR_VFIO_H__
#define __NVKM_VGPU_MGR_VFIO_H__
+enum {
+ NVIDIA_VGPU_EVENT_PCI_SRIOV_CONFIGURE = 0,
+};
+
struct nvidia_vgpu_vfio_handle_data {
void *priv;
+ struct notifier_block notifier;
};
/* A combo of handles of RmClient and RmDevice */
--
2.34.1
More information about the Nouveau
mailing list