From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D38C737C0F6; Mon, 6 Jul 2026 01:41:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783302079; cv=none; b=R3cdyETDqXvmkS9JHu3e8D1CA/BMemN6ikrlGa0YhsdGggKpeZ/0Fyf96FdWpsP8tD/qlYhgo678JllN3OphcHWbToWgyYa71eGzGVAxMkN0g5RxMH3EXmeeeHKME5WJ9slCWJ50zRqJCNWkQuY6b3REFJyOo5JCTqqZ9ZtTCLg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783302079; c=relaxed/simple; bh=rTjFo89eTNM3ZITRs4ga9Rp/14eeSlsYT83nnJG6Rxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ne3OfWJSYTnxWyvHt4lpn3dmZ8GlQokt9qZej4f7gEQZYQAeKUygS+IkbuIMbES9TYgZs/iPVELFUYI1gz+gqgcrit4/Iae1Z22EkrYa7d4V9dvkwTPA37gus3WY2Udr/Oby+maBQbn3cY7ih5XtqMBxLYvcvsyrQ0AZVGmR9NA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X8aXkmXY; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="X8aXkmXY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 913551F00A3A; Mon, 6 Jul 2026 01:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783302077; bh=6rmFLDBKG8lwGRS3DrXxfsqNXlKBgD2G/yy/FJIking=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=X8aXkmXYn+wYUpdrh2cygZroIhfwXwmChnIUHVfcB5XdUcP6z+yt2wUj301g8EdFq EEDqurE8m6KTxlkbs9nL9k61UnM3wGDjmbPMKvNycI//fjojO88WxSK55I1xvM30do JJF+GFthRyPXM6lIAXKMs6b/L6XRBp7lppX3MLN7dKyv7BYlYtjZPpwy8vvbdzyloo yKu9xkM8jBm5G+dg8/V8pquYXzAQrsrNWJyEPCgN/st/Ag0R4Yj+G0Zlfw32BLuXam ei37y0RtI51VI8xFs7U6BcWnSXpqq037DPTB+MoKEzevMF1YokrYUDgVLQOe/9zFYE kOj6r8ZOzD50w== From: Tejun Heo To: David Vernet , Andrea Righi , Changwoo Min Cc: sched-ext@lists.linux.dev, Emil Tsalapatis , linux-kernel@vger.kernel.org, Tejun Heo Subject: [PATCH v2 sched_ext/for-7.3 18/36] sched_ext: Add scx_skip_subtree_pre() Date: Sun, 5 Jul 2026 15:40:40 -1000 Message-ID: <20260706014058.439853-19-tj@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260706014058.439853-1-tj@kernel.org> References: <20260706014058.439853-1-tj@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Factor the sibling/ancestor portion of scx_next_descendant_pre() out as scx_skip_subtree_pre(), a pre-order walk primitive that skips @pos's subtree, and call it from scx_next_descendant_pre(). Same locking rules as the existing primitive. Used in a follow-up to fast-skip subtrees that have nothing to do during a descendant walk. Signed-off-by: Tejun Heo --- kernel/sched/ext/sub.c | 37 ++++++++++++++++++++++++++++--------- kernel/sched/ext/sub.h | 2 ++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/kernel/sched/ext/sub.c b/kernel/sched/ext/sub.c index 5f1661597d70..eb9056f21ce8 100644 --- a/kernel/sched/ext/sub.c +++ b/kernel/sched/ext/sub.c @@ -21,6 +21,33 @@ #ifdef CONFIG_EXT_SUB_SCHED +/** + * scx_skip_subtree_pre - Skip @pos's subtree in a pre-order walk + * @pos: current position + * @root: walk root + * + * In a walk started by scx_next_descendant_pre(), continue past @pos's subtree: + * return @pos's next sibling, or the closest ancestor's next sibling, or NULL + * if @pos's subtree is the last under @root. Same locking rules. + */ +struct scx_sched *scx_skip_subtree_pre(struct scx_sched *pos, struct scx_sched *root) +{ + struct scx_sched *next; + + lockdep_assert(lockdep_is_held(&scx_enable_mutex) || + lockdep_is_held(&scx_sched_lock) || + rcu_read_lock_any_held()); + + while (pos != root) { + next = list_next_or_null_rcu(&scx_parent(pos)->children, &pos->sibling, + struct scx_sched, sibling); + if (next) + return next; + pos = scx_parent(pos); + } + return NULL; +} + /** * scx_next_descendant_pre - find the next descendant for pre-order walk * @pos: the current position (%NULL to initiate traversal) @@ -48,15 +75,7 @@ struct scx_sched *scx_next_descendant_pre(struct scx_sched *pos, struct scx_sche return next; /* no child, visit my or the closest ancestor's next sibling */ - while (pos != root) { - next = list_next_or_null_rcu(&scx_parent(pos)->children, &pos->sibling, - struct scx_sched, sibling); - if (next) - return next; - pos = scx_parent(pos); - } - - return NULL; + return scx_skip_subtree_pre(pos, root); } static struct scx_sched *scx_find_sub_sched(u64 cgroup_id) diff --git a/kernel/sched/ext/sub.h b/kernel/sched/ext/sub.h index e936867bc5c5..3d5ad9c36d64 100644 --- a/kernel/sched/ext/sub.h +++ b/kernel/sched/ext/sub.h @@ -15,6 +15,7 @@ #ifdef CONFIG_EXT_SUB_SCHED +struct scx_sched *scx_skip_subtree_pre(struct scx_sched *pos, struct scx_sched *root); struct scx_sched *scx_next_descendant_pre(struct scx_sched *pos, struct scx_sched *root); void scx_set_task_sched(struct task_struct *p, struct scx_sched *sch); struct cgroup *sch_cgroup(struct scx_sched *sch); @@ -30,6 +31,7 @@ s32 scx_alloc_pshards(struct scx_sched *sch); #else /* CONFIG_EXT_SUB_SCHED */ static inline struct scx_sched *scx_next_descendant_pre(struct scx_sched *pos, struct scx_sched *root) { return pos ? NULL : root; } +static inline struct scx_sched *scx_skip_subtree_pre(struct scx_sched *pos, struct scx_sched *root) { return NULL; } static inline void scx_set_task_sched(struct task_struct *p, struct scx_sched *sch) {} static inline struct cgroup *sch_cgroup(struct scx_sched *sch) { return NULL; } static inline void set_cgroup_sched(struct cgroup *cgrp, struct scx_sched *sch) {} -- 2.54.0