* [PATCH net 0/3] qed: RoCE infrastrucutre fixes @ 2017-01-24 21:15 ` Yuval Mintz 0 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA, Yuval Mintz This series contains three RoCE bug fixes that improve stability and robustness. Dave, Please consider applying these to 'net'. Thanks, Yuval Ram Amrani (3): qed: on failure release CQ resource under lock qed: read queue state before releasing buffer qed: don't free a QP more than once drivers/net/ethernet/qlogic/qed/qed_roce.c | 63 +++++++++++++++++------------- 1 file changed, 35 insertions(+), 28 deletions(-) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net 0/3] qed: RoCE infrastrucutre fixes @ 2017-01-24 21:15 ` Yuval Mintz 0 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA, Yuval Mintz This series contains three RoCE bug fixes that improve stability and robustness. Dave, Please consider applying these to 'net'. Thanks, Yuval Ram Amrani (3): qed: on failure release CQ resource under lock qed: read queue state before releasing buffer qed: don't free a QP more than once drivers/net/ethernet/qlogic/qed/qed_roce.c | 63 +++++++++++++++++------------- 1 file changed, 35 insertions(+), 28 deletions(-) -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net 1/3] qed: Release CQ resource under lock on failure 2017-01-24 21:15 ` Yuval Mintz @ 2017-01-24 21:15 ` Yuval Mintz -1 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem, netdev; +Cc: linux-rdma, Ram.Amrani, Yuval Mintz From: Ram Amrani <Ram.Amrani@cavium.com> The CQ resource pool is protected by a spin lock. When a CQ creation fails it now deallocates under that lock as well. Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com> Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> --- drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c index bd4cad2..7ab6d4e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c @@ -948,7 +948,9 @@ static int qed_rdma_create_cq(void *rdma_cxt, err: /* release allocated icid */ + spin_lock_bh(&p_info->lock); qed_bmap_release_id(p_hwfn, &p_info->cq_map, returned_id); + spin_unlock_bh(&p_info->lock); DP_NOTICE(p_hwfn, "Create CQ failed, rc = %d\n", rc); return rc; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net 1/3] qed: Release CQ resource under lock on failure @ 2017-01-24 21:15 ` Yuval Mintz 0 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem, netdev; +Cc: linux-rdma, Ram.Amrani, Yuval Mintz From: Ram Amrani <Ram.Amrani@cavium.com> The CQ resource pool is protected by a spin lock. When a CQ creation fails it now deallocates under that lock as well. Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com> Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> --- drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c index bd4cad2..7ab6d4e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c @@ -948,7 +948,9 @@ static int qed_rdma_create_cq(void *rdma_cxt, err: /* release allocated icid */ + spin_lock_bh(&p_info->lock); qed_bmap_release_id(p_hwfn, &p_info->cq_map, returned_id); + spin_unlock_bh(&p_info->lock); DP_NOTICE(p_hwfn, "Create CQ failed, rc = %d\n", rc); return rc; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
[parent not found: <1485292523-8821-2-git-send-email-Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH net 1/3] qed: Release CQ resource under lock on failure [not found] ` <1485292523-8821-2-git-send-email-Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> @ 2017-01-25 7:24 ` Yuval Shaia 2017-01-26 11:43 ` Amrani, Ram 2017-02-16 9:19 ` Amrani, Ram 0 siblings, 2 replies; 11+ messages in thread From: Yuval Shaia @ 2017-01-25 7:24 UTC (permalink / raw) To: Yuval Mintz Cc: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA, linux-rdma-u79uwXL29TY76Z2rM5mHXA, Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA On Tue, Jan 24, 2017 at 11:15:21PM +0200, Yuval Mintz wrote: > From: Ram Amrani <Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> > > The CQ resource pool is protected by a spin lock. When a CQ creation > fails it now deallocates under that lock as well. > > Signed-off-by: Ram Amrani <Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> > Signed-off-by: Yuval Mintz <Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> > --- > drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c > index bd4cad2..7ab6d4e 100644 > --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c > +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c > @@ -948,7 +948,9 @@ static int qed_rdma_create_cq(void *rdma_cxt, > > err: > /* release allocated icid */ > + spin_lock_bh(&p_info->lock); > qed_bmap_release_id(p_hwfn, &p_info->cq_map, returned_id); > + spin_unlock_bh(&p_info->lock); > DP_NOTICE(p_hwfn, "Create CQ failed, rc = %d\n", rc); Minor suggestion. Can you consider embedding the lock and unlock inside qed_bmap_release_id? There are two places where this is bad idea as driver needs to release two IDs but still one is in error flow and second is when destroying QP so for most cases code may look a bit better. > > return rc; > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH net 1/3] qed: Release CQ resource under lock on failure 2017-01-25 7:24 ` Yuval Shaia @ 2017-01-26 11:43 ` Amrani, Ram 2017-02-16 9:19 ` Amrani, Ram 1 sibling, 0 replies; 11+ messages in thread From: Amrani, Ram @ 2017-01-26 11:43 UTC (permalink / raw) To: Yuval Shaia, Mintz, Yuval; +Cc: davem, netdev, linux-rdma, Kalderon, Michal > Minor suggestion. > Can you consider embedding the lock and unlock inside qed_bmap_release_id? > There are two places where this is bad idea as driver needs to release two > IDs but still one is in error flow and second is when destroying QP so for > most cases code may look a bit better. > The bitmap functions are being used by various bitmaps one of which is the cid. The cid code must allocate two consecutive cids. So here the lock is over two calls to the bit allocating call. I am planning to recode the cid to use one bit instead of two, this is further down the list. Thanks for the suggestion, Ram ^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH net 1/3] qed: Release CQ resource under lock on failure 2017-01-25 7:24 ` Yuval Shaia 2017-01-26 11:43 ` Amrani, Ram @ 2017-02-16 9:19 ` Amrani, Ram 1 sibling, 0 replies; 11+ messages in thread From: Amrani, Ram @ 2017-02-16 9:19 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q Cc: Yuval Shaia, Mintz, Yuval, netdev-u79uwXL29TY76Z2rM5mHXA, linux-rdma-u79uwXL29TY76Z2rM5mHXA, Kalderon, Michal, Elior, Ariel > The bitmap functions are being used by various bitmaps one of which is the cid. > The cid code must allocate two consecutive cids. So here the lock is over two calls > to the bit allocating call. > > I am planning to recode the cid to use one bit instead of two, this is further > down the list. > > Thanks for the suggestion, > Ram Hi Dave, The patches should be taken as is. The improvement suggestion about the (widely used) mechanism is still under consideration and will surely not be part of 4.10. Shall I resend V1? Thanks, Ram -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH net 2/3] qed: Read queue state before releasing buffer 2017-01-24 21:15 ` Yuval Mintz @ 2017-01-24 21:15 ` Yuval Mintz -1 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem, netdev; +Cc: linux-rdma, Ram.Amrani, Yuval Mintz From: Ram Amrani <Ram.Amrani@cavium.com> Currently the state is read only after the buffers are relesed. Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com> Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> --- drivers/net/ethernet/qlogic/qed/qed_roce.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c index 7ab6d4e..0846068 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c @@ -1768,13 +1768,13 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, if (rc) goto err_resp; - dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res), - p_resp_ramrod_res, resp_ramrod_res_phys); - out_params->rq_psn = le32_to_cpu(p_resp_ramrod_res->psn); rq_err_state = GET_FIELD(le32_to_cpu(p_resp_ramrod_res->err_flag), ROCE_QUERY_QP_RESP_OUTPUT_PARAMS_ERROR_FLG); + dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res), + p_resp_ramrod_res, resp_ramrod_res_phys); + if (!(qp->req_offloaded)) { /* Don't send query qp for the requester */ out_params->sq_psn = qp->sq_psn; @@ -1815,9 +1815,6 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, if (rc) goto err_req; - dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res), - p_req_ramrod_res, req_ramrod_res_phys); - out_params->sq_psn = le32_to_cpu(p_req_ramrod_res->psn); sq_err_state = GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags), ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_ERR_FLG); @@ -1825,6 +1822,9 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags), ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_SQ_DRAINING_FLG); + dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res), + p_req_ramrod_res, req_ramrod_res_phys); + out_params->draining = false; if (rq_err_state) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net 2/3] qed: Read queue state before releasing buffer @ 2017-01-24 21:15 ` Yuval Mintz 0 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem, netdev; +Cc: linux-rdma, Ram.Amrani, Yuval Mintz From: Ram Amrani <Ram.Amrani@cavium.com> Currently the state is read only after the buffers are relesed. Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com> Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com> --- drivers/net/ethernet/qlogic/qed/qed_roce.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c index 7ab6d4e..0846068 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c @@ -1768,13 +1768,13 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, if (rc) goto err_resp; - dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res), - p_resp_ramrod_res, resp_ramrod_res_phys); - out_params->rq_psn = le32_to_cpu(p_resp_ramrod_res->psn); rq_err_state = GET_FIELD(le32_to_cpu(p_resp_ramrod_res->err_flag), ROCE_QUERY_QP_RESP_OUTPUT_PARAMS_ERROR_FLG); + dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res), + p_resp_ramrod_res, resp_ramrod_res_phys); + if (!(qp->req_offloaded)) { /* Don't send query qp for the requester */ out_params->sq_psn = qp->sq_psn; @@ -1815,9 +1815,6 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, if (rc) goto err_req; - dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res), - p_req_ramrod_res, req_ramrod_res_phys); - out_params->sq_psn = le32_to_cpu(p_req_ramrod_res->psn); sq_err_state = GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags), ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_ERR_FLG); @@ -1825,6 +1822,9 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags), ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_SQ_DRAINING_FLG); + dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res), + p_req_ramrod_res, req_ramrod_res_phys); + out_params->draining = false; if (rq_err_state) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
[parent not found: <1485292523-8821-1-git-send-email-Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>]
* [PATCH net 3/3] qed: Don't free a QP more than once [not found] ` <1485292523-8821-1-git-send-email-Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> @ 2017-01-24 21:15 ` Yuval Mintz 0 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA, Yuval Mintz From: Ram Amrani <Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> If QP is in reset state then there are no resources to free so avoid freeing any. Signed-off-by: Ram Amrani <Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> Signed-off-by: Yuval Mintz <Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> --- drivers/net/ethernet/qlogic/qed/qed_roce.c | 49 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c index 0846068..a074c76 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c @@ -1849,6 +1849,7 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) { + struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info; u32 num_invalidated_mw = 0; u32 num_bound_mw = 0; u32 start_cid; @@ -1863,35 +1864,39 @@ static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) return -EINVAL; } - rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp, &num_invalidated_mw); - if (rc) - return rc; + if (qp->cur_state != QED_ROCE_QP_STATE_RESET) { + rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp, + &num_invalidated_mw); + if (rc) + return rc; - /* Send destroy requester ramrod */ - rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp, &num_bound_mw); - if (rc) - return rc; + /* Send destroy requester ramrod */ + rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp, + &num_bound_mw); + if (rc) + return rc; - if (num_invalidated_mw != num_bound_mw) { - DP_NOTICE(p_hwfn, - "number of invalidate memory windows is different from bounded ones\n"); - return -EINVAL; - } + if (num_invalidated_mw != num_bound_mw) { + DP_NOTICE(p_hwfn, + "number of invalidate memory windows is different from bounded ones\n"); + return -EINVAL; + } - spin_lock_bh(&p_hwfn->p_rdma_info->lock); + spin_lock_bh(&p_rdma_info->lock); - start_cid = qed_cxt_get_proto_cid_start(p_hwfn, - p_hwfn->p_rdma_info->proto); + start_cid = qed_cxt_get_proto_cid_start(p_hwfn, + p_rdma_info->proto); - /* Release responder's icid */ - qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map, - qp->icid - start_cid); + /* Release responder's icid */ + qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, + qp->icid - start_cid); - /* Release requester's icid */ - qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map, - qp->icid + 1 - start_cid); + /* Release requester's icid */ + qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, + qp->icid + 1 - start_cid); - spin_unlock_bh(&p_hwfn->p_rdma_info->lock); + spin_unlock_bh(&p_rdma_info->lock); + } return 0; } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH net 3/3] qed: Don't free a QP more than once @ 2017-01-24 21:15 ` Yuval Mintz 0 siblings, 0 replies; 11+ messages in thread From: Yuval Mintz @ 2017-01-24 21:15 UTC (permalink / raw) To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, netdev-u79uwXL29TY76Z2rM5mHXA Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA, Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA, Yuval Mintz From: Ram Amrani <Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> If QP is in reset state then there are no resources to free so avoid freeing any. Signed-off-by: Ram Amrani <Ram.Amrani-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> Signed-off-by: Yuval Mintz <Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> --- drivers/net/ethernet/qlogic/qed/qed_roce.c | 49 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_roce.c b/drivers/net/ethernet/qlogic/qed/qed_roce.c index 0846068..a074c76 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_roce.c +++ b/drivers/net/ethernet/qlogic/qed/qed_roce.c @@ -1849,6 +1849,7 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) { + struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info; u32 num_invalidated_mw = 0; u32 num_bound_mw = 0; u32 start_cid; @@ -1863,35 +1864,39 @@ static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) return -EINVAL; } - rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp, &num_invalidated_mw); - if (rc) - return rc; + if (qp->cur_state != QED_ROCE_QP_STATE_RESET) { + rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp, + &num_invalidated_mw); + if (rc) + return rc; - /* Send destroy requester ramrod */ - rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp, &num_bound_mw); - if (rc) - return rc; + /* Send destroy requester ramrod */ + rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp, + &num_bound_mw); + if (rc) + return rc; - if (num_invalidated_mw != num_bound_mw) { - DP_NOTICE(p_hwfn, - "number of invalidate memory windows is different from bounded ones\n"); - return -EINVAL; - } + if (num_invalidated_mw != num_bound_mw) { + DP_NOTICE(p_hwfn, + "number of invalidate memory windows is different from bounded ones\n"); + return -EINVAL; + } - spin_lock_bh(&p_hwfn->p_rdma_info->lock); + spin_lock_bh(&p_rdma_info->lock); - start_cid = qed_cxt_get_proto_cid_start(p_hwfn, - p_hwfn->p_rdma_info->proto); + start_cid = qed_cxt_get_proto_cid_start(p_hwfn, + p_rdma_info->proto); - /* Release responder's icid */ - qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map, - qp->icid - start_cid); + /* Release responder's icid */ + qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, + qp->icid - start_cid); - /* Release requester's icid */ - qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map, - qp->icid + 1 - start_cid); + /* Release requester's icid */ + qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map, + qp->icid + 1 - start_cid); - spin_unlock_bh(&p_hwfn->p_rdma_info->lock); + spin_unlock_bh(&p_rdma_info->lock); + } return 0; } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-02-16 9:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-24 21:15 [PATCH net 0/3] qed: RoCE infrastrucutre fixes Yuval Mintz
2017-01-24 21:15 ` Yuval Mintz
2017-01-24 21:15 ` [PATCH net 1/3] qed: Release CQ resource under lock on failure Yuval Mintz
2017-01-24 21:15 ` Yuval Mintz
[not found] ` <1485292523-8821-2-git-send-email-Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>
2017-01-25 7:24 ` Yuval Shaia
2017-01-26 11:43 ` Amrani, Ram
2017-02-16 9:19 ` Amrani, Ram
2017-01-24 21:15 ` [PATCH net 2/3] qed: Read queue state before releasing buffer Yuval Mintz
2017-01-24 21:15 ` Yuval Mintz
[not found] ` <1485292523-8821-1-git-send-email-Yuval.Mintz-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>
2017-01-24 21:15 ` [PATCH net 3/3] qed: Don't free a QP more than once Yuval Mintz
2017-01-24 21:15 ` Yuval Mintz
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.