pds_core: specify auxiliary_device to be created

[ Upstream commit b699bdc720c0255d1bb76cecba7382c1f2107af5 ]

In preparation for adding a new auxiliary_device for the PF,
make the vif type an argument to pdsc_auxbus_dev_add().  Pass in
the address of the padev pointer so that the caller can specify
where to save it and keep the mutex usage within the function.

Link: https://patch.msgid.link/r/20250320194412.67983-3-shannon.nelson@amd.com
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Stable-dep-of: dfd76010f8e8 ("pds_core: remove write-after-free of client_id")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/amd/pds_core/auxbus.c b/drivers/net/ethernet/amd/pds_core/auxbus.c
index d53b2124b149844400578ff58787ff49ef3aaa7a..4d3387bebe6a47e9d9270bc2cb91bf3d57883e08 100644 (file)
--- a/drivers/net/ethernet/amd/pds_core/auxbus.c
+++ b/drivers/net/ethernet/amd/pds_core/auxbus.c
@@ -172,29 +172,32 @@ static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *cf,
        return padev;
 }
 
-void pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf)
+void pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf,
+                        struct pds_auxiliary_dev **pd_ptr)
 {
        struct pds_auxiliary_dev *padev;
 
+       if (!*pd_ptr)
+               return;
+
        mutex_lock(&pf->config_lock);
 
-       padev = pf->vfs[cf->vf_id].padev;
-       if (padev) {
-               pds_client_unregister(pf, padev->client_id);
-               auxiliary_device_delete(&padev->aux_dev);
-               auxiliary_device_uninit(&padev->aux_dev);
-               padev->client_id = 0;
-       }
-       pf->vfs[cf->vf_id].padev = NULL;
+       padev = *pd_ptr;
+       pds_client_unregister(pf, padev->client_id);
+       auxiliary_device_delete(&padev->aux_dev);
+       auxiliary_device_uninit(&padev->aux_dev);
+       padev->client_id = 0;
+       *pd_ptr = NULL;
 
        mutex_unlock(&pf->config_lock);
 }
 
-int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf)
+int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf,
+                       enum pds_core_vif_types vt,
+                       struct pds_auxiliary_dev **pd_ptr)
 {
        struct pds_auxiliary_dev *padev;
        char devname[PDS_DEVNAME_LEN];
-       enum pds_core_vif_types vt;
        unsigned long mask;
        u16 vt_support;
        int client_id;
@@ -203,6 +206,9 @@ int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf)
        if (!cf)
                return -ENODEV;
 
+       if (vt >= PDS_DEV_TYPE_MAX)
+               return -EINVAL;
+
        mutex_lock(&pf->config_lock);
 
        mask = BIT_ULL(PDSC_S_FW_DEAD) |
@@ -214,17 +220,10 @@ int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf)
                goto out_unlock;
        }
 
-       /* We only support vDPA so far, so it is the only one to
-        * be verified that it is available in the Core device and
-        * enabled in the devlink param.  In the future this might
-        * become a loop for several VIF types.
-        */
-
        /* Verify that the type is supported and enabled.  It is not
         * an error if there is no auxbus device support for this
         * VF, it just means something else needs to happen with it.
         */
-       vt = PDS_DEV_TYPE_VDPA;
        vt_support = !!le16_to_cpu(pf->dev_ident.vif_types[vt]);
        if (!(vt_support &&
              pf->viftype_status[vt].supported &&
@@ -250,7 +249,7 @@ int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf)
                err = PTR_ERR(padev);
                goto out_unlock;
        }
-       pf->vfs[cf->vf_id].padev = padev;
+       *pd_ptr = padev;
 
 out_unlock:
        mutex_unlock(&pf->config_lock);

diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h
index 480f9e8cbc4d54c0e0eaf85e19c87aab87179e93..61ee607ee48ace9a80e3171149868998d5a79ce2 100644 (file)
--- a/drivers/net/ethernet/amd/pds_core/core.h
+++ b/drivers/net/ethernet/amd/pds_core/core.h
@@ -300,8 +300,11 @@ void pdsc_health_thread(struct work_struct *work);
 int pdsc_register_notify(struct notifier_block *nb);
 void pdsc_unregister_notify(struct notifier_block *nb);
 void pdsc_notify(unsigned long event, void *data);
-int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf);
-void pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf);
+int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf,
+                       enum pds_core_vif_types vt,
+                       struct pds_auxiliary_dev **pd_ptr);
+void pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf,
+                        struct pds_auxiliary_dev **pd_ptr);
 
 void pdsc_process_adminq(struct pdsc_qcq *qcq);
 void pdsc_work_thread(struct work_struct *work);

diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c
index 9b77bb73d25db674a633c5ab952dea834a84a0a7..bee70e46e34c68b682aecb0cdc1b0fd2931fd988 100644 (file)
--- a/drivers/net/ethernet/amd/pds_core/devlink.c
+++ b/drivers/net/ethernet/amd/pds_core/devlink.c
@@ -56,9 +56,10 @@ int pdsc_dl_enable_set(struct devlink *dl, u32 id,
                struct pdsc *vf = pdsc->vfs[vf_id].vf;
 
                if (ctx->val.vbool)
-                       err = pdsc_auxbus_dev_add(vf, pdsc);
+                       err = pdsc_auxbus_dev_add(vf, pdsc, vt_entry->vif_id,
+                                                 &pdsc->vfs[vf_id].padev);
                else
-                       pdsc_auxbus_dev_del(vf, pdsc);
+                       pdsc_auxbus_dev_del(vf, pdsc, &pdsc->vfs[vf_id].padev);
        }
 
        return err;

diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
index 346a69e95c880547866848466c885608cc21a061..76652e0e5b6d9c63577d9f27110b4c92d7c8f257 100644 (file)
--- a/drivers/net/ethernet/amd/pds_core/main.c
+++ b/drivers/net/ethernet/amd/pds_core/main.c
@@ -189,7 +189,8 @@ static int pdsc_init_vf(struct pdsc *vf)
        devl_unlock(dl);
 
        pf->vfs[vf->vf_id].vf = vf;
-       err = pdsc_auxbus_dev_add(vf, pf);
+       err = pdsc_auxbus_dev_add(vf, pf, PDS_DEV_TYPE_VDPA,
+                                 &pf->vfs[vf->vf_id].padev);
        if (err) {
                devl_lock(dl);
                devl_unregister(dl);
@@ -415,7 +416,7 @@ static void pdsc_remove(struct pci_dev *pdev)
 
                pf = pdsc_get_pf_struct(pdsc->pdev);
                if (!IS_ERR(pf)) {
-                       pdsc_auxbus_dev_del(pdsc, pf);
+                       pdsc_auxbus_dev_del(pdsc, pf, &pf->vfs[pdsc->vf_id].padev);
                        pf->vfs[pdsc->vf_id].vf = NULL;
                }
        } else {
@@ -480,7 +481,8 @@ static void pdsc_reset_prepare(struct pci_dev *pdev)
 
                pf = pdsc_get_pf_struct(pdsc->pdev);
                if (!IS_ERR(pf))
-                       pdsc_auxbus_dev_del(pdsc, pf);
+                       pdsc_auxbus_dev_del(pdsc, pf,
+                                           &pf->vfs[pdsc->vf_id].padev);
        }
 
        pdsc_unmap_bars(pdsc);
@@ -524,7 +526,8 @@ static void pdsc_reset_done(struct pci_dev *pdev)
 
                pf = pdsc_get_pf_struct(pdsc->pdev);
                if (!IS_ERR(pf))
-                       pdsc_auxbus_dev_add(pdsc, pf);
+                       pdsc_auxbus_dev_add(pdsc, pf, PDS_DEV_TYPE_VDPA,
+                                           &pf->vfs[pdsc->vf_id].padev);
        }
 }