From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A7A63B19BF for ; Thu, 30 Apr 2026 21:38:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585127; cv=none; b=Yz0U7BM2/oytKZr8hT6bbiNxt7mCYo4BYuXp0C1b3NUZQsMBzLPHwP73hSnnsE8bktOH9pZQhEij3NfyYRfrRfDdhccqWveg3ZcYP+L3njLvcX9Uf3O+riwviResuHBRX17nCDKpMWQf1itAAhcn9qCL7O+BG5REHt4U8+HfROw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585127; c=relaxed/simple; bh=+JrGmpZTjPk9b/Lb89nvSdb3q2hKkkX7BYlhmV0mCZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WNYcDsCQTS0lZ8uCKHrqeH3jZTCI2F1mrrD+1mnA5inYx6nuavNKqbI3eoHRjfs0nH1Ad8imrkDundcRqGusD+n12yIoGw/B8Tk4MLGlBHwZFOn2TkrVPQf5bWVvGb40Q8HD3uwtD3Fw9rK1qNMrPIm14BwOyGZd7NKX1Irk9Hg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MY48m34Q; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MY48m34Q" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-48909558b3aso14497755e9.0 for ; Thu, 30 Apr 2026 14:38:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777585124; x=1778189924; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rEV1utz+l1IoymDPrXVXgCM0Qx6/uwG820MKSnB5GmY=; b=MY48m34QBVq7iTJ/NyI9dNQQxw17l8BRVyRFwrZO+XWAaOvjWfMTrE31M/ilWovDoa GRiHPd6knndGnYaAabzfUokFd4o1Qe1TfRBN2ZMfQQtQPyfCGrzceOyGvspa2N12bZNg xW3HgCpLbrYNET28trGMigKqyyKUF52WAstoMioZ7RpZlSMk+p7uAPZ7IlI5bVQ5Q4ki AJOTagFwzsqMr6az4FXGxfCdoyL9NtknmWrRWU5MU7R1PTqQOHw/4S+8V/WcdkGRuaw3 G/tX/nbWMfqffyH3DOkpbXzm3g+QzhSUCyozT/S13LxbyhP/jPD/DzsjgOmx0zOgHXPG AaHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777585124; x=1778189924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rEV1utz+l1IoymDPrXVXgCM0Qx6/uwG820MKSnB5GmY=; b=cnCjk9ShbJeXrcVGEVXI3LRiSqy64nwvhI02YcGz5UIwmZm8dEO7F2XxCdI2XN+L0L e2XrMupaL2dW3smQ2AaoZeH38VuYyHFU64RiyrZ1UFOsZa60mzvlvJCC71R7mLl5ryoo hZa8RjOkeCauJ+V3CPLU8fR6qre0DK/9fVa07qrT5eLgDMuRAGsjEs4O/mIqeixaz7sf kyEAsV1iidW65Ho//Q+P4pW9w8NN9Pv/SyFmQnNpNps8Zajeg2Fq75TjmqizBUX7R32X 5umn1gAZFQjGJ7jKQggnY6AlWmv+Eqh7wMzH7lVLgCTI0WFf3sCaNLJO9MOENgts5qef VG/A== X-Gm-Message-State: AOJu0YxKd9OuSluTetyM4nGOwc3SvFoPdXg8rkFECksStkPFmf8yMMLp CvCOzGCw1QZ9qT2vyoDb3z42LKjRco6BFlhCXBMD6gk0T6dMAGNqpk6M X-Gm-Gg: AeBDieud2madsPhCC0ATkPWX7XApX7NuvQxvKS6SAetNA+8ljUuuIYveIHIu5fuD3EZ vvRntzsaWfeTphdqiKC5+JbskNvoGdXqpFjL0Yd6IrsuRyUYL/eXdxUZuquJC6DCdL/B8JzkOwX ztKELDVko2LOL7sqAlpdE6Qb1wQwVVH4jjX5ejgXatZJ+or8KJs6JgkD2Feasywr/YbBl9AQXBZ iJstXxOre+V/eur6XVy7DHMqpdXBDcCki6eyy+oTJLlvVG0D5q88XYtKQgpKWDnzG6v2mNRTtR5 X/3bJkC5LX6ZDb6A1o9AX+DApqC/2yvxfaJdtcce9l4cEZfNl2eNckTiuvLxEt2V2REtXbsn0Kf 9257NyU9viOx63P6JJyqz5M/v4pvPJMIdkZXe1HkrZsXwp1gMqvTwLsTyL8ANJBGCkB7M2sMl6S kDzm4ZzaachiRL6dhgxBOrHz5ZQGBd6Yn+u+Dv8QQl X-Received: by 2002:a05:600c:4e0c:b0:487:5c0:671f with SMTP id 5b1f17b1804b1-48a8444a520mr78104525e9.9.1777585124350; Thu, 30 Apr 2026 14:38:44 -0700 (PDT) Received: from yuri-framework13 ([78.211.51.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a9879ef89sm418510f8f.30.2026.04.30.14.38.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 14:38:43 -0700 (PDT) From: Yuri Andriaccio To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider Cc: linux-kernel@vger.kernel.org, Luca Abeni , Yuri Andriaccio Subject: [RFC PATCH v5 03/29] sched/deadline: Distinguish between dl_rq and my_q Date: Thu, 30 Apr 2026 23:38:07 +0200 Message-ID: <20260430213835.62217-4-yurand2000@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260430213835.62217-1-yurand2000@gmail.com> References: <20260430213835.62217-1-yurand2000@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: luca abeni Split the single runqueue pointer in sched_dl_entity into two separate pointers, following the existing pattern used by sched_rt_entity: - dl_rq: Points to the deadline runqueue where this entity is queued (global runqueue). - my_q: Points to the runqueue that this entity serves (for servers). This distinction is currently redundant for the fair_server and ext_servers (both point to the same CPU's structures), but is essential for future RT cgroup support where deadline servers will be queued on the global dl_rq while serving tasks from cgroup-specific runqueues. Update rq_of_dl_se() to use container_of_const() to recover the global rq from dl_rq, and update fair.c and ext.c to explicitly use my_q (local rq) when accessing the served runqueue. Update dl_server_init() to take a dl_rq pointer (use to retrieve the global runqueue where the dl_server is scheduled) and a rq pointer (for the local runqueue served by the server). Signed-off-by: luca abeni Signed-off-by: Yuri Andriaccio --- include/linux/sched.h | 6 ++++-- kernel/sched/deadline.c | 10 +++++++--- kernel/sched/ext.c | 4 ++-- kernel/sched/fair.c | 4 ++-- kernel/sched/sched.h | 3 ++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 5a5d3dbc9cdf..eb8b57f689b5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -733,9 +733,11 @@ struct sched_dl_entity { * Bits for DL-server functionality. Also see the comment near * dl_server_update(). * - * @rq the runqueue this server is for + * @dl_rq the runqueue on which this entity is (to be) queued + * @my_q the runqueue "owned" by this entity */ - struct rq *rq; + struct dl_rq *dl_rq; + struct rq *my_q; dl_server_pick_f server_pick_task; #ifdef CONFIG_RT_MUTEXES diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index ce80d9c08e31..219fe2fd697d 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -75,10 +75,12 @@ static inline struct rq *rq_of_dl_rq(struct dl_rq *dl_rq) static inline struct rq *rq_of_dl_se(struct sched_dl_entity *dl_se) { - struct rq *rq = dl_se->rq; + struct rq *rq; if (!dl_server(dl_se)) rq = task_rq(dl_task_of(dl_se)); + else + rq = container_of_const(dl_se->dl_rq, struct rq, dl); return rq; } @@ -1833,10 +1835,12 @@ void dl_server_stop(struct sched_dl_entity *dl_se) dl_se->dl_server_active = 0; } -void dl_server_init(struct sched_dl_entity *dl_se, struct rq *rq, +void dl_server_init(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq, + struct rq *served_rq, dl_server_pick_f pick_task) { - dl_se->rq = rq; + dl_se->dl_rq = dl_rq; + dl_se->my_q = served_rq; dl_se->server_pick_task = pick_task; } diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 064eaa76be4b..382152f8895f 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -2606,7 +2606,7 @@ ext_server_pick_task(struct sched_dl_entity *dl_se, struct rq_flags *rf) if (!scx_enabled()) return NULL; - return do_pick_task_scx(dl_se->rq, rf, true); + return do_pick_task_scx(dl_se->my_q, rf, true); } /* @@ -2618,7 +2618,7 @@ void ext_server_init(struct rq *rq) init_dl_entity(dl_se); - dl_server_init(dl_se, rq, ext_server_pick_task); + dl_server_init(dl_se, &rq->dl, rq, ext_server_pick_task); } #ifdef CONFIG_SCHED_CORE diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ab4114712be7..8c951186d5e5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9059,7 +9059,7 @@ pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf static struct task_struct * fair_server_pick_task(struct sched_dl_entity *dl_se, struct rq_flags *rf) { - return pick_task_fair(dl_se->rq, rf); + return pick_task_fair(dl_se->my_q, rf); } void fair_server_init(struct rq *rq) @@ -9068,7 +9068,7 @@ void fair_server_init(struct rq *rq) init_dl_entity(dl_se); - dl_server_init(dl_se, rq, fair_server_pick_task); + dl_server_init(dl_se, &rq->dl, rq, fair_server_pick_task); } /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1ef9ba480f51..8572bd12d0a2 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -412,7 +412,8 @@ extern void dl_server_update_idle(struct sched_dl_entity *dl_se, s64 delta_exec) extern void dl_server_update(struct sched_dl_entity *dl_se, s64 delta_exec); extern void dl_server_start(struct sched_dl_entity *dl_se); extern void dl_server_stop(struct sched_dl_entity *dl_se); -extern void dl_server_init(struct sched_dl_entity *dl_se, struct rq *rq, +extern void dl_server_init(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq, + struct rq *served_rq, dl_server_pick_f pick_task); extern void sched_init_dl_servers(void); -- 2.53.0