| Message ID | 20220708035547.6592-1-yangx.jy@fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [RESEND] RDMA/rxe: Remove unused qp parameter | expand |
On Fri, Jul 08, 2022 at 03:55:50AM +0000, yangx.jy@fujitsu.com wrote: > The qp parameter in free_rd_atomic_resource() has become > unused so remove it directly. > > Fixes: 15ae1375ea91 ("RDMA/rxe: Fix qp reference counting for atomic ops") > Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com> > --- > drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- > drivers/infiniband/sw/rxe/rxe_qp.c | 6 +++--- > drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) The patch doesn't apply. Thanks
On 2022/7/18 16:26, Leon Romanovsky wrote: > On Fri, Jul 08, 2022 at 03:55:50AM +0000, yangx.jy@fujitsu.com wrote: >> The qp parameter in free_rd_atomic_resource() has become >> unused so remove it directly. >> >> Fixes: 15ae1375ea91 ("RDMA/rxe: Fix qp reference counting for atomic ops") >> Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com> >> --- >> drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- >> drivers/infiniband/sw/rxe/rxe_qp.c | 6 +++--- >> drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- >> 3 files changed, 5 insertions(+), 5 deletions(-) > > The patch doesn't apply. > > Thanks Hi Leon, Could you tell me why it doesn't apply? Best Regards, Xiao Yang
On Mon, Jul 18, 2022 at 08:58:32AM +0000, yangx.jy@fujitsu.com wrote: > On 2022/7/18 16:26, Leon Romanovsky wrote: > > On Fri, Jul 08, 2022 at 03:55:50AM +0000, yangx.jy@fujitsu.com wrote: > >> The qp parameter in free_rd_atomic_resource() has become > >> unused so remove it directly. > >> > >> Fixes: 15ae1375ea91 ("RDMA/rxe: Fix qp reference counting for atomic ops") > >> Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com> > >> --- > >> drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- > >> drivers/infiniband/sw/rxe/rxe_qp.c | 6 +++--- > >> drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- > >> 3 files changed, 5 insertions(+), 5 deletions(-) > > > > The patch doesn't apply. > > > > Thanks > > Hi Leon, > > Could you tell me why it doesn't apply? Please, try to apply the patch to wip/leon-for-next branch. Thanks > > Best Regards, > Xiao Yang
On 2022/7/18 20:16, Leon Romanovsky wrote: > Please, try to apply the patch to wip/leon-for-next branch. > > Thanks Hi Leon, It's OK to apply it to wip/leon-for-next branch on my environment. Did I miss something? # git pull rdma wip/leon-for-next From https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma * branch wip/leon-for-next -> FETCH_HEAD Already up to date. # git am 0001-RDMA-rxe-Remove-unused-qp-parameter.patch Applying: RDMA/rxe: Remove unused qp parameter Best Regards, Xiao Yang
On Tue, Jul 19, 2022 at 02:22:35AM +0000, yangx.jy@fujitsu.com wrote: > On 2022/7/18 20:16, Leon Romanovsky wrote: > > Please, try to apply the patch to wip/leon-for-next branch. > > > > Thanks > > Hi Leon, > > It's OK to apply it to wip/leon-for-next branch on my environment. Did > I miss something? > > # git pull rdma wip/leon-for-next > From https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma > * branch wip/leon-for-next -> FETCH_HEAD > Already up to date. > # git am 0001-RDMA-rxe-Remove-unused-qp-parameter.patch > Applying: RDMA/rxe: Remove unused qp parameter Strange, I used b4 and it failed to apply, but manually it worked. Thanks, applied. > > Best Regards, > Xiao Yang
diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h index 0e022ae1b8a5..336164843db4 100644 --- a/drivers/infiniband/sw/rxe/rxe_loc.h +++ b/drivers/infiniband/sw/rxe/rxe_loc.h @@ -145,7 +145,7 @@ static inline int rcv_wqe_size(int max_sge) max_sge * sizeof(struct ib_sge); } -void free_rd_atomic_resource(struct rxe_qp *qp, struct resp_res *res); +void free_rd_atomic_resource(struct resp_res *res); static inline void rxe_advance_resp_resource(struct rxe_qp *qp) { diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 8355a5b1cb60..9ecb98150e0e 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -120,14 +120,14 @@ static void free_rd_atomic_resources(struct rxe_qp *qp) for (i = 0; i < qp->attr.max_dest_rd_atomic; i++) { struct resp_res *res = &qp->resp.resources[i]; - free_rd_atomic_resource(qp, res); + free_rd_atomic_resource(res); } kfree(qp->resp.resources); qp->resp.resources = NULL; } } -void free_rd_atomic_resource(struct rxe_qp *qp, struct resp_res *res) +void free_rd_atomic_resource(struct resp_res *res) { res->type = 0; } @@ -140,7 +140,7 @@ static void cleanup_rd_atomic_resources(struct rxe_qp *qp) if (qp->resp.resources) { for (i = 0; i < qp->attr.max_dest_rd_atomic; i++) { res = &qp->resp.resources[i]; - free_rd_atomic_resource(qp, res); + free_rd_atomic_resource(res); } } } diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c index 265e46fe050f..28033849d404 100644 --- a/drivers/infiniband/sw/rxe/rxe_resp.c +++ b/drivers/infiniband/sw/rxe/rxe_resp.c @@ -562,7 +562,7 @@ static struct resp_res *rxe_prepare_res(struct rxe_qp *qp, res = &qp->resp.resources[qp->resp.res_head]; rxe_advance_resp_resource(qp); - free_rd_atomic_resource(qp, res); + free_rd_atomic_resource(res); res->type = type; res->replay = 0;
The qp parameter in free_rd_atomic_resource() has become unused so remove it directly. Fixes: 15ae1375ea91 ("RDMA/rxe: Fix qp reference counting for atomic ops") Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com> --- drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- drivers/infiniband/sw/rxe/rxe_qp.c | 6 +++--- drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)