[PATCH 05/34] net: mana: Handle vport sharing between devices

For outgoing packets, the PF requires the VF to configure the vport with
corresponding protection domain and doorbell ID for the kernel or user
context. The vport can't be shared between different contexts.

Implement the logic to exclusively take over the vport by either the
Ethernet device or RDMA device.

Reviewed-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Long Li <longli@microsoft.com>
Link: https://lore.kernel.org/r/1667502990-2559-4-git-send-email-longli@linuxonhyperv.com
Acked-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
(cherry picked from commit b5c1c9855be3b5b978fde975a63df3cabc273faa)
Signed-off-by: Bastian Blank <waldi@debian.org>
Gbp-Pq: Topic features/all/ethernet-microsoft
Gbp-Pq: Name 0005-net-mana-Handle-vport-sharing-between-devices.patch

diff --git a/drivers/net/ethernet/microsoft/mana/mana.h b/drivers/net/ethernet/microsoft/mana/mana.h
index 2b00d6a291171759542630c7ed9236a29a64417b..6ce11e5a9a001ca538b5f052335f1f750f8c3933 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana.h
+++ b/drivers/net/ethernet/microsoft/mana/mana.h
@@ -383,6 +383,10 @@ struct mana_port_context {
        mana_handle_t port_handle;
        mana_handle_t pf_filter_handle;
 
+       /* Mutex for sharing access to vport_use_count */
+       struct mutex vport_mutex;
+       int vport_use_count;
+
        u16 port_idx;
 
        bool port_is_up;
@@ -634,4 +638,7 @@ struct mana_tx_package {
        struct gdma_posted_wqe_info wqe_info;
 };
 
+int mana_cfg_vport(struct mana_port_context *apc, u32 protection_dom_id,
+                  u32 doorbell_pg_id);
+void mana_uncfg_vport(struct mana_port_context *apc);
 #endif /* _MANA_H */

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 4c14a4e1518870bea89591f3c52b704b8aa083dc..934b360145ac5216aeacb657d70639451d92ce10 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -647,13 +647,48 @@ static int mana_query_vport_cfg(struct mana_port_context *apc, u32 vport_index,
        return 0;
 }
 
-static int mana_cfg_vport(struct mana_port_context *apc, u32 protection_dom_id,
-                         u32 doorbell_pg_id)
+void mana_uncfg_vport(struct mana_port_context *apc)
+{
+       mutex_lock(&apc->vport_mutex);
+       apc->vport_use_count--;
+       WARN_ON(apc->vport_use_count < 0);
+       mutex_unlock(&apc->vport_mutex);
+}
+EXPORT_SYMBOL_NS(mana_uncfg_vport, NET_MANA);
+
+int mana_cfg_vport(struct mana_port_context *apc, u32 protection_dom_id,
+                  u32 doorbell_pg_id)
 {
        struct mana_config_vport_resp resp = {};
        struct mana_config_vport_req req = {};
        int err;
 
+       /* This function is used to program the Ethernet port in the hardware
+        * table. It can be called from the Ethernet driver or the RDMA driver.
+        *
+        * For Ethernet usage, the hardware supports only one active user on a
+        * physical port. The driver checks on the port usage before programming
+        * the hardware when creating the RAW QP (RDMA driver) or exposing the
+        * device to kernel NET layer (Ethernet driver).
+        *
+        * Because the RDMA driver doesn't know in advance which QP type the
+        * user will create, it exposes the device with all its ports. The user
+        * may not be able to create RAW QP on a port if this port is already
+        * in used by the Ethernet driver from the kernel.
+        *
+        * This physical port limitation only applies to the RAW QP. For RC QP,
+        * the hardware doesn't have this limitation. The user can create RC
+        * QPs on a physical port up to the hardware limits independent of the
+        * Ethernet usage on the same port.
+        */
+       mutex_lock(&apc->vport_mutex);
+       if (apc->vport_use_count > 0) {
+               mutex_unlock(&apc->vport_mutex);
+               return -EBUSY;
+       }
+       apc->vport_use_count++;
+       mutex_unlock(&apc->vport_mutex);
+
        mana_gd_init_req_hdr(&req.hdr, MANA_CONFIG_VPORT_TX,
                             sizeof(req), sizeof(resp));
        req.vport = apc->port_handle;
@@ -680,9 +715,16 @@ static int mana_cfg_vport(struct mana_port_context *apc, u32 protection_dom_id,
 
        apc->tx_shortform_allowed = resp.short_form_allowed;
        apc->tx_vp_offset = resp.tx_vport_offset;
+
+       netdev_info(apc->ndev, "Configured vPort %llu PD %u DB %u\n",
+                   apc->port_handle, protection_dom_id, doorbell_pg_id);
 out:
+       if (err)
+               mana_uncfg_vport(apc);
+
        return err;
 }
+EXPORT_SYMBOL_NS(mana_cfg_vport, NET_MANA);
 
 static int mana_cfg_vport_steering(struct mana_port_context *apc,
                                   enum TRI_STATE rx,
@@ -743,6 +785,9 @@ static int mana_cfg_vport_steering(struct mana_port_context *apc,
                           resp.hdr.status);
                err = -EPROTO;
        }
+
+       netdev_info(ndev, "Configured steering vPort %llu entries %u\n",
+                   apc->port_handle, num_entries);
 out:
        kfree(req);
        return err;
@@ -1825,6 +1870,7 @@ static void mana_destroy_vport(struct mana_port_context *apc)
        }
 
        mana_destroy_txq(apc);
+       mana_uncfg_vport(apc);
 
        if (gd->gdma_context->is_pf)
                mana_pf_deregister_hw_vport(apc);
@@ -2125,6 +2171,9 @@ static int mana_probe_port(struct mana_context *ac, int port_idx,
        apc->pf_filter_handle = INVALID_MANA_HANDLE;
        apc->port_idx = port_idx;
 
+       mutex_init(&apc->vport_mutex);
+       apc->vport_use_count = 0;
+
        ndev->netdev_ops = &mana_devops;
        ndev->ethtool_ops = &mana_ethtool_ops;
        ndev->mtu = ETH_DATA_LEN;