From nobody Thu Apr 9 17:59:34 2026 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00FDD374E6D; Fri, 6 Mar 2026 07:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772782351; cv=none; b=MhTK7cIJ379/YyawU6CSpscSzI7uVgmO35Aqc+J1AKoOWe0HvthiwOHMnhAncwpfWngBIQY7HWwtTWqCjQ3bp2201dia7VGypN6kys/36maQBZV9FkrzYFnlZXkRhAGdjnZOOGXpeOM/JKwCZxXh4DmN2boshKvkePTucUp7Ncg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772782351; c=relaxed/simple; bh=nq+gKYvBVh8CCQrMZgS/17fJgAVyRB5bfKBSmYEnThg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ChPbjhFEXthz6aYYk2kwWlDlghFPijZpJYkVU8uLliZusqQRpahL2mQAu5FR7RmnY66eGvuEgkhtSQBva7PtjiSNdiHTw6uBzpIxa8IxFnBroqX/Ukrb9BoQvNXtw6pF0t7ePY/92L5JYbYChd2KiIm0G7gxnvVz2F3VAe/HerQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com; spf=pass smtp.mailfrom=126.com; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b=F9sriAIO; arc=none smtp.client-ip=220.197.31.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=126.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="F9sriAIO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=kL 9pzxcbWCJ7nrsEz3VRw6n72+rSbWAhFJ7F+/FBEcM=; b=F9sriAIO8bZ9Yz1d/7 yl2lVfR0kHbceIx3yf8ObTuMQgdJPWHD7wSUUdUEQaMqZZTjc6F9AuCX9bzf7UzW BCqoClCBj8Rsb12Pqf7IwNt5OkSyTeHfuShIxZe/iLzum3m/01I9eDNzumVjB7Jv Qg/l56K8csOJnR5mprOA8rrns= Received: from localhost.localdomain (unknown []) by gzsmtp4 (Coremail) with SMTP id PykvCgCHt9PNgqppuc55BQ--.55212S3; Fri, 06 Mar 2026 15:31:26 +0800 (CST) From: Zhao Mengmeng To: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, nathan@kernel.org, nick.desaulniers+lkml@gmail.com, morbo@google.com, justinstitt@google.com, emil@etsalapatis.com Cc: sched-ext@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev, zhaomengmeng@kylinos.cn Subject: [PATCH 1/3] sched_ext: remove SCX_OPS_HAS_CGROUP_WEIGHT Date: Fri, 6 Mar 2026 15:31:08 +0800 Message-ID: <20260306073110.229595-2-zhaomzhao@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306073110.229595-1-zhaomzhao@126.com> References: <20260306073110.229595-1-zhaomzhao@126.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PykvCgCHt9PNgqppuc55BQ--.55212S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ary3ZF1rCry8Aw43Cw1rZwb_yoW8KFW7pF 4DuF48tr17try7Ga18ua1vgFyUW3y3Gw42gFWDXr4S9r4kKr1aqwn8tr43ZryYgayrZF4f GF4qka47Gw1UWFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U3ManUUUUU= X-CM-SenderInfo: 52kd0zp2kd0qqrswhudrp/xtbBlw7YUGmqgs4FlwAA3M Content-Type: text/plain; charset="utf-8" From: Zhao Mengmeng While running scx_flatcg, dmesg prints "SCX_OPS_HAS_CGROUP_WEIGHT is deprecated and a noop", in code, SCX_OPS_HAS_CGROUP_WEIGHT has been marked as DEPRECATED, and will be removed on 6.18. Now it's time to do it. Signed-off-by: Zhao Mengmeng --- kernel/sched/ext.c | 3 --- kernel/sched/ext_internal.h | 8 +------- tools/sched_ext/scx_flatcg.bpf.c | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index b9247c9f0430..fd83af17d46d 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -5062,9 +5062,6 @@ static int validate_ops(struct scx_sched *sch, const = struct sched_ext_ops *ops) return -EINVAL; } =20 - if (ops->flags & SCX_OPS_HAS_CGROUP_WEIGHT) - pr_warn("SCX_OPS_HAS_CGROUP_WEIGHT is deprecated and a noop\n"); - if (ops->cpu_acquire || ops->cpu_release) pr_warn("ops->cpu_acquire/release() are deprecated, use sched_switch TP = instead\n"); =20 diff --git a/kernel/sched/ext_internal.h b/kernel/sched/ext_internal.h index bd26811fea99..3c86c53e1975 100644 --- a/kernel/sched/ext_internal.h +++ b/kernel/sched/ext_internal.h @@ -174,19 +174,13 @@ enum scx_ops_flags { */ SCX_OPS_BUILTIN_IDLE_PER_NODE =3D 1LLU << 6, =20 - /* - * CPU cgroup support flags - */ - SCX_OPS_HAS_CGROUP_WEIGHT =3D 1LLU << 16, /* DEPRECATED, will be removed = on 6.18 */ - SCX_OPS_ALL_FLAGS =3D SCX_OPS_KEEP_BUILTIN_IDLE | SCX_OPS_ENQ_LAST | SCX_OPS_ENQ_EXITING | SCX_OPS_ENQ_MIGRATION_DISABLED | SCX_OPS_ALLOW_QUEUED_WAKEUP | SCX_OPS_SWITCH_PARTIAL | - SCX_OPS_BUILTIN_IDLE_PER_NODE | - SCX_OPS_HAS_CGROUP_WEIGHT, + SCX_OPS_BUILTIN_IDLE_PER_NODE, =20 /* high 8 bits are internal, don't include in SCX_OPS_ALL_FLAGS */ __SCX_OPS_INTERNAL_MASK =3D 0xffLLU << 56, diff --git a/tools/sched_ext/scx_flatcg.bpf.c b/tools/sched_ext/scx_flatcg.= bpf.c index 0e785cff0f24..a8a9234bb41e 100644 --- a/tools/sched_ext/scx_flatcg.bpf.c +++ b/tools/sched_ext/scx_flatcg.bpf.c @@ -960,5 +960,5 @@ SCX_OPS_DEFINE(flatcg_ops, .cgroup_move =3D (void *)fcg_cgroup_move, .init =3D (void *)fcg_init, .exit =3D (void *)fcg_exit, - .flags =3D SCX_OPS_HAS_CGROUP_WEIGHT | SCX_OPS_ENQ_EXITING, + .flags =3D SCX_OPS_ENQ_EXITING, .name =3D "flatcg"); --=20 2.43.0 From nobody Thu Apr 9 17:59:34 2026 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C15AB221540; Fri, 6 Mar 2026 07:34:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772782483; cv=none; b=SMkg7h0LjGSr2L8CaASF9gjfya374U8m+3cIoNuBMAU3KNAxxb32pXdHp1L8+7s1CjY+vzhtBHQEXcqAfIsbVjxlsA58LvRjKqBrGv4pF/NhAjpLZAJ2++fcPxzTkdXUgDgH6hVEdFd+eM4wwmi0RL5fL1sZ18mP9QFpDeMVLc8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772782483; c=relaxed/simple; bh=2Rua+1dgKXiTu3vehu5xaStccMHEcC/UZL92wp5GaKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HGue+PE7/c1pOblen6j6G1LaEVRL+AoR67Fr9hXMZZCryUfRdDJiAzvnMxHxYknUYGMjit1n9xabLswcHU6yOvb9ATQ0PNsjrh1riEfDHvoRFiMlRyW5vfbaxduAWNz2XquLQaSU8O2wB1ayHfHhRFUK2PrtDiHE1AP3QeSLu24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com; spf=pass smtp.mailfrom=126.com; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b=VWnTBq/k; arc=none smtp.client-ip=220.197.31.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=126.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="VWnTBq/k" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=/O aapI72pB5b3e/Gh8u+WItdoHV7XziQ1xQMIx/96oM=; b=VWnTBq/kja8GU2yfpo gcIVtSnOVeWCa/ksvItcvb0x8sKhlfygSGo7eS33/OVnkMnHx7Nx0+7JKlvaKGgy YXSFwUDWgdmW+J8dNr4XeufvSWNmk3EHZMC2lLwYdY2zgkigRF9lsbQqFBhY7qbX 89DyBsxo593V3f8UFc3ErHECU= Received: from localhost.localdomain (unknown []) by gzsmtp4 (Coremail) with SMTP id PykvCgCHt9PNgqppuc55BQ--.55212S4; Fri, 06 Mar 2026 15:31:27 +0800 (CST) From: Zhao Mengmeng To: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, nathan@kernel.org, nick.desaulniers+lkml@gmail.com, morbo@google.com, justinstitt@google.com, emil@etsalapatis.com Cc: sched-ext@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev, zhaomengmeng@kylinos.cn Subject: [PATCH 2/3] tools/sched_ext: Update scx enum autogens Date: Fri, 6 Mar 2026 15:31:09 +0800 Message-ID: <20260306073110.229595-3-zhaomzhao@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306073110.229595-1-zhaomzhao@126.com> References: <20260306073110.229595-1-zhaomzhao@126.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PykvCgCHt9PNgqppuc55BQ--.55212S4 X-Coremail-Antispam: 1Uf129KBjvJXoW3JF1rKw1fWr45Jw4xKFykXwb_yoWxJw45pF srCFWUtF4UXFW7C3y8tF4rCw12kr1UJry8XryrXw40yFykAanaqry2qF4rGFyrXrWrWFyk XFWkG34S9r9Fqr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j0MKZUUUUU= X-CM-SenderInfo: 52kd0zp2kd0qqrswhudrp/xtbBlg-YUGmqgs-ohAAA3z Content-Type: text/plain; charset="utf-8" From: Zhao Mengmeng Use scripts in scx repo to update these autogen files: 1. enum_defs.autogen.h: Remove SCX_OPS_HAS_CGROUP_WEIGHT, add other new enums 2. enums.autogen.bpf.h and enums.autogen.h: Remove SCX_RQ_BAL_PENDING and Use python scripts generation instead of manual edit style. Signed-off-by: Zhao Mengmeng --- .../sched_ext/include/scx/enum_defs.autogen.h | 26 ++++++++++++++----- .../sched_ext/include/scx/enums.autogen.bpf.h | 4 +-- tools/sched_ext/include/scx/enums.autogen.h | 3 +-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/tools/sched_ext/include/scx/enum_defs.autogen.h b/tools/sched_= ext/include/scx/enum_defs.autogen.h index dcc945304760..0f4ee052c0ef 100644 --- a/tools/sched_ext/include/scx/enum_defs.autogen.h +++ b/tools/sched_ext/include/scx/enum_defs.autogen.h @@ -14,7 +14,11 @@ #define HAVE_SCX_EXIT_MSG_LEN #define HAVE_SCX_EXIT_DUMP_DFL_LEN #define HAVE_SCX_CPUPERF_ONE -#define HAVE_SCX_OPS_TASK_ITER_BATCH +#define HAVE_SCX_TASK_ITER_BATCH +#define HAVE_SCX_BYPASS_LB_DFL_INTV_US +#define HAVE_SCX_BYPASS_LB_DONOR_PCT +#define HAVE_SCX_BYPASS_LB_MIN_DELTA_DIV +#define HAVE_SCX_BYPASS_LB_BATCH #define HAVE_SCX_CPU_PREEMPT_RT #define HAVE_SCX_CPU_PREEMPT_DL #define HAVE_SCX_CPU_PREEMPT_STOP @@ -27,6 +31,7 @@ #define HAVE_SCX_DSQ_INVALID #define HAVE_SCX_DSQ_GLOBAL #define HAVE_SCX_DSQ_LOCAL +#define HAVE_SCX_DSQ_BYPASS #define HAVE_SCX_DSQ_LOCAL_ON #define HAVE_SCX_DSQ_LOCAL_CPU_MASK #define HAVE_SCX_DSQ_ITER_REV @@ -36,6 +41,10 @@ #define HAVE___SCX_DSQ_ITER_ALL_FLAGS #define HAVE_SCX_DSQ_LNODE_ITER_CURSOR #define HAVE___SCX_DSQ_LNODE_PRIV_SHIFT +#define HAVE_SCX_ENABLING +#define HAVE_SCX_ENABLED +#define HAVE_SCX_DISABLING +#define HAVE_SCX_DISABLED #define HAVE_SCX_ENQ_WAKEUP #define HAVE_SCX_ENQ_HEAD #define HAVE_SCX_ENQ_CPU_SELECTED @@ -45,8 +54,10 @@ #define HAVE___SCX_ENQ_INTERNAL_MASK #define HAVE_SCX_ENQ_CLEAR_OPSS #define HAVE_SCX_ENQ_DSQ_PRIQ +#define HAVE_SCX_ENQ_NESTED #define HAVE_SCX_TASK_DSQ_ON_PRIQ #define HAVE_SCX_TASK_QUEUED +#define HAVE_SCX_TASK_IN_CUSTODY #define HAVE_SCX_TASK_RESET_RUNNABLE_AT #define HAVE_SCX_TASK_DEQD_FOR_SLEEP #define HAVE_SCX_TASK_STATE_SHIFT @@ -55,6 +66,7 @@ #define HAVE_SCX_TASK_CURSOR #define HAVE_SCX_ECODE_RSN_HOTPLUG #define HAVE_SCX_ECODE_ACT_RESTART +#define HAVE_SCX_EFLAG_INITIALIZED #define HAVE_SCX_EXIT_NONE #define HAVE_SCX_EXIT_DONE #define HAVE_SCX_EXIT_UNREG @@ -81,33 +93,33 @@ #define HAVE_SCX_OPI_CPU_HOTPLUG_BEGIN #define HAVE_SCX_OPI_CPU_HOTPLUG_END #define HAVE_SCX_OPI_END -#define HAVE_SCX_OPS_ENABLING -#define HAVE_SCX_OPS_ENABLED -#define HAVE_SCX_OPS_DISABLING -#define HAVE_SCX_OPS_DISABLED #define HAVE_SCX_OPS_KEEP_BUILTIN_IDLE #define HAVE_SCX_OPS_ENQ_LAST #define HAVE_SCX_OPS_ENQ_EXITING #define HAVE_SCX_OPS_SWITCH_PARTIAL #define HAVE_SCX_OPS_ENQ_MIGRATION_DISABLED #define HAVE_SCX_OPS_ALLOW_QUEUED_WAKEUP -#define HAVE_SCX_OPS_HAS_CGROUP_WEIGHT +#define HAVE_SCX_OPS_BUILTIN_IDLE_PER_NODE #define HAVE_SCX_OPS_ALL_FLAGS +#define HAVE___SCX_OPS_INTERNAL_MASK +#define HAVE_SCX_OPS_HAS_CPU_PREEMPT #define HAVE_SCX_OPSS_NONE #define HAVE_SCX_OPSS_QUEUEING #define HAVE_SCX_OPSS_QUEUED #define HAVE_SCX_OPSS_DISPATCHING #define HAVE_SCX_OPSS_QSEQ_SHIFT #define HAVE_SCX_PICK_IDLE_CORE +#define HAVE_SCX_PICK_IDLE_IN_NODE #define HAVE_SCX_OPS_NAME_LEN #define HAVE_SCX_SLICE_DFL +#define HAVE_SCX_SLICE_BYPASS #define HAVE_SCX_SLICE_INF #define HAVE_SCX_RQ_ONLINE #define HAVE_SCX_RQ_CAN_STOP_TICK -#define HAVE_SCX_RQ_BAL_PENDING #define HAVE_SCX_RQ_BAL_KEEP #define HAVE_SCX_RQ_BYPASSING #define HAVE_SCX_RQ_CLK_VALID +#define HAVE_SCX_RQ_BAL_CB_PENDING #define HAVE_SCX_RQ_IN_WAKEUP #define HAVE_SCX_RQ_IN_BALANCE #define HAVE_SCX_TASK_NONE diff --git a/tools/sched_ext/include/scx/enums.autogen.bpf.h b/tools/sched_= ext/include/scx/enums.autogen.bpf.h index 5da50f937684..2b9540f0b3d5 100644 --- a/tools/sched_ext/include/scx/enums.autogen.bpf.h +++ b/tools/sched_ext/include/scx/enums.autogen.bpf.h @@ -19,9 +19,6 @@ const volatile u64 __SCX_RQ_ONLINE __weak; const volatile u64 __SCX_RQ_CAN_STOP_TICK __weak; #define SCX_RQ_CAN_STOP_TICK __SCX_RQ_CAN_STOP_TICK =20 -const volatile u64 __SCX_RQ_BAL_PENDING __weak; -#define SCX_RQ_BAL_PENDING __SCX_RQ_BAL_PENDING - const volatile u64 __SCX_RQ_BAL_KEEP __weak; #define SCX_RQ_BAL_KEEP __SCX_RQ_BAL_KEEP =20 @@ -129,3 +126,4 @@ const volatile u64 __SCX_ENQ_DSQ_PRIQ __weak; =20 const volatile u64 __SCX_DEQ_SCHED_CHANGE __weak; #define SCX_DEQ_SCHED_CHANGE __SCX_DEQ_SCHED_CHANGE + diff --git a/tools/sched_ext/include/scx/enums.autogen.h b/tools/sched_ext/= include/scx/enums.autogen.h index fc9a7a4d9dea..c615cb323f8b 100644 --- a/tools/sched_ext/include/scx/enums.autogen.h +++ b/tools/sched_ext/include/scx/enums.autogen.h @@ -10,7 +10,6 @@ SCX_ENUM_SET(skel, scx_public_consts, SCX_SLICE_INF); \ SCX_ENUM_SET(skel, scx_rq_flags, SCX_RQ_ONLINE); \ SCX_ENUM_SET(skel, scx_rq_flags, SCX_RQ_CAN_STOP_TICK); \ - SCX_ENUM_SET(skel, scx_rq_flags, SCX_RQ_BAL_PENDING); \ SCX_ENUM_SET(skel, scx_rq_flags, SCX_RQ_BAL_KEEP); \ SCX_ENUM_SET(skel, scx_rq_flags, SCX_RQ_BYPASSING); \ SCX_ENUM_SET(skel, scx_rq_flags, SCX_RQ_CLK_VALID); \ @@ -46,5 +45,5 @@ SCX_ENUM_SET(skel, scx_enq_flags, SCX_ENQ_LAST); \ SCX_ENUM_SET(skel, scx_enq_flags, SCX_ENQ_CLEAR_OPSS); \ SCX_ENUM_SET(skel, scx_enq_flags, SCX_ENQ_DSQ_PRIQ); \ - SCX_ENUM_SET(skel, scx_deq_flags, SCX_DEQ_SCHED_CHANGE); \ + SCX_ENUM_SET(skel, scx_enq_flags, SCX_DEQ_SCHED_CHANGE); \ } while (0) --=20 2.43.0 From nobody Thu Apr 9 17:59:34 2026 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B3C617D2; Fri, 6 Mar 2026 07:32:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772782347; cv=none; b=FXfJBBKP4eFmVEEDwvO0ZAk6k2EtS7UIhNd5fK1uG7r/w7f+OJQLF7WVjV2B0F/ZVfJnMAWlzAUOl9/0zFDG8dcLxwBxEFPeM/ga2s4YIWyiGFV4RdEfRAnIOVyMrVhly1HgmQbO3wyMXvBjHN8itJcVPI0Bx7PTXsXrLj72JfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772782347; c=relaxed/simple; bh=/1tjs1txaxspQo84xrzGcDbG3nJgdeSmSFC0uzTi9Vw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rh9iKwoaHutFqWRP3zKtI17t/mFMhtuiwRke9NvuhyLsIR5tNga6zJ6Efx7sAdNMplBGA2w7Iv226ZSOcpXyhI1fu8F6KRO/Fg/a+nt+/kMlk1titspqmqP/IOu9b+0i8CBi2jAfSRPso8/M1saoNPauNQF9nd90BuFMeTI8/lY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com; spf=pass smtp.mailfrom=126.com; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b=ZfRUoi+m; arc=none smtp.client-ip=220.197.31.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=126.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="ZfRUoi+m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=UZ gWiBAvLd+YXyCRU//RkZvAYeiAPrFvirUav+rFLbE=; b=ZfRUoi+md3s6mp4s6+ 8nNFGzXr2KgLXB4HsHzJKoUucQifHKdj3LofN2r+qJUlR/d1UTWZxorCp7+/ur7A HOyoOspnejQ8ufWF0uwkQgMDekXJlc3hLa+W6h8i6+AHDd16QQkwWLGJ7bUeRsd0 NHCsvlEmQCMwdwVkNvuK8HZ2U= Received: from localhost.localdomain (unknown []) by gzsmtp4 (Coremail) with SMTP id PykvCgCHt9PNgqppuc55BQ--.55212S5; Fri, 06 Mar 2026 15:31:27 +0800 (CST) From: Zhao Mengmeng To: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, nathan@kernel.org, nick.desaulniers+lkml@gmail.com, morbo@google.com, justinstitt@google.com, emil@etsalapatis.com Cc: sched-ext@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev, zhaomengmeng@kylinos.cn Subject: [PATCH 3/3] tools/sched_ext: scx_sdt: Fix BPF verifier rejection on older LLVMs Date: Fri, 6 Mar 2026 15:31:10 +0800 Message-ID: <20260306073110.229595-4-zhaomzhao@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306073110.229595-1-zhaomzhao@126.com> References: <20260306073110.229595-1-zhaomzhao@126.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PykvCgCHt9PNgqppuc55BQ--.55212S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxKw45WFW7Jw1xXF1UuFyDJrb_yoW7XFW7pF WUJFyDXF1Utrn3Arn7t3ZYyrs3CanrXr1UWayrKrn7Z3sI9wnrX34Ikw1Fvr4qyrWSyay3 ZFZrC3Z2qF15JrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j5wIDUUUUU= X-CM-SenderInfo: 52kd0zp2kd0qqrswhudrp/xtbBlhDZUWmqgtDojAAA37 Content-Type: text/plain; charset="utf-8" From: Zhao Mengmeng Under Clang 17/18, when running scx_sdt scheduler, it fails with: libbpf: prog 'sdt_init_task': BPF program load failed: -EACCES libbpf: prog 'sdt_init_task': -- BEGIN PROG LOAD LOG -- ... ; desc =3D desc_find_empty(alloc->root, &idx); @ scx_sdt.bpf.c:479 43: (79) r8 =3D *(u64 *)(r6 +32) ; frame1: R6=3Dmap_value(map=3Dscx_= sdt.bss,ks=3D4,vs=3D200,off=3D120) R8=3Dscalar() ; for (level =3D zero; level < SDT_TASK_LEVELS && can_loop; level++) { @ sc= x_sdt.bpf.c:407 44: (e5) may_goto pc+51 ; idx |=3D pos; @ scx_sdt.bpf.c:418 96: (bf) r7 =3D r2 ; frame1: R2=3D0 R7=3D0 97: (bf) r1 =3D r10 ; frame1: R1=3Dfp0 R10=3Dfp0 ; @ scx_sdt.bpf.c:0 98: (07) r1 +=3D -56 ; frame1: R1=3Dfp-56 ; bpf_for(u, 0, SDT_TASK_LEVELS) { @ scx_sdt.bpf.c:447 99: (b4) w2 =3D 0 ; frame1: R2=3D0 100: (b4) w3 =3D 3 ; frame1: R3=3D3 101: (85) call bpf_iter_num_new#82234 ; frame1: R0=3Dscalar() fp-56= =3Diter_num(ref_id=3D2,state=3Dactive,depth=3D0) 102: (18) r9 =3D 0x1ffffffffffffff8 ; frame1: R9=3D0x1ffffffffffffff8 104: (bf) r1 =3D r10 ; frame1: R1=3Dfp0 R10=3Dfp0 ; @ scx_sdt.bpf.c:0 105: (07) r1 +=3D -56 ; frame1: R1=3Dfp-56 ; bpf_for(u, 0, SDT_TASK_LEVELS) { @ scx_sdt.bpf.c:447 106: (85) call bpf_iter_num_next#82235 ; frame1: R0=3D0 fp-56=3Diter= _num(ref_id=3D2,state=3Ddrained,depth=3D0) 107: (15) if r0 =3D=3D 0x0 goto pc+29 ; frame1: R0=3D0 ; if (tmp->nr_free > 0) @ scx_sdt.bpf.c:456 137: (bf) r1 =3D r10 ; frame1: R1=3Dfp0 R10=3Dfp0 ; bpf_for(u, 0, SDT_TASK_LEVELS) { @ scx_sdt.bpf.c:447 138: (07) r1 +=3D -56 ; frame1: R1=3Dfp-56 139: (85) call bpf_iter_num_destroy#82232 ; frame1: 140: (b7) r9 =3D 0 ; frame1: R9=3D0 ; if (unlikely(desc =3D=3D NULL)) { @ scx_sdt.bpf.c:480 141: (15) if r8 =3D=3D 0x0 goto pc+15 ; frame1: R8=3Dscalar(umin=3D1) ; chunk =3D desc->chunk; @ scx_sdt.bpf.c:485 142: (79) r4 =3D *(u64 *)(r8 +72) R8 invalid mem access 'scalar' The reason is these older compilers lacks native support for __BPF_FEATURE_ADDR_SPACE_CAST, __arena macro is defined as empty. Fix it by adding cast_kern when dereferencing variables with __arena tag. Signed-off-by: Zhao Mengmeng --- tools/sched_ext/scx_sdt.bpf.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/sched_ext/scx_sdt.bpf.c b/tools/sched_ext/scx_sdt.bpf.c index 31b09958e8d5..caacc55bd7a5 100644 --- a/tools/sched_ext/scx_sdt.bpf.c +++ b/tools/sched_ext/scx_sdt.bpf.c @@ -148,6 +148,7 @@ static sdt_desc_t *scx_alloc_chunk(void) =20 out =3D desc; =20 + cast_kern(desc); desc->nr_free =3D SDT_TASK_ENTS_PER_CHUNK; desc->chunk =3D chunk; =20 @@ -244,6 +245,7 @@ int mark_nodes_avail(sdt_desc_t *lv_desc[SDT_TASK_LEVEL= S], __u64 lv_pos[SDT_TASK /* Only propagate upwards if we are the parent's only free chunk. */ desc =3D lv_desc[level]; =20 + cast_kern(desc); ret =3D set_idx_state(desc, lv_pos[level], false); if (unlikely(ret !=3D 0)) return ret; @@ -298,20 +300,26 @@ int scx_alloc_free_idx(struct scx_allocator *alloc, _= _u64 idx) if (level =3D=3D SDT_TASK_LEVELS - 1) break; =20 + cast_kern(desc); chunk =3D desc->chunk; =20 + cast_kern(chunk); desc_children =3D (sdt_desc_t * __arena *)chunk->descs; + cast_kern(desc_children); desc =3D desc_children[pos]; =20 if (unlikely(!desc)) return -EINVAL; } =20 + cast_kern(desc); chunk =3D desc->chunk; =20 pos =3D idx & mask; + cast_kern(chunk); data =3D chunk->data[pos]; if (likely(data)) { + cast_kern(data); *data =3D (struct sdt_data) { .tid.genn =3D data->tid.genn + 1, }; @@ -378,6 +386,7 @@ __u64 chunk_find_empty(sdt_desc_t __arg_arena *desc) __u64 freeslots; __u64 i; =20 + cast_kern(desc); for (i =3D 0; i < SDT_TASK_CHUNK_BITMAP_U64S; i++) { freeslots =3D ~desc->allocated[i]; if (freeslots =3D=3D (__u64)0) @@ -426,9 +435,12 @@ static sdt_desc_t * desc_find_empty(sdt_desc_t *desc, = __u64 *idxp) break; =20 /* Allocate an internal node if necessary. */ + cast_kern(desc); chunk =3D desc->chunk; + cast_kern(chunk); desc_children =3D (sdt_desc_t * __arena *)chunk->descs; =20 + cast_kern(desc_children); desc =3D desc_children[pos]; if (!desc) { desc =3D scx_alloc_chunk(); @@ -448,6 +460,7 @@ static sdt_desc_t * desc_find_empty(sdt_desc_t *desc, _= _u64 *idxp) level =3D SDT_TASK_LEVELS - 1 - u; tmp =3D lv_desc[level]; =20 + cast_kern(tmp); ret =3D set_idx_state(tmp, lv_pos[level], true); if (ret !=3D 0) break; @@ -482,10 +495,12 @@ void __arena *scx_alloc(struct scx_allocator *alloc) return NULL; } =20 + cast_kern(desc); chunk =3D desc->chunk; =20 /* Populate the leaf node if necessary. */ pos =3D idx & (SDT_TASK_ENTS_PER_CHUNK - 1); + cast_kern(chunk); data =3D chunk->data[pos]; if (!data) { data =3D scx_alloc_from_pool(&alloc->pool); @@ -503,10 +518,12 @@ void __arena *scx_alloc(struct scx_allocator *alloc) alloc_stats.alloc_ops +=3D 1; alloc_stats.active_allocs +=3D 1; =20 + cast_kern(data); data->tid.idx =3D idx; =20 bpf_spin_unlock(&alloc_lock); =20 + cast_user(data); return data; } =20 @@ -544,9 +561,10 @@ void __arena *scx_task_alloc(struct task_struct *p) if (unlikely(!data)) return NULL; =20 + mval->data =3D data; + cast_kern(data); mval->tid =3D data->tid; mval->tptr =3D (__u64) p; - mval->data =3D data; =20 return (void __arena *)data->payload; } --=20 2.43.0