public inbox for linux-rdma@vger.kernel.org
 help / color / mirror / Atom feed
* [for-next PATCH v2 1/2] RDMA/rxe: Remove unnecessary mr testing
@ 2022-10-21  7:52 Li Zhijian
  2022-10-21  7:52 ` Li Zhijian
  0 siblings, 1 reply; 9+ messages in thread
From: Li Zhijian @ 2022-10-21  7:52 UTC (permalink / raw)
  To: zyjzyj2000, jgg, leon, linux-rdma; +Cc: linux-kernel, Li Zhijian

Before the testing, we already passed it to rxe_mr_copy() where mr could
be dereferenced. so this checking is not exactly correct.

I tried to figure out the details how/when mr could be NULL, but failed
at last. Add a WARN_ON(!mr) to that path to tell us more when it
happends.

Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
---
 drivers/infiniband/sw/rxe/rxe_resp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
index ed5a09e86417..218c14fb07c6 100644
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -778,6 +778,7 @@ static enum resp_states read_reply(struct rxe_qp *qp,
 	if (res->state == rdatm_res_state_new) {
 		if (!res->replay) {
 			mr = qp->resp.mr;
+			WARN_ON(!mr);
 			qp->resp.mr = NULL;
 		} else {
 			mr = rxe_recheck_mr(qp, res->read.rkey);
@@ -811,8 +812,7 @@ static enum resp_states read_reply(struct rxe_qp *qp,
 
 	rxe_mr_copy(mr, res->read.va, payload_addr(&ack_pkt),
 		    payload, RXE_FROM_MR_OBJ);
-	if (mr)
-		rxe_put(mr);
+	rxe_put(mr);
 
 	if (bth_pad(&ack_pkt)) {
 		u8 *pad = payload_addr(&ack_pkt) + payload;
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-10-24 20:02 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-21  7:52 [for-next PATCH v2 1/2] RDMA/rxe: Remove unnecessary mr testing Li Zhijian
2022-10-21  7:52 ` Li Zhijian
2022-10-21 14:39   ` Zhu Yanjun
2022-10-22  1:09     ` Li Zhijian
2022-10-23 18:05       ` Bob Pearson
2022-10-24  2:25         ` Zhu Yanjun
2022-10-24  3:15           ` Li Zhijian
2022-10-24 14:09           ` Bob Pearson
2022-10-24  3:26   ` Li Zhijian

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox