nfp: app callbacks for SRIOV

Add app-callbacks for app-specific initialisation of SRIOV.

Disabling SRIOV is brought forward in nfp_pci_remove()
so that nfp_app_sriov_disable is called while the app still exists.

This is intended to be used to implement representor netdevs for virtual
ports.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.h b/drivers/net/ethernet/netronome/nfp/nfp_app.h
index af023a0491e7e9921a2ba235afba68967b9610f5..ff2d43615808093270ff9b00e628ab7423c953ec 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_app.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_app.h
@@ -75,6 +75,8 @@ extern const struct nfp_app_type app_bpf;
  * @tc_busy:   TC HW offload busy (rules loaded)
  * @xdp_offload:    offload an XDP program
  * @eswitch_mode_get:    get SR-IOV eswitch mode
+ * @sriov_enable: app-specific sriov initialisation
+ * @sriov_disable: app-specific sriov clean-up
  * @repr_get:  get representor netdev
  */
 struct nfp_app_type {
@@ -102,6 +104,9 @@ struct nfp_app_type {
        int (*xdp_offload)(struct nfp_app *app, struct nfp_net *nn,
                           struct bpf_prog *prog);
 
+       int (*sriov_enable)(struct nfp_app *app, int num_vfs);
+       void (*sriov_disable)(struct nfp_app *app);
+
        enum devlink_eswitch_mode (*eswitch_mode_get)(struct nfp_app *app);
        struct net_device *(*repr_get)(struct nfp_app *app, u32 id);
 };
@@ -237,6 +242,19 @@ static inline int nfp_app_eswitch_mode_get(struct nfp_app *app, u16 *mode)
        return 0;
 }
 
+static inline int nfp_app_sriov_enable(struct nfp_app *app, int num_vfs)
+{
+       if (!app || !app->type->sriov_enable)
+               return -EOPNOTSUPP;
+       return app->type->sriov_enable(app, num_vfs);
+}
+
+static inline void nfp_app_sriov_disable(struct nfp_app *app)
+{
+       if (app && app->type->sriov_disable)
+               app->type->sriov_disable(app);
+}
+
 static inline struct net_device *nfp_app_repr_get(struct nfp_app *app, u32 id)
 {
        if (unlikely(!app || !app->type->repr_get))

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 4e59dcb78c3697ed12f9e7511a687ccddd4f91dc..748e54cc885e280405bf0e635089c7cb437f79d1 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -54,6 +54,7 @@
 
 #include "nfpcore/nfp6000_pcie.h"
 
+#include "nfp_app.h"
 #include "nfp_main.h"
 #include "nfp_net.h"
 
@@ -97,28 +98,45 @@ static int nfp_pcie_sriov_enable(struct pci_dev *pdev, int num_vfs)
        struct nfp_pf *pf = pci_get_drvdata(pdev);
        int err;
 
+       mutex_lock(&pf->lock);
+
        if (num_vfs > pf->limit_vfs) {
                nfp_info(pf->cpp, "Firmware limits number of VFs to %u\n",
                         pf->limit_vfs);
-               return -EINVAL;
+               err = -EINVAL;
+               goto err_unlock;
+       }
+
+       err = nfp_app_sriov_enable(pf->app, num_vfs);
+       if (err) {
+               dev_warn(&pdev->dev, "App specific PCI sriov configuration failed: %d\n",
+                        err);
+               goto err_unlock;
        }
 
        err = pci_enable_sriov(pdev, num_vfs);
        if (err) {
                dev_warn(&pdev->dev, "Failed to enable PCI sriov: %d\n", err);
-               return err;
+               goto err_app_sriov_disable;
        }
 
        pf->num_vfs = num_vfs;
 
        dev_dbg(&pdev->dev, "Created %d VFs.\n", pf->num_vfs);
 
+       mutex_unlock(&pf->lock);
        return num_vfs;
+
+err_app_sriov_disable:
+       nfp_app_sriov_disable(pf->app);
+err_unlock:
+       mutex_unlock(&pf->lock);
+       return err;
 #endif
        return 0;
 }
 
-static int nfp_pcie_sriov_disable(struct pci_dev *pdev)
+static int __nfp_pcie_sriov_disable(struct pci_dev *pdev)
 {
 #ifdef CONFIG_PCI_IOV
        struct nfp_pf *pf = pci_get_drvdata(pdev);
@@ -132,6 +150,8 @@ static int nfp_pcie_sriov_disable(struct pci_dev *pdev)
                return -EPERM;
        }
 
+       nfp_app_sriov_disable(pf->app);
+
        pf->num_vfs = 0;
 
        pci_disable_sriov(pdev);
@@ -140,6 +160,18 @@ static int nfp_pcie_sriov_disable(struct pci_dev *pdev)
        return 0;
 }
 
+static int nfp_pcie_sriov_disable(struct pci_dev *pdev)
+{
+       struct nfp_pf *pf = pci_get_drvdata(pdev);
+       int err;
+
+       mutex_lock(&pf->lock);
+       err = __nfp_pcie_sriov_disable(pdev);
+       mutex_unlock(&pf->lock);
+
+       return err;
+}
+
 static int nfp_pcie_sriov_configure(struct pci_dev *pdev, int num_vfs)
 {
        if (num_vfs == 0)
@@ -431,11 +463,11 @@ static void nfp_pci_remove(struct pci_dev *pdev)
 
        devlink = priv_to_devlink(pf);
 
-       nfp_net_pci_remove(pf);
-
        nfp_pcie_sriov_disable(pdev);
        pci_sriov_set_totalvfs(pf->pdev, 0);
 
+       nfp_net_pci_remove(pf);
+
        devlink_unregister(devlink);
 
        kfree(pf->rtbl);