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 -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 @@ -129,3 +126,4 @@ const volatile u64 __SCX_ENQ_DSQ_PRIQ __weak; 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) -- 2.43.0