mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Richard Cheng <icheng@nvidia.com>
To: Andrea Righi <arighi@nvidia.com>
Cc: Tejun Heo <tj@kernel.org>, David Vernet <void@manifault.com>,
	 Changwoo Min <changwoo@igalia.com>,
	John Stultz <jstultz@google.com>, Ingo Molnar <mingo@redhat.com>,
	 Peter Zijlstra <peterz@infradead.org>,
	Juri Lelli <juri.lelli@redhat.com>,
	 Vincent Guittot <vincent.guittot@linaro.org>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	 Steven Rostedt <rostedt@goodmis.org>,
	Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
	 Valentin Schneider <vschneid@redhat.com>,
	K Prateek Nayak <kprateek.nayak@amd.com>,
	 Christian Loehle <christian.loehle@arm.com>,
	David Dai <david.dai@linux.dev>,
	 Emil Tsalapatis <etsal@meta.com>,
	Lee Trager <ltrager@nvidia.com>, Koba Ko <kobak@nvidia.com>,
	 Aiqun Yu <aiqun.yu@oss.qualcomm.com>,
	sched-ext@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 17/18] sched_ext: scx_qmap: Add proxy execution support
Date: Tue, 1 Sep 2026 15:52:05 +0800	[thread overview]
Message-ID: <apaDOhiWKcLH5iQt@MWDK4CY14F> (raw)
In-Reply-To: <20260831134338.1531664-18-arighi@nvidia.com>

On Mon, Aug 31, 2026 at 03:42:27PM +0800, Andrea Righi wrote:
> Add a -X option to opt scx_qmap into queueing mutex-blocked tasks for
> proxy execution. Without the option, SCX_OPS_ENQ_BLOCKED remains clear
> and mutex waiters block normally. With -X, blocked donors are passed to
> qmap_enqueue() with SCX_ENQ_BLOCKED.
> 
> When scx_qmap receives a blocked donor, select a cid allowed by the task
> and held by qmap, preferring its current cid. Dispatch the donor to that
> cid's local DSQ with a fresh slice and SCX_ENQ_PREEMPT, adding
> SCX_ENQ_IMMED when the cid is time-shared. This places the donor at the
> head of an eligible DSQ and requests an immediate reschedule, allowing
> the core proxy-exec path to run the mutex owner using the donor's
> scheduling context as soon as the donor is selected.
> 
> The blocked policy is intentionally unfair and can strongly prioritize
> tasks using contended mutexes, but scx_qmap is a demo scheduler and such
> aggressive behavior makes proxy-exec support easy to observe. Count all
> blocked dispatch attempts in nr_enq_blocked and report their per-interval
> delta.
> 
> Acked-by: John Stultz <jstultz@google.com>
> Signed-off-by: Andrea Righi <arighi@nvidia.com>
> ---
>  tools/sched_ext/scx_qmap.bpf.c | 53 +++++++++++++++++++++++++++++++++-
>  tools/sched_ext/scx_qmap.c     | 13 +++++++--
>  tools/sched_ext/scx_qmap.h     |  1 +
>  3 files changed, 63 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/sched_ext/scx_qmap.bpf.c b/tools/sched_ext/scx_qmap.bpf.c
> index 5bb8b90a275a3..21f8a9be9650c 100644
> --- a/tools/sched_ext/scx_qmap.bpf.c
> +++ b/tools/sched_ext/scx_qmap.bpf.c
> @@ -439,6 +439,9 @@ void BPF_STRUCT_OPS(qmap_enqueue, struct task_struct *p, u64 enq_flags)
>  	 */
>  	taskc->core_sched_seq = qa.core_sched_tail_seqs[idx]++;
>  
> +	if (enq_flags & SCX_ENQ_BLOCKED)
> +		__sync_fetch_and_add(&qa.nr_enq_blocked, 1);
> +
>  	/*
>  	 * A task of ours that can run on none of our self cids - the parent
>  	 * didn't grant them or we delegated them to children - would starve in
> @@ -446,7 +449,8 @@ void BPF_STRUCT_OPS(qmap_enqueue, struct task_struct *p, u64 enq_flags)
>  	 *
>  	 * Force it onto its first allowed cid's local DSQ. If we hold that cid
>  	 * it runs. Otherwise the insert carries SCX_ENQ_RESCUE and the kernel
> -	 * diverts the task to its rescue path.
> +	 * diverts the task to its rescue path. Do this before the blocked-donor
> +	 * fast paths, which also require an eligible self cid to make progress.
>  	 */
>  	if (!cmask_intersects(&taskc->cpus_allowed, &qa.self_cids.mask)) {
>  		s32 c = cmask_next_set_wrap(&taskc->cpus_allowed, 0);
> @@ -460,6 +464,53 @@ void BPF_STRUCT_OPS(qmap_enqueue, struct task_struct *p, u64 enq_flags)
>  		}
>  	}
>  
> +	/*
> +	 * SCX_OPS_ALWAYS_ENQ_IMMED makes the local insertion below implicitly
> +	 * carry SCX_ENQ_IMMED. If the CPU can't run the blocked donor immediately,
> +	 * the core returns it through ops.enqueue() with SCX_ENQ_REENQ. Inserting
> +	 * it into the same local DSQ would repeat the IMMED handback until the
> +	 * scheduler is ejected. Move reenqueued blocked donors to the shared DSQ,
> +	 * which doesn't carry SCX_ENQ_IMMED, so another CPU can consume them.
> +	 */
> +	if ((enq_flags & (SCX_ENQ_BLOCKED | SCX_ENQ_REENQ)) ==
> +	    (SCX_ENQ_BLOCKED | SCX_ENQ_REENQ)) {
> +		taskc->force_local = false;
> +		scx_bpf_dsq_insert(p, SHARED_DSQ, 0, enq_flags);
> +		cid = cmask_next_and2_set_wrap(&taskc->cpus_allowed,
> +					       &qa.idle_cids.mask,
> +					       &qa.self_cids.mask, 0);
> +		if (cid < scx_bpf_nr_cids())
> +			scx_bpf_kick_cid(cid, SCX_KICK_IDLE);
> +		return;
> +	}
> +
> +	/*
> +	 * Insert a blocked mutex donor at the head of an eligible local DSQ with
> +	 * a fresh slice and %SCX_ENQ_PREEMPT, requesting an immediate reschedule.
> +	 * The test above guarantees that cpus_allowed intersects self_cids, but
> +	 * the donor's current cid may have been delegated to a child. Search the
> +	 * intersection starting at the current cid, preserving it when qmap still
> +	 * holds it and wrapping to another eligible self cid otherwise.
> +	 *
> +	 * A self cid may be held exclusively with SCX_CAP_ENQ or time-shared with
> +	 * only SCX_CAP_ENQ_IMMED. Add needs_immed() so either kind can accept the
> +	 * local insertion instead of rejecting and reenqueuing the donor for a
> +	 * capability miss. Once selected, the core proxy-exec path can run the
> +	 * mutex owner using the donor's scheduling context.
> +	 *
> +	 * This policy is intentionally unfair and can strongly prioritize tasks
> +	 * using contended mutexes; scx_qmap is a demonstration scheduler and
> +	 * this behavior makes proxy-exec support easy to observe.
> +	 */
> +	if (enq_flags & SCX_ENQ_BLOCKED) {
> +		cid = cmask_next_and_set_wrap(&taskc->cpus_allowed,
> +					      &qa.self_cids.mask,
> +					      scx_bpf_task_cid(p));
> +		scx_bpf_dsq_insert(p, SCX_DSQ_LOCAL_ON | cid, slice_ns,
> +				   enq_flags | needs_immed(cid) | SCX_ENQ_PREEMPT);
> +		return;
> +	}
> +

Hi Andrea,

Do we need to do serialization between ops.enqueue() and the paths which rebuild qa.self_cids.mask ?

IMHO, appy_partition() can clear or rebuild self_cids after the check but before cmask_next_and_set_wrap().
If the intersection is NULL, the helper return CID, and then the value gets passed to needs_immed(), hiwch uses it as
an index and do "SCX_DSQ_LOCAL_ON | cid". This will be an invalid CPU.

Maybe do "cid < scx_bpf_nr_cids()" before using it ?

Best regards,
Richard Cheng


>  	/*
>  	 * Fault injection: deliberately dispatch one of our own tasks to a cid
>  	 * we don't hold. The inserts carry SCX_ENQ_RESCUE and divert to the
> diff --git a/tools/sched_ext/scx_qmap.c b/tools/sched_ext/scx_qmap.c
> index 5bb5f687e579c..d5226e0716573 100644
> --- a/tools/sched_ext/scx_qmap.c
> +++ b/tools/sched_ext/scx_qmap.c
> @@ -46,7 +46,7 @@ const char help_fmt[] =
>  "See the top-of-file comment in .bpf.c for the design.\n"
>  "\n"
>  "Usage: %s [-s SLICE_US] [-e COUNT] [-t COUNT] [-T COUNT] [-l COUNT] [-b COUNT]\n"
> -"       [-N COUNT] [-P] [-M] [-H] [-c CG_PATH] [-d PID] [-D LEN] [-S] [-p] [-I]\n"
> +"       [-N COUNT] [-P] [-M] [-H] [-c CG_PATH] [-d PID] [-D LEN] [-S] [-p] [-I] [-X]\n"
>  "       [-F COUNT] [-i SEC] [-R MS] [-J MODE] [-v]\n"
>  "\n"
>  "  -s SLICE_US   Override slice duration\n"
> @@ -65,6 +65,7 @@ const char help_fmt[] =
>  "  -S            Suppress qmap-specific debug dump\n"
>  "  -p            Switch only tasks on SCHED_EXT policy instead of all\n"
>  "  -I            Turn on SCX_OPS_ALWAYS_ENQ_IMMED\n"
> +"  -X            Turn on SCX_OPS_ENQ_BLOCKED\n"
>  "  -F COUNT      IMMED stress: force every COUNT'th enqueue to a busy local DSQ (use with -I)\n"
>  "  -C MODE       cid-override test (shuffle|bad-dup|bad-range|bad-mono)\n"
>  "  -i SEC        Stats interval, seconds (default 5)\n"
> @@ -107,6 +108,7 @@ struct hier_prev {
>  	u64 nr_dsps[MAX_SUB_SCHEDS];
>  	u64 nr_reenq_cap;
>  	u64 nr_reenq_immed;
> +	u64 nr_enq_blocked;
>  	u64 nr_inject_attempts;
>  	u64 nr_rescue_dsp;
>  };
> @@ -190,14 +192,16 @@ static void print_hier(struct qmap_arena *qa, struct hier_prev *prev, u64 own_cg
>  	}
>  
>  	format_cid_ranges(qa, CID_SHARED, ranges, sizeof(ranges));
> -	printf("hier   : nsub=%llu excl=%u shared=%s rr=%s reenq cap/immed +%llu/+%llu inj=+%llu rescue=+%llu\n",
> +	printf("hier   : nsub=%llu excl=%u shared=%s rr=%s reenq cap/immed +%llu/+%llu blocked=+%llu inj=+%llu rescue=+%llu\n",
>  	       (unsigned long long)qa->nr_sub_scheds, qa->part.nr_excl, ranges, rr,
>  	       (unsigned long long)(qa->nr_reenq_cap - prev->nr_reenq_cap),
>  	       (unsigned long long)(qa->nr_reenq_immed - prev->nr_reenq_immed),
> +	       (unsigned long long)(qa->nr_enq_blocked - prev->nr_enq_blocked),
>  	       (unsigned long long)(qa->nr_inject_attempts - prev->nr_inject_attempts),
>  	       (unsigned long long)(qa->nr_rescue_dsp - prev->nr_rescue_dsp));
>  	prev->nr_reenq_cap = qa->nr_reenq_cap;
>  	prev->nr_reenq_immed = qa->nr_reenq_immed;
> +	prev->nr_enq_blocked = qa->nr_enq_blocked;
>  	prev->nr_inject_attempts = qa->nr_inject_attempts;
>  	prev->nr_rescue_dsp = qa->nr_rescue_dsp;
>  
> @@ -263,7 +267,7 @@ int main(int argc, char **argv)
>  	skel->rodata->max_tasks = 16384;
>  
>  	while ((opt = getopt(argc, argv,
> -			     "s:e:t:T:l:b:N:PMHc:d:D:SpIF:C:i:R:J:B:q:vh")) != -1) {
> +			     "s:e:t:T:l:b:N:PMHc:d:D:SpIXF:C:i:R:J:B:q:vh")) != -1) {
>  		switch (opt) {
>  		case 's':
>  			skel->rodata->slice_ns = strtoull(optarg, NULL, 0) * 1000;
> @@ -324,6 +328,9 @@ int main(int argc, char **argv)
>  		case 'I':
>  			skel->struct_ops.qmap_ops->flags |= SCX_OPS_ALWAYS_ENQ_IMMED;
>  			break;
> +		case 'X':
> +			skel->struct_ops.qmap_ops->flags |= SCX_OPS_ENQ_BLOCKED;
> +			break;
>  		case 'F':
>  			skel->rodata->immed_stress_nth = strtoul(optarg, NULL, 0);
>  			break;
> diff --git a/tools/sched_ext/scx_qmap.h b/tools/sched_ext/scx_qmap.h
> index c78d61806b398..fc10b542fb477 100644
> --- a/tools/sched_ext/scx_qmap.h
> +++ b/tools/sched_ext/scx_qmap.h
> @@ -178,6 +178,7 @@ struct qmap_arena {
>  	/* bpf -> userspace: stats */
>  	u64 nr_reenq_cap;		/* SCX_TASK_REENQ_CAP bounces */
>  	u64 nr_reenq_immed;		/* SCX_TASK_REENQ_IMMED bounces */
> +	u64 nr_enq_blocked;		/* SCX_ENQ_BLOCKED dispatches */
>  	u64 nr_inject_attempts;		/* fault-injection: dispatches to an unheld cid */
>  	u64 nr_rescue_dsp;		/* SCX_ENQ_RESCUE dispatch attempts */
>  	u32 inject_mode;		/* fault-injection mode (QMAP_INJ_*) */
> -- 
> 2.55.0
> 

  reply	other threads:[~2026-09-01  7:52 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-31 13:42 [PATCHSET v13 sched_ext/for-7.4] sched: Make proxy execution compatible with sched_ext Andrea Righi
2026-08-31 13:42 ` [PATCH 01/18] sched/core: Drop mutex locks before proxy rescheduling Andrea Righi
2026-08-31 13:42 ` [PATCH 02/18] sched/core: Dequeue waking proxy donors before reset Andrea Righi
2026-09-01  5:24   ` K Prateek Nayak
2026-09-08  9:28     ` Andrea Righi
2026-08-31 13:42 ` [PATCH 03/18] sched: Make NOHZ CFS bandwidth checks follow proxy donor Andrea Righi
2026-09-10  9:54   ` Peter Zijlstra
2026-09-15 15:59     ` Andrea Righi
2026-08-31 13:42 ` [PATCH 04/18] sched/core: Avoid false migration warning for proxy donors Andrea Righi
2026-09-10 10:06   ` Peter Zijlstra
2026-09-15 16:05     ` Andrea Righi
2026-09-15 17:20       ` Andrea Righi
2026-09-15 17:24         ` Peter Zijlstra
2026-08-31 13:42 ` [PATCH 05/18] sched: Pass next class to sched_change_begin() Andrea Righi
2026-09-10 10:12   ` Peter Zijlstra
2026-09-15 19:31     ` Andrea Righi
2026-08-31 13:42 ` [PATCH 06/18] sched: Add helper to block retained proxy donors Andrea Righi
2026-08-31 13:42 ` [PATCH 07/18] sched: Add sched_ext hooks for proxy execution Andrea Righi
2026-09-10 10:38   ` Peter Zijlstra
2026-09-15 20:30     ` Andrea Righi
2026-09-16  9:00       ` Peter Zijlstra
2026-09-16 15:52         ` Andrea Righi
2026-09-17 10:35           ` Peter Zijlstra
2026-08-31 13:42 ` [PATCH 08/18] sched: Introduce WF_ON_RQ wake flag Andrea Righi
2026-09-10 10:45   ` Peter Zijlstra
2026-09-15 20:55     ` Andrea Righi
2026-09-15 21:14       ` John Stultz
2026-09-16  9:19         ` Peter Zijlstra
2026-09-16 10:27           ` K Prateek Nayak
2026-09-16 10:30             ` Peter Zijlstra
2026-09-16 10:38               ` K Prateek Nayak
2026-09-16 10:41                 ` Peter Zijlstra
2026-08-31 13:42 ` [PATCH 09/18] sched_ext: Block proxy donors across scheduler transitions Andrea Righi
2026-09-10 10:53   ` Peter Zijlstra
2026-09-10 11:41     ` Peter Zijlstra
2026-09-15 21:40       ` Andrea Righi
2026-08-31 13:42 ` [PATCH 10/18] sched_ext: Fix ops.running/stopping() pairing for proxy-exec donors Andrea Righi
2026-08-31 13:42 ` [PATCH 11/18] sched_ext: Move reject DSQ draining into core Andrea Righi
2026-08-31 13:42 ` [PATCH 12/18] sched_ext: Generalize the reject DSQ reenqueue path Andrea Righi
2026-09-03 22:39   ` Tejun Heo
2026-09-08  9:34     ` Andrea Righi
2026-08-31 13:42 ` [PATCH 13/18] sched_ext: Handle proxy-exec races in remote DSQ transfers Andrea Righi
2026-08-31 13:42 ` [PATCH 14/18] sched_ext: Split curr|donor references properly Andrea Righi
2026-09-10 11:47   ` Peter Zijlstra
2026-09-16  6:44     ` Andrea Righi
2026-08-31 13:42 ` [PATCH 15/18] sched_ext: Delegate proxy donor admission to BPF schedulers Andrea Righi
2026-09-10 13:39   ` Peter Zijlstra
2026-09-16  6:51     ` Andrea Righi
2026-09-10 13:41   ` Peter Zijlstra
2026-08-31 13:42 ` [PATCH 16/18] sched_ext: Add selftest for blocked donor admission Andrea Righi
2026-08-31 13:42 ` [PATCH 17/18] sched_ext: scx_qmap: Add proxy execution support Andrea Righi
2026-09-01  7:52   ` Richard Cheng [this message]
2026-09-08  9:42     ` Andrea Righi
2026-08-31 13:42 ` [PATCH 18/18] sched: Allow enabling proxy exec with sched_ext Andrea Righi
2026-09-03 22:51 ` [PATCHSET v13 sched_ext/for-7.4] sched: Make proxy execution compatible " Tejun Heo
2026-09-08  8:02   ` Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=apaDOhiWKcLH5iQt@MWDK4CY14F \
    --to=icheng@nvidia.com \
    --cc=aiqun.yu@oss.qualcomm.com \
    --cc=arighi@nvidia.com \
    --cc=bsegall@google.com \
    --cc=changwoo@igalia.com \
    --cc=christian.loehle@arm.com \
    --cc=david.dai@linux.dev \
    --cc=dietmar.eggemann@arm.com \
    --cc=etsal@meta.com \
    --cc=jstultz@google.com \
    --cc=juri.lelli@redhat.com \
    --cc=kobak@nvidia.com \
    --cc=kprateek.nayak@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ltrager@nvidia.com \
    --cc=mgorman@suse.de \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=sched-ext@lists.linux.dev \
    --cc=tj@kernel.org \
    --cc=vincent.guittot@linaro.org \
    --cc=void@manifault.com \
    --cc=vschneid@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®