Skip to content

Commit 3c62b03

Browse files
2045geminiopsiff
authored andcommitted
RDMA/rxe: Fix race in do_task() when draining
[ Upstream commit 8ca7eada62fcfabf6ec1dc7468941e791c1d8729 ] When do_task() exhausts its iteration budget (!ret), it sets the state to TASK_STATE_IDLE to reschedule, without a secondary check on the current task->state. This can overwrite the TASK_STATE_DRAINING state set by a concurrent call to rxe_cleanup_task() or rxe_disable_task(). While state changes are protected by a spinlock, both rxe_cleanup_task() and rxe_disable_task() release the lock while waiting for the task to finish draining in the while(!is_done(task)) loop. The race occurs if do_task() hits its iteration limit and acquires the lock in this window. The cleanup logic may then proceed while the task incorrectly reschedules itself, leading to a potential use-after-free. This bug was introduced during the migration from tasklets to workqueues, where the special handling for the draining case was lost. Fix this by restoring the original pre-migration behavior. If the state is TASK_STATE_DRAINING when iterations are exhausted, set cont to 1 to force a new loop iteration. This allows the task to finish its work, so that a subsequent iteration can reach the switch statement and correctly transition the state to TASK_STATE_DRAINED, stopping the task as intended. Fixes: 9b4b7c1 ("RDMA/rxe: Add workqueue support for rxe tasks") Reviewed-by: Zhu Yanjun <[email protected]> Signed-off-by: Gui-Dong Han <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Leon Romanovsky <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 52edccfb555142678c836c285bf5b4ec760bd043)
1 parent 57d1e8d commit 3c62b03

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/infiniband/sw/rxe/rxe_task.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,12 @@ static void do_task(struct rxe_task *task)
132132
* yield the cpu and reschedule the task
133133
*/
134134
if (!ret) {
135-
task->state = TASK_STATE_IDLE;
136-
resched = 1;
135+
if (task->state != TASK_STATE_DRAINING) {
136+
task->state = TASK_STATE_IDLE;
137+
resched = 1;
138+
} else {
139+
cont = 1;
140+
}
137141
goto exit;
138142
}
139143

0 commit comments

Comments
 (0)