From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 C4E00379C46 for ; Mon, 8 Jun 2026 12:15:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780920959; cv=none; b=uMsCVZXQSSCa1jtTf+122oA3cq/ZnKRQVK4tI6S6N7Rwb8OSei/5H/UWykeedAUnnHzJX8iVvMRxr916WrKGBiN3Hy7IxXA2Cs6KliNy8DREcLHSxToH9X3pCT0yegm3mOx1lU+oTo1r7YD9TiL/ZHkc+M0kI+j8LkIcN0Xax0w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780920959; c=relaxed/simple; bh=qyB5yI6Le6xpCF2Mh0VVp9O8korJzrXEa3MKPuArOrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ot6MRj1cyUcWAvsMGzpRLhXBjHHzpQy4f4xt/o/niYTOkN0dvXbTLPURXl5deXXVS9huvMsZChL10Rc15xoAs75nU4xvHvdMOjAnBdepYePV9ZB0LmG/uEOAe+HvHeq8dAHLdc01Uo49NYzzxKuIECHMAOO2feeL2C/WVgGY5B0= 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=ot4qIufa; arc=none smtp.client-ip=209.85.221.45 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="ot4qIufa" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-45eeba68948so2963936f8f.1 for ; Mon, 08 Jun 2026 05:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780920955; x=1781525755; 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=NueTbVBmAJACS7om+Cw1nmdAI7MJ2FcgIbTst3qsjQM=; b=ot4qIufakqIxK4v/5VDZ2nJLNxGsXc0eX72sRmuKMgAJaKYfLtEGv4GHu5b4ONGFsF nlurnvIQdSfo7gG6SmGkMF7Naa5E1H+YX+h57cnorjlo2NHQmdpuwsXMt+t0ZQVIBB6p zX4qzrlHsCcPv34TBK6iZCXVNYKmPv903X+k7/bgO1VlNJx27X/ub/fTQlsfkSIKWPBp JWy0QN07FM+DzuTPsuN1lMx5IHTfiF1Xk58Mi6giWgsmcexSDdkW969z4Zv0Z8iXLi8s KkjUvP6J0fcMVfZ+5AoZRvUSgdgsUuzSV1pIi0FdAgdoCsvDTeF4bIRQlsli2+VAz7Qn g8ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780920955; x=1781525755; 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=NueTbVBmAJACS7om+Cw1nmdAI7MJ2FcgIbTst3qsjQM=; b=gQ2Lopjuma/aYx5oTtYxAdCOWvpuFDdvZ8ckbwQQihJ2TJrbF/Kx0s02w1kY+kO7ux JN5Sw4G1QXXNcNRJ/7WHXrgivRfSuTPJc+NalF8rFxazIb40BuoBTFDNPlRtWVrk5PyP t1nu5bt140B4imrAl1KrSz1A9oKACFJNUc2eG+UYY6gOxdB7I0C9OdnjmAwxIrwIGxCS RVZDgo2NUZ2tIPVBSzb11wX841JqwF0DvVmBE+qk8EilGu9N/BLH32hfbOPG1tppHGSv qHFk064h1C0Eg+yjk3IOS7kOwxehfSp1vvk1uwWQB4WuxHhinReiJ9STA4t+N9/aTjg8 Fcfg== X-Forwarded-Encrypted: i=1; AFNElJ+AKOjFVmQYoamruRHf3ElkOT/+r1Q7BG0pzEEuzq95GuDiFrUgwJtrFUfALm1Ipe5/St72T+V+v3xqsTg=@vger.kernel.org X-Gm-Message-State: AOJu0YyFtVt4OzMwAaZI9ydtrB7qn9Jb21yVXVEDaxeggmr+GARxxC0J fAJFdnXAxk7F0XPLHCiSaWjrKTpwik8vpgwMpzU+yvdueGXVjOmFtkxt X-Gm-Gg: Acq92OGW7ZoIFXhnxB0ilr/0hqGjQsyH8bDF3Hq9XYYqmw47qoek2jBAx3SM0h0Few9 NBPxXu7mqV8EtIngTb6fhad9ya/Bf0/cE3g+CgMbvx9CduQlkTwX0XdDEBZoXeFHtzmjwhGqB6m 2FrYpP1i2Lu+6i6mxFUacE5GBh5Unpis5jdinaPavr8avLQxeyO9uGmmWnJ2SWiGcuTRwcEidEM WqORwzmDKvTHseb9HtTieOIGfRn9PZtrVC0Nc+zNPTzwKNDZ/QleYFvyXFWQP8gXrSoM0knh2GK xpLeUvEIDy14Z/YSM8U38xZfvBj/kJHjicTUoqSe42e8gw8/CSzUo5gJbMUuDFR9X0ud39Z15Io a1tccLEFOhdqviNZeTKJZQ3Av+vk/GINAbdTeQ+GldasolpZkSzZ3uG92CnOgxXa2/Q7dzrrhe6 wKAMrzncIBz5zV62WRCKZ5kb+WLPzaUdc= X-Received: by 2002:a5d:598b:0:b0:45e:73b3:8118 with SMTP id ffacd0b85a97d-46030512fa1mr24677902f8f.29.1780920955231; Mon, 08 Jun 2026 05:15:55 -0700 (PDT) Received: from victus-lab ([193.205.81.5]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f2ec711sm50644906f8f.12.2026.06.08.05.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 05:15:55 -0700 (PDT) From: Yuri Andriaccio To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Abeni , Yuri Andriaccio Subject: [RFC PATCH v6 08/25] sched/rt: Remove unnecessary runqueue pointer in struct rt_rq Date: Mon, 8 Jun 2026 14:15:27 +0200 Message-ID: <20260608121546.69910-9-yurand2000@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608121546.69910-1-yurand2000@gmail.com> References: <20260608121546.69910-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 Remove the rq field in struct rt_rq. The rq field now is just caching the pointer to the global runqueue of the given rt_rq, so it is unnecessary as the global runqueue can be retrieved in other ways. Introduce global_rq_of_rt_rq to retrieve the global runqueue which serves a rt_rq's dl_server. Rework rq_of_rt_rq to retrieve the runqueue a rt_rq is serving. Signed-off-by: Yuri Andriaccio --- kernel/sched/rt.c | 21 +++++++++------------ kernel/sched/sched.h | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 7b526a86083c..4575c234ae46 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -101,10 +101,7 @@ void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, struct sched_rt_entity *rt_se, int cpu, struct sched_rt_entity *parent) { - struct rq *rq = cpu_rq(cpu); - rt_rq->highest_prio.curr = MAX_RT_PRIO-1; - rt_rq->rq = rq; rt_rq->tg = tg; tg->rt_rq[cpu] = rt_rq; @@ -184,7 +181,7 @@ static void pull_rt_task(struct rq *); static inline void rt_queue_push_tasks(struct rt_rq *rt_rq) { - struct rq *rq = container_of_const(rt_rq, struct rq, rt); + struct rq *rq = global_rq_of_rt_rq(rt_rq); if (!has_pushable_tasks(rt_rq)) return; @@ -194,7 +191,7 @@ static inline void rt_queue_push_tasks(struct rt_rq *rt_rq) static inline void rt_queue_pull_task(struct rt_rq *rt_rq) { - struct rq *rq = container_of_const(rt_rq, struct rq, rt); + struct rq *rq = global_rq_of_rt_rq(rt_rq); queue_balance_callback(rq, &per_cpu(rt_pull_head, rq->cpu), pull_rt_task); } @@ -222,7 +219,7 @@ static void enqueue_pushable_task(struct rt_rq *rt_rq, struct task_struct *p) rt_rq->highest_prio.next = p->prio; if (!rt_rq->overloaded) { - rt_set_overload(rq_of_rt_rq(rt_rq)); + rt_set_overload(global_rq_of_rt_rq(rt_rq)); rt_rq->overloaded = 1; } } @@ -240,7 +237,7 @@ static void dequeue_pushable_task(struct rt_rq *rt_rq, struct task_struct *p) rt_rq->highest_prio.next = MAX_RT_PRIO-1; if (rt_rq->overloaded) { - rt_clear_overload(rq_of_rt_rq(rt_rq)); + rt_clear_overload(global_rq_of_rt_rq(rt_rq)); rt_rq->overloaded = 0; } } @@ -495,7 +492,7 @@ update_stats_wait_start_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se) if (!stats) return; - __update_stats_wait_start(rq_of_rt_rq(rt_rq), p, stats); + __update_stats_wait_start(global_rq_of_rt_rq(rt_rq), p, stats); } static inline void @@ -512,7 +509,7 @@ update_stats_enqueue_sleeper_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_ if (!stats) return; - __update_stats_enqueue_sleeper(rq_of_rt_rq(rt_rq), p, stats); + __update_stats_enqueue_sleeper(global_rq_of_rt_rq(rt_rq), p, stats); } static inline void @@ -540,7 +537,7 @@ update_stats_wait_end_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se) if (!stats) return; - __update_stats_wait_end(rq_of_rt_rq(rt_rq), p, stats); + __update_stats_wait_end(global_rq_of_rt_rq(rt_rq), p, stats); } static inline void @@ -564,11 +561,11 @@ update_stats_dequeue_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se, state = READ_ONCE(p->__state); if (state & TASK_INTERRUPTIBLE) __schedstat_set(p->stats.sleep_start, - rq_clock(rq_of_rt_rq(rt_rq))); + rq_clock(global_rq_of_rt_rq(rt_rq))); if (state & TASK_UNINTERRUPTIBLE) __schedstat_set(p->stats.block_start, - rq_clock(rq_of_rt_rq(rt_rq))); + rq_clock(global_rq_of_rt_rq(rt_rq))); } } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a217c4ab6660..3aa29fe932fc 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -857,8 +857,6 @@ struct rt_rq { raw_spinlock_t rt_runtime_lock; unsigned int rt_nr_boosted; - - struct rq *rq; /* this is always top-level rq, cache? */ #endif #ifdef CONFIG_CGROUP_SCHED struct task_group *tg; /* this tg has "this" rt_rq on given CPU for runnable entities */ @@ -3337,9 +3335,14 @@ static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se) static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq) { - /* Cannot fold with non-CONFIG_RT_GROUP_SCHED version, layout */ WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group); - return rt_rq->rq; + return container_of_const(rt_rq, struct rq, rt); +} + +static inline struct rq *global_rq_of_rt_rq(struct rt_rq *rt_rq) +{ + /* Cannot fold with non-CONFIG_RT_GROUP_SCHED version, layout */ + return cpu_rq(rq_of_rt_rq(rt_rq)->cpu); } static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se) @@ -3358,6 +3361,11 @@ static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq) return container_of_const(rt_rq, struct rq, rt); } +static inline struct rq *global_rq_of_rt_rq(struct rt_rq *rt_rq) +{ + return container_of_const(rt_rq, struct rq, rt); +} + static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se) { struct rq *rq = task_rq(rt_task_of(rt_se)); -- 2.54.0