RDMA/mana_ib: Allocate interrupt contexts on EQs

Use the GIC functions to allocate interrupt contexts for RDMA EQs. These
interrupt contexts may be shared with Ethernet EQs when MSI-X vectors
are limited.

The driver now supports allocating dedicated MSI-X for each EQ. Indicate
this capability through driver capability bits. The RDMA EQs pass
use_msi_bitmap=false to share MSI-X vectors with Ethernet, while the
capability flag advertises that the driver supports per-vPort EQ
separation when hardware has sufficient vectors.

Populate eq.irq on all RDMA EQs for consistency with the Ethernet path.

Also relocate the GDMA_DRV_CAP_FLAG_1_HW_VPORT_LINK_AWARE define to its
numeric BIT(6) position among the other capability flags.

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Leon Romanovsky <leon@kernel.org>
Link: https://patch.msgid.link/20260605005717.2059954-7-longli@microsoft.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
index f42ea20cb75d340e3e2fc31977fc3712eef038dc..142047847f382bc9d2af6a5a24b812ef06bd6287 100644 (file)
--- a/drivers/infiniband/hw/mana/main.c
+++ b/drivers/infiniband/hw/mana/main.c
@@ -765,7 +765,8 @@ int mana_ib_create_eqs(struct mana_ib_dev *mdev)
 {
        struct gdma_context *gc = mdev_to_gc(mdev);
        struct gdma_queue_spec spec = {};
-       int err, i;
+       struct gdma_irq_context *gic;
+       int err, i, msi;
 
        spec.type = GDMA_EQ;
        spec.monitor_avl_buf = false;
@@ -773,11 +774,19 @@ int mana_ib_create_eqs(struct mana_ib_dev *mdev)
        spec.eq.callback = mana_ib_event_handler;
        spec.eq.context = mdev;
        spec.eq.log2_throttle_limit = LOG2_EQ_THROTTLE;
-       spec.eq.msix_index = 0;
+
+       msi = 0;
+       gic = mana_gd_get_gic(gc, false, &msi);
+       if (IS_ERR(gic))
+               return PTR_ERR(gic);
+       spec.eq.msix_index = msi;
 
        err = mana_gd_create_mana_eq(mdev->gdma_dev, &spec, &mdev->fatal_err_eq);
-       if (err)
+       if (err) {
+               mana_gd_put_gic(gc, false, 0);
                return err;
+       }
+       mdev->fatal_err_eq->eq.irq = gic->irq;
 
        mdev->eqs = kzalloc_objs(struct gdma_queue *,
                                 mdev->ib_dev.num_comp_vectors);
@@ -787,32 +796,50 @@ int mana_ib_create_eqs(struct mana_ib_dev *mdev)
        }
        spec.eq.callback = NULL;
        for (i = 0; i < mdev->ib_dev.num_comp_vectors; i++) {
-               spec.eq.msix_index = (i + 1) % gc->num_msix_usable;
+               msi = (i + 1) % gc->num_msix_usable;
+
+               gic = mana_gd_get_gic(gc, false, &msi);
+               if (IS_ERR(gic)) {
+                       err = PTR_ERR(gic);
+                       goto destroy_eqs;
+               }
+               spec.eq.msix_index = msi;
+
                err = mana_gd_create_mana_eq(mdev->gdma_dev, &spec, &mdev->eqs[i]);
-               if (err)
+               if (err) {
+                       mana_gd_put_gic(gc, false, msi);
                        goto destroy_eqs;
+               }
+               mdev->eqs[i]->eq.irq = gic->irq;
        }
 
        return 0;
 
 destroy_eqs:
-       while (i-- > 0)
+       while (i-- > 0) {
                mana_gd_destroy_queue(gc, mdev->eqs[i]);
+               mana_gd_put_gic(gc, false, (i + 1) % gc->num_msix_usable);
+       }
        kfree(mdev->eqs);
 destroy_fatal_eq:
        mana_gd_destroy_queue(gc, mdev->fatal_err_eq);
+       mana_gd_put_gic(gc, false, 0);
        return err;
 }
 
 void mana_ib_destroy_eqs(struct mana_ib_dev *mdev)
 {
        struct gdma_context *gc = mdev_to_gc(mdev);
-       int i;
+       int i, msi;
 
        mana_gd_destroy_queue(gc, mdev->fatal_err_eq);
+       mana_gd_put_gic(gc, false, 0);
 
-       for (i = 0; i < mdev->ib_dev.num_comp_vectors; i++)
+       for (i = 0; i < mdev->ib_dev.num_comp_vectors; i++) {
                mana_gd_destroy_queue(gc, mdev->eqs[i]);
+               msi = (i + 1) % gc->num_msix_usable;
+               mana_gd_put_gic(gc, false, msi);
+       }
 
        kfree(mdev->eqs);
 }

diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
index 6a65fedae38f29af0326a56daa5c02fc1782f4d9..78afd696b08b6f8d62357580276fefb600b761cc 100644 (file)
--- a/include/net/mana/gdma.h
+++ b/include/net/mana/gdma.h
@@ -616,6 +616,7 @@ enum {
 #define GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECONFIG BIT(3)
 #define GDMA_DRV_CAP_FLAG_1_GDMA_PAGES_4MB_1GB_2GB BIT(4)
 #define GDMA_DRV_CAP_FLAG_1_VARIABLE_INDIRECTION_TABLE_SUPPORT BIT(5)
+#define GDMA_DRV_CAP_FLAG_1_HW_VPORT_LINK_AWARE BIT(6)
 
 /* Driver can handle holes (zeros) in the device list */
 #define GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP BIT(11)
@@ -632,7 +633,8 @@ enum {
 /* Driver detects stalled send queues and recovers them */
 #define GDMA_DRV_CAP_FLAG_1_HANDLE_STALL_SQ_RECOVERY BIT(18)
 
-#define GDMA_DRV_CAP_FLAG_1_HW_VPORT_LINK_AWARE BIT(6)
+/* Driver supports separate EQ/MSIs for each vPort */
+#define GDMA_DRV_CAP_FLAG_1_EQ_MSI_UNSHARE_MULTI_VPORT BIT(19)
 
 /* Driver supports linearizing the skb when num_sge exceeds hardware limit */
 #define GDMA_DRV_CAP_FLAG_1_SKB_LINEARIZE BIT(20)
@@ -660,7 +662,8 @@ enum {
         GDMA_DRV_CAP_FLAG_1_SKB_LINEARIZE | \
         GDMA_DRV_CAP_FLAG_1_PROBE_RECOVERY | \
         GDMA_DRV_CAP_FLAG_1_HANDLE_STALL_SQ_RECOVERY | \
-        GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECOVERY)
+        GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECOVERY | \
+        GDMA_DRV_CAP_FLAG_1_EQ_MSI_UNSHARE_MULTI_VPORT)
 
 #define GDMA_DRV_CAP_FLAGS2 0