From: Bob Pearson <rpearsonhpe@gmail.com>
To: jgg@nvidia.com, zyjzyj2000@gmail.com, leon@kernel.org,
jhack@hpe.com, ian.ziemba@hpe.com, matsuda-daisuke@fujitsu.com,
lizhijian@fujitsu.com, haris.phnx@gmail.com,
linux-rdma@vger.kernel.org
Cc: Bob Pearson <rpearsonhpe@gmail.com>
Subject: [PATCH for-next v2 08/18] RDMA/rxe: Split rxe_drain_resp_pkts()
Date: Fri, 21 Oct 2022 15:01:09 -0500 [thread overview]
Message-ID: <20221021200118.2163-9-rpearsonhpe@gmail.com> (raw)
In-Reply-To: <20221021200118.2163-1-rpearsonhpe@gmail.com>
Split rxe_drain_resp_pkts() into two subroutines which perform separate
functions.
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
---
drivers/infiniband/sw/rxe/rxe_comp.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c
index d2a250123617..5d434cce2b69 100644
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@ -524,17 +524,21 @@ static inline enum comp_state complete_wqe(struct rxe_qp *qp,
return COMPST_GET_WQE;
}
-static void rxe_drain_resp_pkts(struct rxe_qp *qp, bool notify)
+static void rxe_drain_resp_pkts(struct rxe_qp *qp)
{
struct sk_buff *skb;
- struct rxe_send_wqe *wqe;
- struct rxe_queue *q = qp->sq.queue;
while ((skb = skb_dequeue(&qp->resp_pkts))) {
rxe_put(qp);
kfree_skb(skb);
ib_device_put(qp->ibqp.device);
}
+}
+
+static void rxe_drain_send_queue(struct rxe_qp *qp, bool notify)
+{
+ struct rxe_send_wqe *wqe;
+ struct rxe_queue *q = qp->sq.queue;
while ((wqe = queue_head(q, q->type))) {
if (notify) {
@@ -565,6 +569,7 @@ int rxe_completer(void *arg)
struct sk_buff *skb = NULL;
struct rxe_pkt_info *pkt = NULL;
enum comp_state state;
+ bool notify;
int ret;
if (!rxe_get(qp))
@@ -572,8 +577,9 @@ int rxe_completer(void *arg)
if (!qp->valid || qp->comp.state == QP_STATE_ERROR ||
qp->comp.state == QP_STATE_RESET) {
- rxe_drain_resp_pkts(qp, qp->valid &&
- qp->comp.state == QP_STATE_ERROR);
+ notify = qp->valid && (qp->comp.state == QP_STATE_ERROR);
+ rxe_drain_resp_pkts(qp);
+ rxe_drain_send_queue(qp, notify);
goto exit;
}
--
2.34.1
next prev parent reply other threads:[~2022-10-21 20:02 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-21 20:01 [PATCH v2 00/18] Implement work queues for rdma_rxe Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 01/18] RDMA/rxe: Remove redundant header files Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 02/18] RDMA/rxe: Remove init of task locks from rxe_qp.c Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 03/18] RDMA/rxe: Removed unused name from rxe_task struct Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 04/18] RDMA/rxe: Split rxe_run_task() into two subroutines Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 05/18] RDMA/rxe: Make rxe_do_task static Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 06/18] RDMA/rxe: Rename task->state_lock to task->lock Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 07/18] RDMA/rxe: Make task interface pluggable Bob Pearson
2022-10-25 8:02 ` Daisuke Matsuda (Fujitsu)
2022-10-25 14:16 ` Bob Pearson
2022-10-21 20:01 ` Bob Pearson [this message]
2022-10-21 20:01 ` [PATCH for-next v2 09/18] RDMA/rxe: Simplify reset state handling in rxe_resp.c Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 10/18] RDMA/rxe: Handle qp error " Bob Pearson
2022-10-21 21:22 ` kernel test robot
2022-10-21 20:01 ` [PATCH for-next v2 11/18] RDMA/rxe: Cleanup comp tasks in rxe_qp.c Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 12/18] RDMA/rxe: Remove __rxe_do_task() Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 13/18] RDMA/rxe: Make tasks schedule each other Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 14/18] RDMA/rxe: Implement disable/enable_task() Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 15/18] RDMA/rxe: Replace TASK_STATE_START by TASK_STATE_IDLE Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 16/18] RDMA/rxe: Replace task->destroyed by task state INVALID Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 17/18] RDMA/rxe: Add workqueue support for tasks Bob Pearson
2022-10-21 20:01 ` [PATCH for-next v2 18/18] RDMA/rxe: Add parameters to control task type Bob Pearson
2022-10-25 9:35 ` Daisuke Matsuda (Fujitsu)
2022-10-25 11:18 ` Jason Gunthorpe
2022-10-25 14:31 ` Bob Pearson
2022-10-25 16:27 ` Jason Gunthorpe
2022-10-25 14:49 ` Bob Pearson
2022-10-26 7:07 ` Daisuke Matsuda (Fujitsu)
2022-10-28 17:04 ` [PATCH v2 00/18] Implement work queues for rdma_rxe Jason Gunthorpe
2022-10-28 18:16 ` Bob Pearson
2022-10-28 18:17 ` Jason Gunthorpe
2022-10-28 18:58 ` Bob Pearson
2022-10-28 19:16 ` Jason Gunthorpe
2022-10-28 19:29 ` Pearson, Robert B
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=20221021200118.2163-9-rpearsonhpe@gmail.com \
--to=rpearsonhpe@gmail.com \
--cc=haris.phnx@gmail.com \
--cc=ian.ziemba@hpe.com \
--cc=jgg@nvidia.com \
--cc=jhack@hpe.com \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=lizhijian@fujitsu.com \
--cc=matsuda-daisuke@fujitsu.com \
--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