iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDMA/rxe: Rename task->state_lock to task->lock

Browse Source 
Rename task-state_lock to task->lock

Link: https://lore.kernel.org/r/20221021200118.2163-7-rpearsonhpe@gmail.com
Signed-off-by: Ian Ziemba <ian.ziemba@hpe.com>
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Bob Pearson 2022-10-21 15:01:07 -05:00 committed by Jason Gunthorpe
parent dcef28528c
commit 63a18baef2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/infiniband/sw/rxe/rxe_task.c
View File

@ -31,22 +31,22 @@ static void do_task(struct tasklet_struct *t)
struct rxe_task *task = from_tasklet(task, t, tasklet); struct rxe_task *task = from_tasklet(task, t, tasklet);
unsigned int iterations = RXE_MAX_ITERATIONS; unsigned int iterations = RXE_MAX_ITERATIONS;
spin_lock_bh(&task->state_lock); spin_lock_bh(&task->lock);
switch (task->state) { switch (task->state) {
case TASK_STATE_START: case TASK_STATE_START:
task->state = TASK_STATE_BUSY; task->state = TASK_STATE_BUSY;
spin_unlock_bh(&task->state_lock); spin_unlock_bh(&task->lock);
break; break;
case TASK_STATE_BUSY: case TASK_STATE_BUSY:
task->state = TASK_STATE_ARMED; task->state = TASK_STATE_ARMED;
fallthrough; fallthrough;
case TASK_STATE_ARMED: case TASK_STATE_ARMED:
spin_unlock_bh(&task->state_lock); spin_unlock_bh(&task->lock);
return; return;
default: default:
spin_unlock_bh(&task->state_lock); spin_unlock_bh(&task->lock);
pr_warn("%s failed with bad state %d\n", __func__, task->state); pr_warn("%s failed with bad state %d\n", __func__, task->state);
return; return;
} }
@ -55,7 +55,7 @@ static void do_task(struct tasklet_struct *t)
cont = 0; cont = 0;
ret = task->func(task->arg); ret = task->func(task->arg);
spin_lock_bh(&task->state_lock); spin_lock_bh(&task->lock);
switch (task->state) { switch (task->state) {
case TASK_STATE_BUSY: case TASK_STATE_BUSY:
if (ret) { if (ret) {
@ -84,7 +84,7 @@ static void do_task(struct tasklet_struct *t)
pr_warn("%s failed with bad state %d\n", __func__, pr_warn("%s failed with bad state %d\n", __func__,
task->state); task->state);
} }
spin_unlock_bh(&task->state_lock); spin_unlock_bh(&task->lock);
} while (cont); } while (cont);
task->ret = ret; task->ret = ret;
@ -99,7 +99,7 @@ int rxe_init_task(struct rxe_task *task, void *arg, int (*func)(void *))
tasklet_setup(&task->tasklet, do_task); tasklet_setup(&task->tasklet, do_task);
task->state = TASK_STATE_START; task->state = TASK_STATE_START;
spin_lock_init(&task->state_lock); spin_lock_init(&task->lock);
return 0; return 0;
} }
@ -115,9 +115,9 @@ void rxe_cleanup_task(struct rxe_task *task)
task->destroyed = true; task->destroyed = true;
do { do {
spin_lock_bh(&task->state_lock); spin_lock_bh(&task->lock);
idle = (task->state == TASK_STATE_START); idle = (task->state == TASK_STATE_START);
spin_unlock_bh(&task->state_lock); spin_unlock_bh(&task->lock);
} while (!idle); } while (!idle);
tasklet_kill(&task->tasklet); tasklet_kill(&task->tasklet);

2
drivers/infiniband/sw/rxe/rxe_task.h
View File

@ -21,7 +21,7 @@ enum {
struct rxe_task { struct rxe_task {
struct tasklet_struct tasklet; struct tasklet_struct tasklet;
int state; int state;
spinlock_t state_lock; /* spinlock for task state */ spinlock_t lock;
void *arg; void *arg;
int (*func)(void *arg); int (*func)(void *arg);
int ret; int ret;