RDMA/hns: Fix deadlock on SRQ async events.

commit b46494b6f9c19f141114a57729e198698f40af37 upstream.

xa_lock for SRQ table may be required in AEQ. Use xa_store_irq()/
xa_erase_irq() to avoid deadlock.

Fixes: 81fce6291d99 ("RDMA/hns: Add SRQ asynchronous event support")
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20240412091616.370789-5-huangjunxian6@hisilicon.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index f62162771db510f1cb5919e37dc7f09105b3f577..a0f243ffa5b54d8663bc2d18e0a1fb2c42bd98da 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -37,6 +37,7 @@
 #include <rdma/ib_smi.h>
 #include <rdma/ib_user_verbs.h>
 #include <rdma/ib_cache.h>
+#include "hnae3.h"
 #include "hns_roce_common.h"
 #include "hns_roce_device.h"
 #include <rdma/hns-abi.h>

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index 02e2416b5fed63688eea179c3c40e21600df51ca..6a510dbe5849f5b0ff2e9feedf413584b5c45f89 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -120,7 +120,7 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq,
                goto err_out;
        }
 
-       ret = xa_err(xa_store(&srq_table->xa, srq->srqn, srq, GFP_KERNEL));
+       ret = xa_err(xa_store_irq(&srq_table->xa, srq->srqn, srq, GFP_KERNEL));
        if (ret) {
                ibdev_err(ibdev, "failed to store SRQC, ret = %d.\n", ret);
                goto err_put;
@@ -149,7 +149,7 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq,
        return ret;
 
 err_xa:
-       xa_erase(&srq_table->xa, srq->srqn);
+       xa_erase_irq(&srq_table->xa, srq->srqn);
 
 err_put:
        hns_roce_table_put(hr_dev, &srq_table->table, srq->srqn);
@@ -169,7 +169,7 @@ static void free_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq)
                dev_err(hr_dev->dev, "DESTROY_SRQ failed (%d) for SRQN %06lx\n",
                        ret, srq->srqn);
 
-       xa_erase(&srq_table->xa, srq->srqn);
+       xa_erase_irq(&srq_table->xa, srq->srqn);
 
        if (atomic_dec_and_test(&srq->refcount))
                complete(&srq->free);