Skip to content

Commit 494eaf4

Browse files
zhidao suhtejun
authored andcommitted
sched_ext: Replace naked scx_root dereferences in kobject callbacks
scx_attr_ops_show() and scx_uevent() access scx_root->ops.name directly. This is problematic for two reasons: 1. The file-level comment explicitly identifies naked scx_root dereferences as a temporary measure that needs to be replaced with proper per-instance access. 2. scx_attr_events_show(), the neighboring sysfs show function in the same group, already uses the correct pattern: struct scx_sched *sch = container_of(kobj, struct scx_sched, kobj); Having inconsistent access patterns in the same sysfs/uevent group is error-prone. The kobject embedded in struct scx_sched is initialized as: kobject_init_and_add(&sch->kobj, &scx_ktype, NULL, "root"); so container_of(kobj, struct scx_sched, kobj) correctly retrieves the owning scx_sched instance in both callbacks. Replace the naked scx_root dereferences with container_of()-based access, consistent with scx_attr_events_show() and in preparation for proper multi-instance scx_sched support. Signed-off-by: zhidao su <suzhidao@xiaomi.com> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent 9adfcef commit 494eaf4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

kernel/sched/ext.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3712,7 +3712,9 @@ static void scx_kobj_release(struct kobject *kobj)
37123712
static ssize_t scx_attr_ops_show(struct kobject *kobj,
37133713
struct kobj_attribute *ka, char *buf)
37143714
{
3715-
return sysfs_emit(buf, "%s\n", scx_root->ops.name);
3715+
struct scx_sched *sch = container_of(kobj, struct scx_sched, kobj);
3716+
3717+
return sysfs_emit(buf, "%s\n", sch->ops.name);
37163718
}
37173719
SCX_ATTR(ops);
37183720

@@ -3756,7 +3758,9 @@ static const struct kobj_type scx_ktype = {
37563758

37573759
static int scx_uevent(const struct kobject *kobj, struct kobj_uevent_env *env)
37583760
{
3759-
return add_uevent_var(env, "SCXOPS=%s", scx_root->ops.name);
3761+
const struct scx_sched *sch = container_of(kobj, struct scx_sched, kobj);
3762+
3763+
return add_uevent_var(env, "SCXOPS=%s", sch->ops.name);
37603764
}
37613765

37623766
static const struct kset_uevent_ops scx_uevent_ops = {

0 commit comments

Comments
 (0)