RDMA/rxe: Fix error in rxe_task.c
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix error in rxe_task.c
In a previous patch TASKLET_STATE_SCHED was used as a bit but it is a bit position instead. This patch corrects that error.
--- drivers/infiniband/sw/rxe/rxe_task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_task.c +2 -2
@@ -21,7 +21,7 @@ static bool __reserve_if_idle(struct rxe_task *task) {WARN_ON (rxe_read (task->qp) <=0 ); -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false;if (task->state ==TASK_STATE_IDLE ) {
@@ -46,7 +46,7 @@ static bool __reserve_if_idle(struct rxe_task *task)*/ static bool __is_done (struct rxe_task *task) { -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false; if (task->state == TASK_STATE_IDLE ||
Signature · 1 line
2.37.2
Quoted 10 lines · Bob Pearson
In a previous patch
TASKLET_STATE_SCHEDwas used as a bit but it is a bit position instead. This patch corrects that error.Reported-by Dan Carpenter <[email protected]>Fixes d94671632572 ("RDMA/rxe: Rewrite rxe_task.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Like I said here https://lore.kernel.org/all/20230329191701.GG831478@unrealm
Why didn't you used test_bit?
Also please fix your commit message and title to clearly say what this patch is doing. "Fix error ..." is too broad.
https://lore.kernel.org/all/1a6376525c40454282a14ab659de0b17b02fe523.1680113901.git.leon@kernel.org/
Thanks
Quoted 26 lines
drivers/infiniband/sw/rxe/rxe_task.c +2
-2@@ -21,7 +21,7 @@ static bool __reserve_if_idle(struct rxe_task *task) {WARN_ON (rxe_read (task->qp) <=0 ); -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false;if (task->state ==TASK_STATE_IDLE ) {@@ -46,7 +46,7 @@ static bool __reserve_if_idle(struct rxe_task *task)*/ static bool __is_done (struct rxe_task *task) { -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false; if (task->state == TASK_STATE_IDLE ||Signature · 1 line
2.37.2
Quoted 25 lines · Bob Pearson
In a previous patch
TASKLET_STATE_SCHEDwas used as a bit but it is a bit position instead. This patch corrects that error.Reported-by Dan Carpenter <[email protected]>Fixes d94671632572 ("RDMA/rxe: Rewrite rxe_task.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/infiniband/sw/rxe/rxe_task.c +1
-1@@ -21,7 +21,7 @@ static bool __reserve_if_idle(struct rxe_task *task) {WARN_ON (rxe_read (task->qp) <=0 ); -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false;if (task->state ==TASK_STATE_IDLE ) {
drivers/infiniband/sw/rxe/rxe_task.c static bool __reserve_if_idle(struct rxe_task *task) · line 52
Quoted 8 lines
drivers/infiniband/sw/rxe/rxe_task.c +1
-1@@ -46,7 +46,7 @@ static bool __reserve_if_idle(struct rxe_task *task)*/ static bool __is_done (struct rxe_task *task) { -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false; if (task->state == TASK_STATE_IDLE ||
This patch fixes a bug in rxe_task.c introduced by the earlier patch (d94671632572 RDMA/rxe: Rewrite rxe_task.c) which is in for-next. The bug actually has minimal effects because TASKLET_STATE_SCHED is zero and in testing so far it doesn't seem to make a difference.
There is a second patch currently in patchworks ([for-next,v6] RDMA/rxe: Add workqueue support for tasks
[for-next,v6] RDMA/rxe: Add workqueue support for tasks - - - --- 2023-03-02 Bob Pearson New)
which is ahead of this one and replaces the tasklet implementation by work queues. This second patch replaces the lines lines containing the error with a workqueue specific equivalent.
There are two ways forward here. We could fix the tasklet version by applying this patch first or ignore the error and apply the workqueue patch first. My desire is to get rid of tasklets altogether so I prefer the second choice. If we choose the first choice then we need to reorder the two patches in patchworks and rebase the workqueue patch to match the fixed tasklet code.
Please suggest how you would like me to proceed.
Bob
Quoted 44 lines · Bob Pearson
Quoted 25 lines · Bob Pearson
In a previous patch
TASKLET_STATE_SCHEDwas used as a bit but it is a bit position instead. This patch corrects that error.Reported-by Dan Carpenter <[email protected]>Fixes d94671632572 ("RDMA/rxe: Rewrite rxe_task.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/infiniband/sw/rxe/rxe_task.c +1
-1@@ -21,7 +21,7 @@ static bool __reserve_if_idle(struct rxe_task *task) {WARN_ON (rxe_read (task->qp) <=0 ); -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false;if (task->state ==TASK_STATE_IDLE ) {drivers/infiniband/sw/rxe/rxe_task.c static bool __reserve_if_idle(struct rxe_task *task) · line 52
Quoted 8 lines
drivers/infiniband/sw/rxe/rxe_task.c +1
-1@@ -46,7 +46,7 @@ static bool __reserve_if_idle(struct rxe_task *task)*/ static bool __is_done (struct rxe_task *task) { -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false; if (task->state == TASK_STATE_IDLE ||This patch fixes a bug in
rxe_task.cintroduced by the earlier patch (d94671632572RDMA/rxe: Rewriterxe_task.c) which is in for-next. The bug actually has minimal effects becauseTASKLET_STATE_SCHEDis zero and in testing so far it doesn't seem to make a difference.There is a second patch currently in patchworks ([for-next,v6] RDMA/rxe: Add workqueue support for tasks
[for-next,v6] RDMA/rxe: Add workqueue support for tasks - - - --- 2023-03-02 Bob Pearson New)
which is ahead of this one and replaces the tasklet implementation by work queues. This second patch replaces the lines lines containing the error with a workqueue specific equivalent.
Quoted 6 lines
There are two ways forward here. We could fix the tasklet version by applying this patch first or ignore the error and apply the workqueue patch first. My desire is to get rid of tasklets altogether so I prefer the second choice. If we choose the first choice then we need to reorder the two patches in patchworks and rebase the workqueue patch to match the fixed tasklet code.
Please suggest how you would like me to proceed.
I prefer to have small fix first as it is unclear when "RDMA/rxe: Add workqueue support for tasks" will be merged.
https://lore.kernel.org/all/20230330053933.GJ831478@unreal
Thanks
Quoted 2 lines
Bob
Quoted 50 lines · Leon Romanovsky
Quoted 49 lines · Bob Pearson
Quoted 25 lines · Bob Pearson
In a previous patch
TASKLET_STATE_SCHEDwas used as a bit but it is a bit position instead. This patch corrects that error.Reported-by Dan Carpenter <[email protected]>Fixes d94671632572 ("RDMA/rxe: Rewrite rxe_task.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/infiniband/sw/rxe/rxe_task.c +1
-1@@ -21,7 +21,7 @@ static bool __reserve_if_idle(struct rxe_task *task) {WARN_ON (rxe_read (task->qp) <=0 ); -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false;if (task->state ==TASK_STATE_IDLE ) {drivers/infiniband/sw/rxe/rxe_task.c static bool __reserve_if_idle(struct rxe_task *task) · line 52
Quoted 8 lines
drivers/infiniband/sw/rxe/rxe_task.c +1
-1@@ -46,7 +46,7 @@ static bool __reserve_if_idle(struct rxe_task *task)*/ static bool __is_done (struct rxe_task *task) { -if (task->tasklet.state &TASKLET_STATE_SCHED ) +if (task->tasklet.state &BIT (TASKLET_STATE_SCHED ))return false; if (task->state == TASK_STATE_IDLE ||This patch fixes a bug in
rxe_task.cintroduced by the earlier patch (d94671632572RDMA/rxe: Rewriterxe_task.c) which is in for-next. The bug actually has minimal effects becauseTASKLET_STATE_SCHEDis zero and in testing so far it doesn't seem to make a difference.There is a second patch currently in patchworks ([for-next,v6] RDMA/rxe: Add workqueue support for tasks
[for-next,v6] RDMA/rxe: Add workqueue support for tasks - - - --- 2023-03-02 Bob Pearson New)
which is ahead of this one and replaces the tasklet implementation by work queues. This second patch replaces the lines lines containing the error with a workqueue specific equivalent.There are two ways forward here. We could fix the tasklet version by applying this patch first or ignore the error and apply the workqueue patch first. My desire is to get rid of tasklets altogether so I prefer the second choice. If we choose the first choice then we need to reorder the two patches in patchworks and rebase the workqueue patch to match the fixed tasklet code.
Quoted 10 lines
Quoted 1 line
Please suggest how you would like me to proceed.
I prefer to have small fix first as it is unclear when "RDMA/rxe: Add workqueue support for tasks" will be merged.
https://lore.kernel.org/all/20230330053933.GJ831478@unrealThanks
Quoted 2 lines
Bob
Leon,
Then drop the workqueue patch and apply the fix rxe_task.c patch and I will resubmit the workqueue patch.
Thanks
Bob
Quoted 10 lines · Bob Pearson
In a previous patch
TASKLET_STATE_SCHEDwas used as a bit but it is a bit position instead. This patch corrects that error.Reported-by Dan Carpenter <[email protected]>Fixes d94671632572 ("RDMA/rxe: Rewrite rxe_task.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to for-next
Thanks,
Jason