Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

scx: Don't wait for a work item before scheduling is restored in scx_… #141

Merged
merged 1 commit into from
Feb 9, 2024
Merged

scx: Don't wait for a work item before scheduling is restored in scx_… #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions kernel/sched/ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3309,8 +3309,6 @@ static void scx_ops_disable_workfn(struct kthread_work *work)
ei->kind = kind;
ei->reason = scx_exit_reason(ei->kind);

cancel_delayed_work_sync(&scx_watchdog_work);

/* guarantee forward progress by bypassing scx_ops */
scx_ops_bypass(true);

Expand Down Expand Up @@ -3396,6 +3394,7 @@ static void scx_ops_disable_workfn(struct kthread_work *work)
if (scx_ops.exit)
SCX_CALL_OP(SCX_KF_UNLOCKED, exit, ei);

cancel_delayed_work_sync(&scx_watchdog_work);
kobject_del(scx_root_kobj);
scx_root_kobj = NULL;

Expand Down