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>
Subject: [PATCH for-next v3 13/13] RDMA/rxe: Remove tasklets from rxe_task.c
Date: Fri, 28 Oct 2022 22:10:10 -0500 [thread overview]
Message-ID: <20221029031009.64467-14-rpearsonhpe@gmail.com> (raw)
In-Reply-To: <20221029031009.64467-1-rpearsonhpe@gmail.com>
Remove the option to select tasklets(). Maintain the option to have
a pluggable interface for future expansion.
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
---
drivers/infiniband/sw/rxe/rxe_task.c | 51 ----------------------------
drivers/infiniband/sw/rxe/rxe_task.h | 8 ++---
2 files changed, 2 insertions(+), 57 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_task.c b/drivers/infiniband/sw/rxe/rxe_task.c
index c1177752088d..d9c4ab2e58c8 100644
--- a/drivers/infiniband/sw/rxe/rxe_task.c
+++ b/drivers/infiniband/sw/rxe/rxe_task.c
@@ -166,54 +166,6 @@ static void inline_init(struct rxe_task *task)
task->ops = &inline_ops;
}
-/* use tsklet_xxx to avoid name collisions with tasklet_xxx */
-static void tsklet_sched(struct rxe_task *task)
-{
- if (task_is_idle(task))
- tasklet_schedule(&task->tasklet);
-}
-
-static void tsklet_do_task(struct tasklet_struct *tasklet)
-{
- do_task(container_of(tasklet, struct rxe_task, tasklet));
-}
-
-static void tsklet_run(struct rxe_task *task)
-{
- if (task_is_idle(task))
- do_task(task);
-}
-
-static void tsklet_disable(struct rxe_task *task)
-{
- disable_task(task);
-}
-
-static void tsklet_enable(struct rxe_task *task)
-{
- enable_task(task);
-}
-
-static void tsklet_cleanup(struct rxe_task *task)
-{
- cleanup_task(task);
- tasklet_kill(&task->tasklet);
-}
-
-static const struct rxe_task_ops tsklet_ops = {
- .sched = tsklet_sched,
- .run = tsklet_run,
- .enable = tsklet_enable,
- .disable = tsklet_disable,
- .cleanup = tsklet_cleanup,
-};
-
-static void tsklet_init(struct rxe_task *task)
-{
- tasklet_setup(&task->tasklet, tsklet_do_task);
- task->ops = &tsklet_ops;
-}
-
static void work_sched(struct rxe_task *task)
{
if (task_is_idle(task))
@@ -275,9 +227,6 @@ int rxe_init_task(struct rxe_task *task, void *arg, int (*func)(void *),
case RXE_TASK_TYPE_INLINE:
inline_init(task);
break;
- case RXE_TASK_TYPE_TASKLET:
- tsklet_init(task);
- break;
case RXE_TASK_TYPE_WORKQUEUE:
work_init(task);
break;
diff --git a/drivers/infiniband/sw/rxe/rxe_task.h b/drivers/infiniband/sw/rxe/rxe_task.h
index d1156b935635..fbc7e2bf4e5a 100644
--- a/drivers/infiniband/sw/rxe/rxe_task.h
+++ b/drivers/infiniband/sw/rxe/rxe_task.h
@@ -19,8 +19,7 @@ struct rxe_task_ops {
enum rxe_task_type {
RXE_TASK_TYPE_INLINE = 0,
- RXE_TASK_TYPE_TASKLET = 1,
- RXE_TASK_TYPE_WORKQUEUE = 2,
+ RXE_TASK_TYPE_WORKQUEUE = 1,
};
enum {
@@ -37,10 +36,7 @@ enum {
* called again.
*/
struct rxe_task {
- union {
- struct tasklet_struct tasklet;
- struct work_struct work;
- };
+ struct work_struct work;
int state;
spinlock_t lock;
void *arg;
--
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 ` [PATCH for-next v3 10/13] RDMA/rxe: Replace task->destroyed by task state INVALID Bob Pearson
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 ` Bob Pearson [this message]
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-14-rpearsonhpe@gmail.com \
--to=rpearsonhpe@gmail.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).