From: Bob Pearson <rpearsonhpe@gmail.com>
To: jgg@nvidia.com, leon@kernel.org, zyjzyj2000@gmail.com,
jhack@hpe.com, linux-rdma@vger.kernel.org
Cc: Bob Pearson <rpearsonhpe@gmail.com>, Ian Ziemba <ian.ziemba@hpe.com>
Subject: [PATCH for-next v3 10/13] RDMA/rxe: Replace task->destroyed by task state INVALID.
Date: Fri, 28 Oct 2022 22:10:07 -0500 [thread overview]
Message-ID: <20221029031009.64467-11-rpearsonhpe@gmail.com> (raw)
In-Reply-To: <20221029031009.64467-1-rpearsonhpe@gmail.com>
Add a new state TASK_STATE_INVALID to replace the flag task->destroyed.
Make changes to task->state proteted by task->lock now including
TASK_STATE_INVALID.
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
---
drivers/infiniband/sw/rxe/rxe_task.c | 49 ++++++++++------------------
drivers/infiniband/sw/rxe/rxe_task.h | 3 +-
2 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_task.c b/drivers/infiniband/sw/rxe/rxe_task.c
index 0fd0d97e8272..da175f2a0dbf 100644
--- a/drivers/infiniband/sw/rxe/rxe_task.c
+++ b/drivers/infiniband/sw/rxe/rxe_task.c
@@ -8,9 +8,6 @@
static bool task_is_idle(struct rxe_task *task)
{
- if (task->destroyed)
- return false;
-
spin_lock_bh(&task->lock);
switch (task->state) {
case TASK_STATE_IDLE:
@@ -19,12 +16,8 @@ static bool task_is_idle(struct rxe_task *task)
return true;
case TASK_STATE_BUSY:
task->state = TASK_STATE_ARMED;
- fallthrough;
- case TASK_STATE_ARMED:
- case TASK_STATE_PAUSED:
break;
default:
- WARN_ON(1);
break;
}
spin_unlock_bh(&task->lock);
@@ -41,7 +34,8 @@ static void do_task(struct rxe_task *task)
/* flush out pending tasks */
spin_lock_bh(&task->lock);
- if (task->state == TASK_STATE_PAUSED) {
+ if (task->state == TASK_STATE_PAUSED ||
+ task->state == TASK_STATE_INVALID) {
spin_unlock_bh(&task->lock);
return;
}
@@ -69,10 +63,7 @@ static void do_task(struct rxe_task *task)
task->state = TASK_STATE_BUSY;
cont = 1;
break;
- case TASK_STATE_PAUSED:
- break;
default:
- WARN_ON(1);
break;
}
spin_unlock_bh(&task->lock);
@@ -87,14 +78,16 @@ static void do_task(struct rxe_task *task)
static void disable_task(struct rxe_task *task)
{
spin_lock_bh(&task->lock);
- task->state = TASK_STATE_PAUSED;
+ if (task->state != TASK_STATE_INVALID)
+ task->state = TASK_STATE_PAUSED;
spin_unlock_bh(&task->lock);
}
static void enable_task(struct rxe_task *task)
{
spin_lock_bh(&task->lock);
- task->state = TASK_STATE_IDLE;
+ if (task->state != TASK_STATE_INVALID)
+ task->state = TASK_STATE_IDLE;
spin_unlock_bh(&task->lock);
/* restart task in case */
@@ -104,16 +97,16 @@ static void enable_task(struct rxe_task *task)
/* busy wait until any previous tasks are done */
static void cleanup_task(struct rxe_task *task)
{
- bool idle;
-
- task->destroyed = true;
+ bool busy;
do {
spin_lock_bh(&task->lock);
- idle = (task->state == TASK_STATE_IDLE ||
- task->state == TASK_STATE_PAUSED);
+ busy = (task->state == TASK_STATE_BUSY ||
+ task->state == TASK_STATE_ARMED);
+ if (!busy)
+ task->state = TASK_STATE_INVALID;
spin_unlock_bh(&task->lock);
- } while (!idle);
+ } while (busy);
}
/* silently treat schedule as inline for inline tasks */
@@ -131,14 +124,12 @@ static void inline_run(struct rxe_task *task)
static void inline_disable(struct rxe_task *task)
{
- if (!task->destroyed)
- disable_task(task);
+ disable_task(task);
}
static void inline_enable(struct rxe_task *task)
{
- if (!task->destroyed)
- enable_task(task);
+ enable_task(task);
}
static void inline_cleanup(struct rxe_task *task)
@@ -168,10 +159,7 @@ static void tsklet_sched(struct rxe_task *task)
static void tsklet_do_task(struct tasklet_struct *tasklet)
{
- struct rxe_task *task = container_of(tasklet, typeof(*task), tasklet);
-
- if (!task->destroyed)
- do_task(task);
+ do_task(container_of(tasklet, struct rxe_task, tasklet));
}
static void tsklet_run(struct rxe_task *task)
@@ -182,14 +170,12 @@ static void tsklet_run(struct rxe_task *task)
static void tsklet_disable(struct rxe_task *task)
{
- if (!task->destroyed)
- disable_task(task);
+ disable_task(task);
}
static void tsklet_enable(struct rxe_task *task)
{
- if (!task->destroyed)
- enable_task(task);
+ enable_task(task);
}
static void tsklet_cleanup(struct rxe_task *task)
@@ -217,7 +203,6 @@ int rxe_init_task(struct rxe_task *task, void *arg, int (*func)(void *),
{
task->arg = arg;
task->func = func;
- task->destroyed = false;
task->type = type;
task->state = TASK_STATE_IDLE;
diff --git a/drivers/infiniband/sw/rxe/rxe_task.h b/drivers/infiniband/sw/rxe/rxe_task.h
index 0146307fc517..2c4ef4d339f1 100644
--- a/drivers/infiniband/sw/rxe/rxe_task.h
+++ b/drivers/infiniband/sw/rxe/rxe_task.h
@@ -27,6 +27,7 @@ enum {
TASK_STATE_BUSY = 1,
TASK_STATE_ARMED = 2,
TASK_STATE_PAUSED = 3,
+ TASK_STATE_INVALID = 4,
};
/*
@@ -41,7 +42,7 @@ struct rxe_task {
void *arg;
int (*func)(void *arg);
int ret;
- bool destroyed;
+ bool invalid;
const struct rxe_task_ops *ops;
enum rxe_task_type type;
};
--
2.34.1
next prev parent reply other threads:[~2022-10-29 3:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-29 3:09 [PATCH for-next v3 00/13] Implement work queues for rdma_rxe Bob Pearson
2022-10-29 3:09 ` [PATCH for-next v3 01/13] RDMA/rxe: Make task interface pluggable Bob Pearson
2022-11-11 2:28 ` Yanjun Zhu
2022-10-29 3:09 ` [PATCH for-next v3 02/13] RDMA/rxe: Split rxe_drain_resp_pkts() Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 03/13] RDMA/rxe: Simplify reset state handling in rxe_resp.c Bob Pearson
2022-11-11 3:04 ` Yanjun Zhu
2022-10-29 3:10 ` [PATCH for-next v3 04/13] RDMA/rxe: Handle qp error " Bob Pearson
2022-10-29 3:10 ` [PATCH v3 05/13] RDMA/rxe: Cleanup comp tasks in rxe_qp.c Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 06/13] RDMA/rxe: Remove __rxe_do_task() Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 07/13] RDMA/rxe: Make tasks schedule each other Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 08/13] RDMA/rxe: Implement disable/enable_task() Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 09/13] RDMA/rxe: Replace TASK_STATE_START by TASK_STATE_IDLE Bob Pearson
2022-10-29 3:10 ` Bob Pearson [this message]
2022-10-29 3:10 ` [PATCH for-next v3 11/13] RDMA/rxe: Add workqueue support for tasks Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 12/13] RDMA/rxe: Make WORKQUEUE default for RC tasks Bob Pearson
2022-10-29 3:10 ` [PATCH for-next v3 13/13] RDMA/rxe: Remove tasklets from rxe_task.c Bob Pearson
2022-11-02 10:17 ` [PATCH for-next v3 00/13] Implement work queues for rdma_rxe Daisuke Matsuda (Fujitsu)
2022-11-02 11:20 ` Bob Pearson
2022-11-04 4:59 ` Daisuke Matsuda (Fujitsu)
2022-11-05 21:15 ` Bob Pearson
2022-11-07 8:21 ` Daisuke Matsuda (Fujitsu)
2022-11-07 16:06 ` Bob Pearson
2022-11-18 5:02 ` Daisuke Matsuda (Fujitsu)
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=20221029031009.64467-11-rpearsonhpe@gmail.com \
--to=rpearsonhpe@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=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;
as well as URLs for NNTP newsgroup(s).