RDMA/bnxt_re: consider timeout of destroy ah as success.

[ Upstream commit bb8c93618fb0b8567d309f1aebc6df0cd31da1a2 ]

If destroy_ah is timed out, it is likely to be destroyed by firmware
but it is taking longer time due to temporary slowness
in processing the rcfw command. In worst case, there might be
AH resource leak in firmware.

Sending timeout return value can dump warning message from ib_core
which can be avoided if we map timeout of destroy_ah as success.

Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://lore.kernel.org/r/1686308514-11996-14-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/infiniband/hw/bnxt_re/bnxt_re.h b/drivers/infiniband/hw/bnxt_re/bnxt_re.h
index 2c95e6f3d47acc6c43aceb627907f66579c142c8..eef3ef3fabb4293cc4bd6f125cb4930ae32db673 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/bnxt_re.h
+++ b/drivers/infiniband/hw/bnxt_re/bnxt_re.h
@@ -179,6 +179,8 @@ struct bnxt_re_dev {
 #define BNXT_RE_ROCEV2_IPV4_PACKET     2
 #define BNXT_RE_ROCEV2_IPV6_PACKET     3
 
+#define BNXT_RE_CHECK_RC(x) ((x) && ((x) != -ETIMEDOUT))
+
 static inline struct device *rdev_to_dev(struct bnxt_re_dev *rdev)
 {
        if (rdev)

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index ebe6852c40e8c0d1bf95715a3415ec3fe302767c..e7f153ee2754161f868ae90b309b4f0c8822cc6e 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -614,12 +614,20 @@ int bnxt_re_destroy_ah(struct ib_ah *ib_ah, u32 flags)
 {
        struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);
        struct bnxt_re_dev *rdev = ah->rdev;
+       bool block = true;
+       int rc = 0;
 
-       bnxt_qplib_destroy_ah(&rdev->qplib_res, &ah->qplib_ah,
-                             !(flags & RDMA_DESTROY_AH_SLEEPABLE));
+       block = !(flags & RDMA_DESTROY_AH_SLEEPABLE);
+       rc = bnxt_qplib_destroy_ah(&rdev->qplib_res, &ah->qplib_ah, block);
+       if (BNXT_RE_CHECK_RC(rc)) {
+               if (rc == -ETIMEDOUT)
+                       rc = 0;
+               else
+                       goto fail;
+       }
        atomic_dec(&rdev->ah_count);
-
-       return 0;
+fail:
+       return rc;
 }
 
 static u8 bnxt_re_stack_to_dev_nw_type(enum rdma_network_type ntype)

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_sp.c b/drivers/infiniband/hw/bnxt_re/qplib_sp.c
index b967a17a44bebcc282547488eb9209781dda3450..10919532bca295a21c41588d00e7e520a6103c32 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_sp.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_sp.c
@@ -468,13 +468,14 @@ int bnxt_qplib_create_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
        return 0;
 }
 
-void bnxt_qplib_destroy_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
-                          bool block)
+int bnxt_qplib_destroy_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
+                         bool block)
 {
        struct bnxt_qplib_rcfw *rcfw = res->rcfw;
        struct creq_destroy_ah_resp resp = {};
        struct bnxt_qplib_cmdqmsg msg = {};
        struct cmdq_destroy_ah req = {};
+       int rc;
 
        /* Clean up the AH table in the device */
        bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req,
@@ -485,7 +486,8 @@ void bnxt_qplib_destroy_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
 
        bnxt_qplib_fill_cmdqmsg(&msg, &req, &resp, NULL, sizeof(req),
                                sizeof(resp), block);
-       bnxt_qplib_rcfw_send_message(rcfw, &msg);
+       rc = bnxt_qplib_rcfw_send_message(rcfw, &msg);
+       return rc;
 }
 
 /* MRW */

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_sp.h b/drivers/infiniband/hw/bnxt_re/qplib_sp.h
index 5de874659cdfa3b3f2b9b51d50dbd92aa51edfde..4061616048e85461a021e9c2bde4a719ee08d85c 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_sp.h
+++ b/drivers/infiniband/hw/bnxt_re/qplib_sp.h
@@ -327,8 +327,8 @@ int bnxt_qplib_set_func_resources(struct bnxt_qplib_res *res,
                                  struct bnxt_qplib_ctx *ctx);
 int bnxt_qplib_create_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
                         bool block);
-void bnxt_qplib_destroy_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
-                          bool block);
+int bnxt_qplib_destroy_ah(struct bnxt_qplib_res *res, struct bnxt_qplib_ah *ah,
+                         bool block);
 int bnxt_qplib_alloc_mrw(struct bnxt_qplib_res *res,
                         struct bnxt_qplib_mrw *mrw);
 int bnxt_qplib_dereg_mrw(struct bnxt_qplib_res *res, struct bnxt_qplib_mrw *mrw,