Skip to content

Commit 344576f

Browse files
committed
sched_ext: Improve logging around enable/disable
sched_ext currently doesn't generate messages when the BPF scheduler is enabled and disabled unless there are errors. It is useful to have paper trail. Improve logging around enable/disable: - Generate info messages on enable and non-error disable. - Update error exit message formatting so that it's consistent with non-error message. Also, prefix ei->msg with the BPF scheduler's name to make it clear where the message is coming from. - Shorten scx_exit_reason() strings for SCX_EXIT_UNREG* for brevity and consistency. v2: Use pr_*() instead of KERN_* consistently. (David) Signed-off-by: Tejun Heo <tj@kernel.org> Suggested-by: Phil Auld <pauld@redhat.com> Reviewed-by: Phil Auld <pauld@redhat.com> Acked-by: David Vernet <void@manifault.com>
1 parent 991ef53 commit 344576f

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

kernel/sched/ext.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4013,11 +4013,11 @@ static const char *scx_exit_reason(enum scx_exit_kind kind)
40134013
{
40144014
switch (kind) {
40154015
case SCX_EXIT_UNREG:
4016-
return "Scheduler unregistered from user space";
4016+
return "unregistered from user space";
40174017
case SCX_EXIT_UNREG_BPF:
4018-
return "Scheduler unregistered from BPF";
4018+
return "unregistered from BPF";
40194019
case SCX_EXIT_UNREG_KERN:
4020-
return "Scheduler unregistered from the main kernel";
4020+
return "unregistered from the main kernel";
40214021
case SCX_EXIT_SYSRQ:
40224022
return "disabled by sysrq-S";
40234023
case SCX_EXIT_ERROR:
@@ -4135,14 +4135,16 @@ static void scx_ops_disable_workfn(struct kthread_work *work)
41354135
percpu_up_write(&scx_fork_rwsem);
41364136

41374137
if (ei->kind >= SCX_EXIT_ERROR) {
4138-
printk(KERN_ERR "sched_ext: BPF scheduler \"%s\" errored, disabling\n", scx_ops.name);
4138+
pr_err("sched_ext: BPF scheduler \"%s\" disabled (%s)\n",
4139+
scx_ops.name, ei->reason);
41394140

4140-
if (ei->msg[0] == '\0')
4141-
printk(KERN_ERR "sched_ext: %s\n", ei->reason);
4142-
else
4143-
printk(KERN_ERR "sched_ext: %s (%s)\n", ei->reason, ei->msg);
4141+
if (ei->msg[0] != '\0')
4142+
pr_err("sched_ext: %s: %s\n", scx_ops.name, ei->msg);
41444143

41454144
stack_trace_print(ei->bt, ei->bt_len, 2);
4145+
} else {
4146+
pr_info("sched_ext: BPF scheduler \"%s\" disabled (%s)\n",
4147+
scx_ops.name, ei->reason);
41464148
}
41474149

41484150
if (scx_ops.exit)
@@ -4817,6 +4819,8 @@ static int scx_ops_enable(struct sched_ext_ops *ops, struct bpf_link *link)
48174819
if (!(ops->flags & SCX_OPS_SWITCH_PARTIAL))
48184820
static_branch_enable(&__scx_switched_all);
48194821

4822+
pr_info("sched_ext: BPF scheduler \"%s\" enabled%s\n",
4823+
scx_ops.name, scx_switched_all() ? "" : " (partial)");
48204824
kobject_uevent(scx_root_kobj, KOBJ_ADD);
48214825
mutex_unlock(&scx_ops_enable_mutex);
48224826

0 commit comments

Comments
 (0)