From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CF9D7344DAB for ; Wed, 8 Apr 2026 12:47:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775652463; cv=none; b=UYT+XZhjORg+yerTk+SIqHaqydy2bPHI8KAinTK/9dCqY5pO3d89ka2rr7iX3xB+nOOZLTjtq4W0RyBgUDkmsMV7oDyZIjH8MyCoEgu7WiOL/WM1mv9y5SbfQeJKM5WOAo9QsCoHpg+Y0sRCP0Swin4VVlLBgILJV1SdJfuN034= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775652463; c=relaxed/simple; bh=hcS4ljt6SLSFdZeSLeiFPgvnx5rApdIML7zFHQ5wf6w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hP+PDuO4pmAlBZEQySAATnwu16//X5d+yOV06hRiUm2jlzhew5J/0M8SEyCIGfXJrsD4SshA3t7L64QzLDOJDE86jJZTnBBRKsfsvZOglQx0BPdjDIZcFLXAhSHJx9rJRF0wOQQnG0xM31I9DXbYoxGm20tQmN1iIHAN+Obqnkc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QEqoyj1A; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QEqoyj1A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E857AC19421; Wed, 8 Apr 2026 12:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775652463; bh=hcS4ljt6SLSFdZeSLeiFPgvnx5rApdIML7zFHQ5wf6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QEqoyj1Asf8qq2P6FoRXmwvpF/J5/pT2J01XlAfnrXtY9UJwyiUFqwuM9JtbWDViA o4QkBDc2Lz+yvRV5mVGQWFo6MKBolb4L0IHprFMbY3vNecC+HJ4/jfEX1fz02fDSuE vSHDhb6rMf6Emv2KuoAhq7x3KRV5OGHoKbmOzTPjAzscate5tLprAnSxLLwjAHuy+M JEfpkp4x2EUGkUQYZ31IoTXfKwj6cQbPjjVlRa/SQasoljJLZ3a04hvoZ9TGXxHMwu ptBHwZmQ8ht7V0sVMgtBHIZ+s92R/aj55y3xyLAUIxRmoujIPXVH+nJ0C8FkJayQ5L vQ+bZQmzyGB1A== From: Sasha Levin To: stable@vger.kernel.org Cc: Tejun Heo , Andrea Righi , Emil Tsalapatis , Sasha Levin Subject: [PATCH 6.18.y 1/2] sched_ext: Refactor do_enqueue_task() local and global DSQ paths Date: Wed, 8 Apr 2026 08:47:40 -0400 Message-ID: <20260408124741.1019690-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026040839-sprang-trembling-2810@gregkh> References: <2026040839-sprang-trembling-2810@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Tejun Heo [ Upstream commit 3546119f18647d7ddbba579737d8a222b430cb1c ] The local and global DSQ enqueue paths in do_enqueue_task() share the same slice refill logic. Factor out the common code into a shared enqueue label. This makes adding new enqueue cases easier. No functional changes. Reviewed-by: Andrea Righi Reviewed-by: Emil Tsalapatis Signed-off-by: Tejun Heo Stable-dep-of: 7e0ffb72de8a ("sched_ext: Fix stale direct dispatch state in ddsp_dsq_id") Signed-off-by: Sasha Levin --- kernel/sched/ext.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index bf4bea3595cd0..083370667e521 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -1243,6 +1243,7 @@ static void do_enqueue_task(struct rq *rq, struct task_struct *p, u64 enq_flags, { struct scx_sched *sch = scx_root; struct task_struct **ddsp_taskp; + struct scx_dispatch_q *dsq; unsigned long qseq; WARN_ON_ONCE(!(p->scx.flags & SCX_TASK_QUEUED)); @@ -1310,8 +1311,17 @@ static void do_enqueue_task(struct rq *rq, struct task_struct *p, u64 enq_flags, direct: direct_dispatch(sch, p, enq_flags); return; - +local_norefill: + dispatch_enqueue(sch, &rq->scx.local_dsq, p, enq_flags); + return; local: + dsq = &rq->scx.local_dsq; + goto enqueue; +global: + dsq = find_global_dsq(sch, p); + goto enqueue; + +enqueue: /* * For task-ordering, slice refill must be treated as implying the end * of the current slice. Otherwise, the longer @p stays on the CPU, the @@ -1319,14 +1329,7 @@ static void do_enqueue_task(struct rq *rq, struct task_struct *p, u64 enq_flags, */ touch_core_sched(rq, p); refill_task_slice_dfl(sch, p); -local_norefill: - dispatch_enqueue(sch, &rq->scx.local_dsq, p, enq_flags); - return; - -global: - touch_core_sched(rq, p); /* see the comment in local: */ - refill_task_slice_dfl(sch, p); - dispatch_enqueue(sch, find_global_dsq(sch, p), p, enq_flags); + dispatch_enqueue(sch, dsq, p, enq_flags); } static bool task_runnable(const struct task_struct *p) -- 2.53.0