| Message ID | 1505841979-26365-4-git-send-email-Michal.Kalderon@cavium.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | qed: iWARP fixes and enhancements | expand |
On Tue, Sep 19, 2017 at 08:26:18PM +0300, Michal Kalderon wrote: > The maximum number of CQs supported is bound to the number > of connections supported, which differs between RoCE and iWARP. > > This fixes a crash that occurred in iWARP when running 1000 sessions > using perftest. > > Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com> > Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com> > --- It is worth to add Fixes line. Thanks
From: Leon Romanovsky <leon@kernel.org> Sent: Tuesday, September 19, 2017 8:46 PM On Tue, Sep 19, 2017 at 08:26:18PM +0300, Michal Kalderon wrote: >> The maximum number of CQs supported is bound to the number >> of connections supported, which differs between RoCE and iWARP. >> >> This fixes a crash that occurred in iWARP when running 1000 sessions >> using perftest. >> >> Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com> >> Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com> >> --- > >It is worth to add Fixes line. > >Thanks The original code was there before we had iWARP support, so this doesn't exactly fix an older commit, but fixes iWARP code in general.
On Wed, Sep 20, 2017 at 05:46:35AM +0000, Kalderon, Michal wrote: > From: Leon Romanovsky <leon@kernel.org> > Sent: Tuesday, September 19, 2017 8:46 PM > On Tue, Sep 19, 2017 at 08:26:18PM +0300, Michal Kalderon wrote: > >> The maximum number of CQs supported is bound to the number > >> of connections supported, which differs between RoCE and iWARP. > >> > >> This fixes a crash that occurred in iWARP when running 1000 sessions > >> using perftest. > >> > >> Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com> > >> Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com> > >> --- > > > >It is worth to add Fixes line. > > > >Thanks > The original code was there before we had iWARP support, so this doesn't > exactly fix an older commit, but fixes iWARP code in general. So add Fixes which points to iWARP ennoblement patch. Thanks > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c index 4f46f28..c8c4b39 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c +++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c @@ -209,11 +209,11 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn, goto free_pd_map; } - /* Allocate bitmap for cq's. The maximum number of CQs is bounded to - * twice the number of QPs. + /* Allocate bitmap for cq's. The maximum number of CQs is bound to + * the number of connections we support. (num_qps in iWARP or + * num_qps/2 in RoCE). */ - rc = qed_rdma_bmap_alloc(p_hwfn, &p_rdma_info->cq_map, - p_rdma_info->num_qps * 2, "CQ"); + rc = qed_rdma_bmap_alloc(p_hwfn, &p_rdma_info->cq_map, num_cons, "CQ"); if (rc) { DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Failed to allocate cq bitmap, rc = %d\n", rc); @@ -222,10 +222,10 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn, /* Allocate bitmap for toggle bit for cq icids * We toggle the bit every time we create or resize cq for a given icid. - * The maximum number of CQs is bounded to twice the number of QPs. + * Size needs to equal the size of the cq bmap. */ rc = qed_rdma_bmap_alloc(p_hwfn, &p_rdma_info->toggle_bits, - p_rdma_info->num_qps * 2, "Toggle"); + num_cons, "Toggle"); if (rc) { DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Failed to allocate toogle bits, rc = %d\n", rc);