RDMA/rtrs-clt: Missing error from rtrs_rdma_conn_established
authorGioh Kim <gi-oh.kim@cloud.ionos.com>
Fri, 23 Oct 2020 07:43:45 +0000 (09:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:52:59 +0000 (11:52 +0100)
[ Upstream commit f553e7601df9566ba7644541fc09152a3a81f793 ]

When rtrs_rdma_conn_established returns error (non-zero value), the error
value is stored in con->cm_err and it cannot trigger
rtrs_rdma_error_recovery. Finally the error of rtrs_rdma_con_established
will be forgot.

Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
Link: https://lore.kernel.org/r/20201023074353.21946-5-jinpu.wang@cloud.ionos.com
Signed-off-by: Gioh Kim <gi-oh.kim@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/ulp/rtrs/rtrs-clt.c

index 3cc957fea93eef85dd223e197cec21a752bef94e..d54a77ebe11840cab61c3090707385301bad6d10 100644 (file)
@@ -1835,8 +1835,8 @@ static int rtrs_clt_rdma_cm_handler(struct rdma_cm_id *cm_id,
                cm_err = rtrs_rdma_route_resolved(con);
                break;
        case RDMA_CM_EVENT_ESTABLISHED:
-               con->cm_err = rtrs_rdma_conn_established(con, ev);
-               if (likely(!con->cm_err)) {
+               cm_err = rtrs_rdma_conn_established(con, ev);
+               if (likely(!cm_err)) {
                        /*
                         * Report success and wake up. Here we abuse state_wq,
                         * i.e. wake up without state change, but we set cm_err.