MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-06 05:45:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

sched_ext: Improve logging around enable/disable

Browse Source 
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>
This commit is contained in:
Tejun Heo 2024-08-07 14:52:50 -10:00
parent 991ef53a48
commit 344576fa6a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/sched/ext.c
View File

@ -4013,11 +4013,11 @@ static const char *scx_exit_reason(enum scx_exit_kind kind)
{ {
switch (kind) { switch (kind) {
case SCX_EXIT_UNREG: case SCX_EXIT_UNREG:
return "Scheduler unregistered from user space"; return "unregistered from user space";
case SCX_EXIT_UNREG_BPF: case SCX_EXIT_UNREG_BPF:
return "Scheduler unregistered from BPF"; return "unregistered from BPF";
case SCX_EXIT_UNREG_KERN: case SCX_EXIT_UNREG_KERN:
return "Scheduler unregistered from the main kernel"; return "unregistered from the main kernel";
case SCX_EXIT_SYSRQ: case SCX_EXIT_SYSRQ:
return "disabled by sysrq-S"; return "disabled by sysrq-S";
case SCX_EXIT_ERROR: case SCX_EXIT_ERROR:
@ -4135,14 +4135,16 @@ static void scx_ops_disable_workfn(struct kthread_work *work)
percpu_up_write(&scx_fork_rwsem); percpu_up_write(&scx_fork_rwsem);
if (ei->kind >= SCX_EXIT_ERROR) { if (ei->kind >= SCX_EXIT_ERROR) {
printk(KERN_ERR "sched_ext: BPF scheduler \"%s\" errored, disabling\n", scx_ops.name); pr_err("sched_ext: BPF scheduler \"%s\" disabled (%s)\n",
scx_ops.name, ei->reason);
if (ei->msg[0] == '\0') if (ei->msg[0] != '\0')
printk(KERN_ERR "sched_ext: %s\n", ei->reason); pr_err("sched_ext: %s: %s\n", scx_ops.name, ei->msg);
else
printk(KERN_ERR "sched_ext: %s (%s)\n", ei->reason, ei->msg);
stack_trace_print(ei->bt, ei->bt_len, 2); stack_trace_print(ei->bt, ei->bt_len, 2);
} else {
pr_info("sched_ext: BPF scheduler \"%s\" disabled (%s)\n",
scx_ops.name, ei->reason);
} }
if (scx_ops.exit) if (scx_ops.exit)
@ -4817,6 +4819,8 @@ static int scx_ops_enable(struct sched_ext_ops *ops, struct bpf_link *link)
if (!(ops->flags & SCX_OPS_SWITCH_PARTIAL)) if (!(ops->flags & SCX_OPS_SWITCH_PARTIAL))
static_branch_enable(&__scx_switched_all); static_branch_enable(&__scx_switched_all);
pr_info("sched_ext: BPF scheduler \"%s\" enabled%s\n",
scx_ops.name, scx_switched_all() ? "" : " (partial)");
kobject_uevent(scx_root_kobj, KOBJ_ADD); kobject_uevent(scx_root_kobj, KOBJ_ADD);
mutex_unlock(&scx_ops_enable_mutex); mutex_unlock(&scx_ops_enable_mutex);