From: Li Zhijian <lizhijian@fujitsu.com>
To: <zyjzyj2000@gmail.com>, <jgg@ziepe.ca>, <leon@kernel.org>,
<linux-rdma@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, Li Zhijian <lizhijian@fujitsu.com>
Subject: [for-next PATCH v2 1/2] RDMA/rxe: Remove unnecessary mr testing
Date: Fri, 21 Oct 2022 07:52:44 +0000 [thread overview]
Message-ID: <1666338764-2-2-git-send-email-lizhijian@fujitsu.com> (raw)
In-Reply-To: <1666338764-2-1-git-send-email-lizhijian@fujitsu.com>
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
next prev parent reply other threads:[~2022-10-21 7:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1666338764-2-2-git-send-email-lizhijian@fujitsu.com \
--to=lizhijian@fujitsu.com \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=zyjzyj2000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox