From: Bob Pearson <rpearsonhpe@gmail.com>
To: yanjun.zhu@linux.dev, jgg@ziepe.ca, leon@kernel.org,
linux-rdma@vger.kernel.org, jhack@hpe.com
Cc: Bob Pearson <rpearsonhpe@gmail.com>
Subject: [PATCH for-next 01/11] RDMA/rxe: Fix seg fault in rxe_comp_queue_pkt
Date: Tue, 26 Mar 2024 12:43:16 -0500 [thread overview]
Message-ID: <20240326174325.300849-3-rpearsonhpe@gmail.com> (raw)
In-Reply-To: <20240326174325.300849-2-rpearsonhpe@gmail.com>
In rxe_comp_queue_pkt() an incoming response packet skb is enqueued
to the resp_pkts queue and then a decision is made whether to run the
completer task inline or schedule it. Finally the skb is dereferenced
to bump a 'hw' performance counter. This is wrong because if the
completer task is already running in a separate thread it may have
already processed the skb and freed it which can cause a seg fault.
This has been observed infrequently in testing at high scale.
This patch fixes this by changing the order of enqueuing the packet
until after the counter is accessed.
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Fixes: 0b1e5b99a48b ("IB/rxe: Add port protocol stats")
---
drivers/infiniband/sw/rxe/rxe_comp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c
index b78b8c0856ab..c997b7cbf2a9 100644
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@ -131,12 +131,12 @@ void rxe_comp_queue_pkt(struct rxe_qp *qp, struct sk_buff *skb)
{
int must_sched;
- skb_queue_tail(&qp->resp_pkts, skb);
-
- must_sched = skb_queue_len(&qp->resp_pkts) > 1;
+ must_sched = skb_queue_len(&qp->resp_pkts) > 0;
if (must_sched != 0)
rxe_counter_inc(SKB_TO_PKT(skb)->rxe, RXE_CNT_COMPLETER_SCHED);
+ skb_queue_tail(&qp->resp_pkts, skb);
+
if (must_sched)
rxe_sched_task(&qp->comp.task);
else
--
2.43.0
next prev parent reply other threads:[~2024-03-26 17:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 17:43 [PATCH for-next 00/11] RDMA/rxe: Various fixes and cleanups Bob Pearson
2024-03-26 17:43 ` Bob Pearson [this message]
2024-04-02 12:31 ` [PATCH for-next 01/11] RDMA/rxe: Fix seg fault in rxe_comp_queue_pkt Leon Romanovsky
2024-03-26 17:43 ` [PATCH for-next 02/11] RDMA/rxe: Allow good work requests to be executed Bob Pearson
2024-04-02 12:57 ` Zhu Yanjun
2024-03-26 17:43 ` [PATCH for-next 03/11] RDMA/rxe: Remove redundant scheduling of rxe_completer Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 04/11] RDMA/rxe: Merge request and complete tasks Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 05/11] RDMA/rxe: Remove save/rollback_state in rxe_requester Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 06/11] RDMA/rxe: Don't schedule rxe_completer() in rxe_requester() Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 07/11] RDMA/rxe: Don't call rxe_requester from rxe_completer Bob Pearson
2024-04-02 12:29 ` Leon Romanovsky
2024-03-26 17:43 ` [PATCH for-next 08/11] RDMA/rxe: Don't call direct between tasks Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 09/11] RDMA/rxe: Fix incorrect rxe_put in error path Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 10/11] RDMA/rxe: Make rxe_loopback match rxe_send behavior Bob Pearson
2024-03-26 17:43 ` [PATCH for-next 11/11] RDMA/rxe: Get rid of pkt resend on err Bob Pearson
2024-03-26 19:01 ` [PATCH for-next 00/11] RDMA/rxe: Various fixes and cleanups Zhu Yanjun
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=20240326174325.300849-3-rpearsonhpe@gmail.com \
--to=rpearsonhpe@gmail.com \
--cc=jgg@ziepe.ca \
--cc=jhack@hpe.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=yanjun.zhu@linux.dev \
/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