From nobody Sun May 24 19:35:20 2026 Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) (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 6A1E73FF881 for ; Fri, 22 May 2026 14:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459399; cv=none; b=f37mXR15LF1MKYmHA/ESC6G8u5VFAAREdmMXlXUXZccGNPRCtFt8qT77Tt7H8dgeAQ5eeojTqkksLIV7QbSj5OiiFWYZZHrSCTOuE0R2Eeqb6BS3Tzm4/FFpRJneJOU1cEtdO8U4LZkUHtL0IHCX1MvqrEtiJzeWP3t0A6qIbUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459399; c=relaxed/simple; bh=96+Mn5dQg0BAFRWjBaOBIwyETArL6VvtvpbsixDfENw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=biqIFuyXb81ENzEvtN3HSOw8ncKqBgpfYmmRt9uTWBpG1x80fm7RWaxZ4DEFW3DOB4b674kIfICgQz7ai8/BO/U0vNfD5HM+lk1Jlbu98qtZbIqEDjf6xgWZRUmuFapU0cKuGTOa3sjjhEoFp+noYhCB9rxSXl+M17KMRMNCBOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu; spf=pass smtp.mailfrom=ncsu.edu; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b=WejXR8Fy; arc=none smtp.client-ip=209.85.128.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b="WejXR8Fy" Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-7bdaa68cf81so68455667b3.3 for ; Fri, 22 May 2026 07:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1779459389; x=1780064189; 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=0YNkQve4hWkcV1c/pkST/wIq49wZCGPK5rhQbc3qcto=; b=WejXR8Fya3OEDR72kvuICt/K2mNukre71mLwrKAkRTR/FKjCIr5tqzwQCEWT6WMJeS NrWW5pDWrIwr8fVA8tgDeF92ZntlOCLLi+RpF9zU5dkinlDIQ/gcQ+nNsW5ASkGkC0NA /1lUmgTkQujaP9ips5QEOHDUUGWPjdCnPcmcW1XHtF9OY7zsWk3tZW8r8MWMFitgp3Zo T3zon/zJBZSsNyHJp2ygsm3M4A5uSdWBGiFYadhojWGH8eEIUaS1vAXYISjvncOZskdk p7YIQWb3cnV73Cno7efuv+wJ1f9ZBvnO8lXWZ/EqERYLCzOCvlkxVjhLLFWZxVvcThbf 6XOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779459389; x=1780064189; 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=0YNkQve4hWkcV1c/pkST/wIq49wZCGPK5rhQbc3qcto=; b=ZZ7sdRYwW0k9Emj2nP/ng+Slr2O96+eyDZLO+X96IaGDQOOPfKDBjLNtLaJzfJCXJw vT2WmbvMhV+bUjYXCNPlm+Xwrw+HJcHXb+4iWGDDwRoZXSo9V4aMcGILERyxS8/nuSJM EnqEmykoK4EZVmJ4iJOf0GHxiaNMiLufU3MySMVQ4g2Wl9wWu5mbTqrJzL9bcA/g8KwA WrPC4yr5wW0TSVq3rUxtA5FA/SbmYyoQQ1Z58+eYUATRxh/p/zYqyK1Xi87Baraf6nY0 1pi5TAyNI/Fc25Rt3OYPsrfpZqlCWU7R7DmAI1RFGWO2r031lrlJU2E0GusQ6m3p0cAz 9jKw== X-Forwarded-Encrypted: i=1; AFNElJ8N2ZUCiUkC+r3HQXl5Bdhqf09zaRl7HDmc7cBpzURKckqlm2CEBe75+139jflpoqPAB9cRKvW1fqv63ZM=@vger.kernel.org X-Gm-Message-State: AOJu0YxN0D6wBI6P2RXU+qQgNJuual6Qp21kLLsQ16YWF5dPX/rwAk8f c+EhOCbXqZZUmfVmljvCedvh3dIR9UPHCrAreRq5uBc7GkP0xuQnEJzA/aW1zCKucg== X-Gm-Gg: Acq92OGlgZ+Bc2OINokmPMB35r0S2qDhilD+8uURFSqJqRdRaN3qoOAVUFJoqq9m9pr MdfTJ7WuTrdL99O6zQ9wy1jH5PP3qGAyAulyU/HGzvPW55qaRWybGaMlGCCqAWQF51Agt8r9MXE UdCEJrMYqXXmAs+AdwKS/tV5aJ1d735KAlJ9ZWVV6AGcAVnGm152KT3EP4lJN5Ct8Rr1X07lee9 sMbVzwHrMqU97Ry9158Lv6FZgX1ml6xsft5jgt5ZKm7eYJPqE1tGp9TFV9NhZu5zGcCuI3fT72x lDHZJgCuvL1R5pnpSrOrt7PyrfBVNbJMQHQ7BHpJz26I8DUuy/TFzf3nas6ss6QcLHbZoRY8l8s p52LLHiNnpxsB9WpyTxDQHnLhJO6qdw95Y4flcs0TmGhmABJNKdmRfW9iGIFhuNdXUOQWHzBPbg KAMtXe2/V9lirKnt8XbKgNQ3pkXiH3r1nrM5SMK/4FPbk7x8HkaMhpOmPlVTR7T1qtGUY= X-Received: by 2002:a05:690c:6d8a:b0:7c0:82ec:fe7e with SMTP id 00721157ae682-7d337fa2fe2mr44408627b3.4.1779459388842; Fri, 22 May 2026 07:16:28 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7d389813ea8sm8532757b3.4.2026.05.22.07.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 07:16:28 -0700 (PDT) From: Zecheng Li To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot Cc: Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Rik van Riel , Chris Mason , Madadi Vineeth Reddy , Xu Liu , Blake Jones , Josh Don , Nilay Vaish , K Prateek Nayak , Andrew Morton , linux-kernel@vger.kernel.org, Zecheng Li , Zecheng Li Subject: [PATCH v10 1/3] sched/fair: Co-locate cfs_rq and sched_entity in cfs_tg_state Date: Fri, 22 May 2026 10:15:48 -0400 Message-ID: <20260522141623.600235-2-zli94@ncsu.edu> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260522141623.600235-1-zli94@ncsu.edu> References: <20260522141623.600235-1-zli94@ncsu.edu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zecheng Li Improve data locality and reduce pointer chasing by allocating struct cfs_rq and struct sched_entity together for non-root task groups. This is achieved by introducing a new combined struct cfs_tg_state that holds both objects in a single allocation. This patch: - Introduces struct cfs_tg_state that embeds cfs_rq, sched_entity, and sched_statistics together in a single structure. - Updates __schedstats_from_se() in stats.h to use cfs_tg_state for accessing sched_statistics from a group sched_entity. - Modifies alloc_fair_sched_group() and free_fair_sched_group() to allocate and free the new struct as a single unit. - Modifies the per-CPU pointers in task_group->se and task_group->cfs_rq to point to the members in the new combined structure. Signed-off-by: Zecheng Li Signed-off-by: Zecheng Li Reviewed-by: K Prateek Nayak Reviewed-by: Josh Don --- kernel/sched/fair.c | 18 ++++++------------ kernel/sched/sched.h | 12 ++++++++++++ kernel/sched/stats.h | 9 +-------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8e858ca6bcd0..2bdbe186a9e4 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -15105,8 +15105,6 @@ void free_fair_sched_group(struct task_group *tg) for_each_possible_cpu(i) { if (tg->cfs_rq) kfree(tg->cfs_rq[i]); - if (tg->se) - kfree(tg->se[i]); } =20 kfree(tg->cfs_rq); @@ -15115,6 +15113,7 @@ void free_fair_sched_group(struct task_group *tg) =20 int alloc_fair_sched_group(struct task_group *tg, struct task_group *paren= t) { + struct cfs_tg_state *state; struct sched_entity *se; struct cfs_rq *cfs_rq; int i; @@ -15131,16 +15130,13 @@ int alloc_fair_sched_group(struct task_group *tg,= struct task_group *parent) init_cfs_bandwidth(tg_cfs_bandwidth(tg), tg_cfs_bandwidth(parent)); =20 for_each_possible_cpu(i) { - cfs_rq =3D kzalloc_node(sizeof(struct cfs_rq), - GFP_KERNEL, cpu_to_node(i)); - if (!cfs_rq) + state =3D kzalloc_node(sizeof(*state), + GFP_KERNEL, cpu_to_node(i)); + if (!state) goto err; =20 - se =3D kzalloc_node(sizeof(struct sched_entity_stats), - GFP_KERNEL, cpu_to_node(i)); - if (!se) - goto err_free_rq; - + cfs_rq =3D &state->cfs_rq; + se =3D &state->se; init_cfs_rq(cfs_rq); init_tg_cfs_entry(tg, cfs_rq, se, i, parent->se[i]); init_entity_runnable_average(se); @@ -15148,8 +15144,6 @@ int alloc_fair_sched_group(struct task_group *tg, s= truct task_group *parent) =20 return 1; =20 -err_free_rq: - kfree(cfs_rq); err: return 0; } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 8eb8f83db6b0..c9aac3ab4bd9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2289,6 +2289,18 @@ static inline struct task_group *task_group(struct t= ask_struct *p) return p->sched_task_group; } =20 +#ifdef CONFIG_FAIR_GROUP_SCHED +/* + * Defined here to be available before stats.h is included, since + * stats.h has dependencies on things defined later in this file. + */ +struct cfs_tg_state { + struct cfs_rq cfs_rq; + struct sched_entity se; + struct sched_statistics stats; +} __no_randomize_layout; +#endif + /* Change a task's cfs_rq and parent entity if it moves across CPUs/groups= */ static inline void set_task_rq(struct task_struct *p, unsigned int cpu) { diff --git a/kernel/sched/stats.h b/kernel/sched/stats.h index a612cf253c87..ebe0a7765f98 100644 --- a/kernel/sched/stats.h +++ b/kernel/sched/stats.h @@ -89,19 +89,12 @@ static inline void rq_sched_info_depart (struct rq *rq= , unsigned long long delt =20 #endif /* CONFIG_SCHEDSTATS */ =20 -#ifdef CONFIG_FAIR_GROUP_SCHED -struct sched_entity_stats { - struct sched_entity se; - struct sched_statistics stats; -} __no_randomize_layout; -#endif - static inline struct sched_statistics * __schedstats_from_se(struct sched_entity *se) { #ifdef CONFIG_FAIR_GROUP_SCHED if (!entity_is_task(se)) - return &container_of(se, struct sched_entity_stats, se)->stats; + return &container_of(se, struct cfs_tg_state, se)->stats; #endif return &task_of(se)->stats; } --=20 2.54.0 From nobody Sun May 24 19:35:20 2026 Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) (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 187F3425CD4 for ; Fri, 22 May 2026 14:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459401; cv=none; b=o+vgIP809LhbqrcrUFjUBev7aGVlh2VcHii0HtBGkuL3miqrzTuC0qXCQUHf2SDAhhEvbo4Kp01j1BxuQaW6+yli9D6wAFfOf/O0UsrIbjFSGyKYQ+Ef5q1qK98v4Nm3cCZpV9id/2LT41ZayoFpkJYYffrT+yRLVKa4hzTjAco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459401; c=relaxed/simple; bh=LKjevaIAvoJtllXcxOC4KiozBVX0+8kNgd0vpRRKbfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MB2hVCqbr3YGlG6R0OYdsID8YbzF4Ht9G9/h/fve9TMMB7dWezuP7tXfHMKNZmW+09XQxwEu5vS5DWG/FoSnL26eEei9HzZ2yBt2NwdG5B2V2OMUihhoWyPGdg9wXDZ/R/JuDx+t2kFr+0xGdiB9fk3ycVT2S960hX37TNqRYUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu; spf=pass smtp.mailfrom=ncsu.edu; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b=BCjzFxd5; arc=none smtp.client-ip=209.85.128.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b="BCjzFxd5" Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-7c0dea734b8so70439107b3.3 for ; Fri, 22 May 2026 07:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1779459390; x=1780064190; 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=qyFvpehLrvkootEJqVNjGLvKcIDByxYwXVIobtcnNQE=; b=BCjzFxd5jDbXkncneuFN8RScdJ5mTEH29an9VAmmibLZ5NAPKCir5mTMbUlbbzjpVu Cmnjgp+GKvNFlxxekOM7eAX+sXwcnOzVbR05AYiSec8pOkST+MJbHpRflx8oiqHDPNiX aDtlah8pl5J3LWQaQRUm+XGgHKZMEUf5QZrOB5VqJ2zK0WP6E5dIWrzBlepuL7IHjCOZ WD+iBx00qYFPuqg/Nbp4CUPeyHixvqJbzNx7F8hqBHv09Huw+XKYaWl7i03BOCYjzjlf zpStbyK1SFvSIp3mXWp6RmXpQ26fm0PQGrhG/qBJ7KWBPePYbqwXWQy+F4bqvm/SweGF Av9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779459390; x=1780064190; 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=qyFvpehLrvkootEJqVNjGLvKcIDByxYwXVIobtcnNQE=; b=oGC4VVbGkg53BEaRfVitBO06iR1zIVT/nFkmgRMSAgm9gL5iQp7vvtprzZI20MlkB3 LtbYJ1KhxoS027zrqkt6OjxPv+QdL/F3R5DplG9Tr+m4V04hEeS0abcp1xvBmxtno4+m T20/ZxxcL5fxGU1XDd3W2jID5sQk93ltW40oEjQpiDzyw5y3MF6K9YG1L+env3Zxh8UG vhtLfxj5faQwXS2sS3mx/fWIJoIIchW7bU8CKdW8YVGi/tsEoOBd+wOZCBC0a0XHg7ef ibQYNHWFnbDACJInUwrkO7fpsb0beoQI2sC8nHLe1anNpASjy33D2eExA9XJLQ8R3qTs Utfg== X-Forwarded-Encrypted: i=1; AFNElJ8txlHjy7d256L9jYvGq8Kubi8WxG/O9323l+0UA4bYg36eoSnJMwE3FODObV1AixhgYkhZtr0vcEha5kg=@vger.kernel.org X-Gm-Message-State: AOJu0YzcX2+DFEAoviIQVwLCCkEsUT4CawUUHsII2uak1lVzllDwR3F6 0Ufsdc+Tfhc0mI7SRNoSrO9K1aCI+RGQ3K/prd6jRgnlIDW9hy35E3X5/N/RIGW/ig== X-Gm-Gg: Acq92OG8XxpFZhIuGgochiVXiOVdMZURAIG+eu7mdoA64aYwIDMhT3z50lAYB5sxyHw uUBx/j2kvqGYPkyC/n3r6V50VPsSUUdUt9qO8qgSJTRp7PhA50C9x4koRHx8Bw3vK/DuRyESjLj JxXFZhFrTBlPIik23gGHRzKpzd0kIuIqade+F45jBUI4gfKy4X58kOLg9mccBQBOXXLgn0qsp81 mQZm6U1nEhQf40DUQT6jNaHLSL0ULvdp2VyTJso1BzSYyciMSGQamzGiCQv8pjSSZsncPKRqtQ9 +5qDzQUMTnziTZbdQ5VnyZ3IMGuqyKicd8vKmKwZpuj03ekiYV6trCqJZQeTlcmLJnRzcPFs544 Gqfl8BZKkcVNSN2c3A94GluHAdIdnrwaHv1WDsz8h/L2o1sERB99157AqFN10AzHAU0lIlBd5VT TYoZUOkdRzR8b3qyxUgv6NBuPG52fWbBPimp0PETXllVdd1OO9LSn0wiAX/TUvQzMGU/k= X-Received: by 2002:a05:690c:6a89:b0:7bd:8d1e:39fb with SMTP id 00721157ae682-7d3335f0f5dmr44715237b3.7.1779459389941; Fri, 22 May 2026 07:16:29 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7d389813ea8sm8532757b3.4.2026.05.22.07.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 07:16:29 -0700 (PDT) From: Zecheng Li To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot Cc: Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Rik van Riel , Chris Mason , Madadi Vineeth Reddy , Xu Liu , Blake Jones , Josh Don , Nilay Vaish , K Prateek Nayak , Andrew Morton , linux-kernel@vger.kernel.org, Zecheng Li , Zecheng Li Subject: [PATCH v10 2/3] sched/fair: Remove task_group->se pointer array Date: Fri, 22 May 2026 10:15:49 -0400 Message-ID: <20260522141623.600235-3-zli94@ncsu.edu> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260522141623.600235-1-zli94@ncsu.edu> References: <20260522141623.600235-1-zli94@ncsu.edu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zecheng Li Now that struct sched_entity is co-located with struct cfs_rq for non-root task groups, the task_group->se pointer array is redundant. The associated sched_entity can be loaded directly from the cfs_rq. This patch performs the access conversion with the helpers: - is_root_task_group(tg): checks if a task group is the root task group. It compares the task group's address with the global root_task_group variable. - tg_se(tg, cpu): retrieves the cfs_rq and returns the address of the co-located se. This function checks if tg is the root task group to ensure behaving the same of previous tg->se[cpu]. Replaces all accesses that use the tg->se[cpu] pointer array with calls to the new tg_se(tg, cpu) accessor. - cfs_rq_se(cfs_rq): simplifies access paths like cfs_rq->tg->se[...] to use the co-located sched_entity. This function also checks if tg is the root task group to ensure same behavior. Since tg_se is not in very hot code paths, and the branch is a register comparison with an immediate value (`&root_task_group`), the performance impact is expected to be negligible. Signed-off-by: Zecheng Li Signed-off-by: Zecheng Li Reviewed-by: K Prateek Nayak Reviewed-by: Josh Don --- kernel/sched/core.c | 7 ++----- kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 25 +++++++++---------------- kernel/sched/sched.h | 31 ++++++++++++++++++++++++++----- 4 files changed, 38 insertions(+), 27 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 7fb3f5f2d48c..86fbb38901aa 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8900,7 +8900,7 @@ void __init sched_init(void) wait_bit_init(); =20 #ifdef CONFIG_FAIR_GROUP_SCHED - ptr +=3D 2 * nr_cpu_ids * sizeof(void **); + ptr +=3D nr_cpu_ids * sizeof(void **); #endif #ifdef CONFIG_RT_GROUP_SCHED ptr +=3D 2 * nr_cpu_ids * sizeof(void **); @@ -8909,9 +8909,6 @@ void __init sched_init(void) ptr =3D (unsigned long)kzalloc(ptr, GFP_NOWAIT); =20 #ifdef CONFIG_FAIR_GROUP_SCHED - root_task_group.se =3D (struct sched_entity **)ptr; - ptr +=3D nr_cpu_ids * sizeof(void **); - root_task_group.cfs_rq =3D (struct cfs_rq **)ptr; ptr +=3D nr_cpu_ids * sizeof(void **); =20 @@ -9993,7 +9990,7 @@ static int cpu_cfs_stat_show(struct seq_file *sf, voi= d *v) int i; =20 for_each_possible_cpu(i) { - stats =3D __schedstats_from_se(tg->se[i]); + stats =3D __schedstats_from_se(tg_se(tg, i)); ws +=3D schedstat_val(stats->wait_sum); } =20 diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index ed3a0d65da0c..13ee25eeb49c 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -808,7 +808,7 @@ void dirty_sched_domain_sysctl(int cpu) #ifdef CONFIG_FAIR_GROUP_SCHED static void print_cfs_group_stats(struct seq_file *m, int cpu, struct task= _group *tg) { - struct sched_entity *se =3D tg->se[cpu]; + struct sched_entity *se =3D tg_se(tg, cpu); =20 #define P(F) SEQ_printf(m, " .%-30s: %lld\n", #F, (long long)F) #define P_SCHEDSTAT(F) SEQ_printf(m, " .%-30s: %lld\n", \ diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2bdbe186a9e4..db23951d6ba0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6847,7 +6847,7 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) { struct rq *rq =3D rq_of(cfs_rq); struct cfs_bandwidth *cfs_b =3D tg_cfs_bandwidth(cfs_rq->tg); - struct sched_entity *se =3D cfs_rq->tg->se[cpu_of(rq)]; + struct sched_entity *se =3D cfs_rq_se(cfs_rq); =20 /* * It's possible we are called with runtime_remaining < 0 due to things @@ -11123,7 +11123,6 @@ static bool __update_blocked_fair(struct rq *rq, bo= ol *done) { struct cfs_rq *cfs_rq, *pos; bool decayed =3D false; - int cpu =3D cpu_of(rq); =20 /* * Iterates the task_group tree in a bottom up fashion, see @@ -11143,7 +11142,7 @@ static bool __update_blocked_fair(struct rq *rq, bo= ol *done) } =20 /* Propagate pending load changes to the parent, if any: */ - se =3D cfs_rq->tg->se[cpu]; + se =3D cfs_rq_se(cfs_rq); if (se && !skip_blocked_update(se)) update_load_avg(cfs_rq_of(se), se, UPDATE_TG); =20 @@ -11169,8 +11168,7 @@ static bool __update_blocked_fair(struct rq *rq, bo= ol *done) */ static void update_cfs_rq_h_load(struct cfs_rq *cfs_rq) { - struct rq *rq =3D rq_of(cfs_rq); - struct sched_entity *se =3D cfs_rq->tg->se[cpu_of(rq)]; + struct sched_entity *se =3D cfs_rq_se(cfs_rq); unsigned long now =3D jiffies; unsigned long load; =20 @@ -15108,7 +15106,6 @@ void free_fair_sched_group(struct task_group *tg) } =20 kfree(tg->cfs_rq); - kfree(tg->se); } =20 int alloc_fair_sched_group(struct task_group *tg, struct task_group *paren= t) @@ -15121,9 +15118,6 @@ int alloc_fair_sched_group(struct task_group *tg, s= truct task_group *parent) tg->cfs_rq =3D kzalloc_objs(cfs_rq, nr_cpu_ids); if (!tg->cfs_rq) goto err; - tg->se =3D kzalloc_objs(se, nr_cpu_ids); - if (!tg->se) - goto err; =20 tg->shares =3D NICE_0_LOAD; =20 @@ -15138,7 +15132,7 @@ int alloc_fair_sched_group(struct task_group *tg, s= truct task_group *parent) cfs_rq =3D &state->cfs_rq; se =3D &state->se; init_cfs_rq(cfs_rq); - init_tg_cfs_entry(tg, cfs_rq, se, i, parent->se[i]); + init_tg_cfs_entry(tg, cfs_rq, se, i, tg_se(parent, i)); init_entity_runnable_average(se); } =20 @@ -15157,7 +15151,7 @@ void online_fair_sched_group(struct task_group *tg) =20 for_each_possible_cpu(i) { rq =3D cpu_rq(i); - se =3D tg->se[i]; + se =3D tg_se(tg, i); rq_lock_irq(rq, &rf); update_rq_clock(rq); attach_entity_cfs_rq(se); @@ -15174,7 +15168,7 @@ void unregister_fair_sched_group(struct task_group = *tg) =20 for_each_possible_cpu(cpu) { struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu]; - struct sched_entity *se =3D tg->se[cpu]; + struct sched_entity *se =3D tg_se(tg, cpu); struct rq *rq =3D cpu_rq(cpu); =20 if (se) { @@ -15211,7 +15205,6 @@ void init_tg_cfs_entry(struct task_group *tg, struc= t cfs_rq *cfs_rq, init_cfs_rq_runtime(cfs_rq); =20 tg->cfs_rq[cpu] =3D cfs_rq; - tg->se[cpu] =3D se; =20 /* se could be NULL for root_task_group */ if (!se) @@ -15242,7 +15235,7 @@ static int __sched_group_set_shares(struct task_gro= up *tg, unsigned long shares) /* * We can't change the weight of the root cgroup. */ - if (!tg->se[0]) + if (is_root_task_group(tg)) return -EINVAL; =20 shares =3D clamp(shares, scale_load(MIN_SHARES), scale_load(MAX_SHARES)); @@ -15253,7 +15246,7 @@ static int __sched_group_set_shares(struct task_gro= up *tg, unsigned long shares) tg->shares =3D shares; for_each_possible_cpu(i) { struct rq *rq =3D cpu_rq(i); - struct sched_entity *se =3D tg->se[i]; + struct sched_entity *se =3D tg_se(tg, i); struct rq_flags rf; =20 /* Propagate contribution to hierarchy */ @@ -15304,7 +15297,7 @@ int sched_group_set_idle(struct task_group *tg, lon= g idle) =20 for_each_possible_cpu(i) { struct rq *rq =3D cpu_rq(i); - struct sched_entity *se =3D tg->se[i]; + struct sched_entity *se =3D tg_se(tg, i); struct cfs_rq *grp_cfs_rq =3D tg->cfs_rq[i]; bool was_idle =3D cfs_rq_is_idle(grp_cfs_rq); long idle_task_delta; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c9aac3ab4bd9..63574f9d57f1 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -480,8 +480,6 @@ struct task_group { #endif =20 #ifdef CONFIG_FAIR_GROUP_SCHED - /* schedulable entities of this group on each CPU */ - struct sched_entity **se; /* runqueue "owned" by this group on each CPU */ struct cfs_rq **cfs_rq; unsigned long shares; @@ -929,7 +927,8 @@ struct dl_rq { }; =20 #ifdef CONFIG_FAIR_GROUP_SCHED - +/* Check whether a task group is root tg */ +#define is_root_task_group(tg) ((tg) =3D=3D &root_task_group) /* An entity is a task if it doesn't "own" a runqueue */ #define entity_is_task(se) (!se->my_q) =20 @@ -2299,6 +2298,28 @@ struct cfs_tg_state { struct sched_entity se; struct sched_statistics stats; } __no_randomize_layout; + +static inline struct sched_entity *tg_se(struct task_group *tg, int cpu) +{ + struct cfs_tg_state *state; + + if (is_root_task_group(tg)) + return NULL; + + state =3D container_of(tg->cfs_rq[cpu], struct cfs_tg_state, cfs_rq); + return &state->se; +} + +static inline struct sched_entity *cfs_rq_se(struct cfs_rq *cfs_rq) +{ + struct cfs_tg_state *state; + + if (is_root_task_group(cfs_rq->tg)) + return NULL; + + state =3D container_of(cfs_rq, struct cfs_tg_state, cfs_rq); + return &state->se; +} #endif =20 /* Change a task's cfs_rq and parent entity if it moves across CPUs/groups= */ @@ -2311,8 +2332,8 @@ static inline void set_task_rq(struct task_struct *p,= unsigned int cpu) #ifdef CONFIG_FAIR_GROUP_SCHED set_task_rq_fair(&p->se, p->se.cfs_rq, tg->cfs_rq[cpu]); p->se.cfs_rq =3D tg->cfs_rq[cpu]; - p->se.parent =3D tg->se[cpu]; - p->se.depth =3D tg->se[cpu] ? tg->se[cpu]->depth + 1 : 0; + p->se.parent =3D tg_se(tg, cpu); + p->se.depth =3D p->se.parent ? p->se.parent->depth + 1 : 0; #endif =20 #ifdef CONFIG_RT_GROUP_SCHED --=20 2.54.0 From nobody Sun May 24 19:35:20 2026 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (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 1EB3F405C2B for ; Fri, 22 May 2026 14:16:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459404; cv=none; b=uXrSTcyrOngHGkYsCNuCRkUe9wjJH6Q5W1GESHjnF4xj4vtxIzgWDzCeNqJO+/o067HjFA9y/ejGkD3hNGEMewlo7CGqfVMW0D3dNbWR/MVVHcmq8bHW/z4exP+Nfm5x1aRk2plzBbq1ftGAcoskBL1PQHnwKSWTSxGtdLOdZ0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459404; c=relaxed/simple; bh=XDX41fbH6A5/8HDKiiqZtvAKhincSeQafRwe/fX47t4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SmX6s0K5qHNwgd2ESUpP5hzhqxFrQXIKTMef1qE2VnzQts8x2LIwlLdTO9otA2pRNoJZPeqe9pv4CTc0KcWeZ//+olWtWSQardYPweHVbpZRCM73RcMkZrzTQI6xS+YSlQzNl8JjBcHtkiIm6IPixFWojH/XTTASRuU8KHkIV9s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu; spf=pass smtp.mailfrom=ncsu.edu; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b=M6d4c+vz; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b="M6d4c+vz" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-7c7fc722b50so57376027b3.2 for ; Fri, 22 May 2026 07:16:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1779459391; x=1780064191; 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=MVkyyZa84EGI9OvujUTVrj52RttaElXkTkq3Zz0S93U=; b=M6d4c+vzBlFHMlMTp1vkmT3f6yWh5LNlLd0w57kLngDw3e3/ESkCsT+hqUh/4hI52Y 8CTlsjEfOXRU4+OQHfTU+2CV0gVNJqiGrghlz0aMlfbvzMNP+/QCVcCS2h9DIkiJBdTU bb5IK29ObPF7+w7PXiLv8Tv/42lu04Xt5mtJOaqiiTRu4uHIlR55i8TR39tEd5HdO7bp 3Jkry8vklbTCnvQLGC/wf4S/HBFl/JEChvzEHwX7Pm+UrFt86Orq5g4hScIc1l/ZiCP8 fNkS8XEq2RZ1hS2GeJwpYajWWiGOnJKrVF4YJU0r/GFg2iksR1sn3kCJkqbTu8abpDKz vr9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779459391; x=1780064191; 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=MVkyyZa84EGI9OvujUTVrj52RttaElXkTkq3Zz0S93U=; b=ReetvVmkANg+d/Pu7AdX5JKNW5eR2wctta8V1+M1IAr7681qDZYjNsGKm8z1jOSmOW RpHB4E07ZUbDJUSXjNs4YWo5Bx8ZUAHSHzF9XLpfaMUA10Dgt/brnMgDkrUn8ex1dceC eGHQTWZE5OEvWog5nRKpeaqQASFeT6Nn9PSkST152ejrFz6w5XgKncQzHrjq+6DSptiV W/YaSxyX9XuNjdskqVQro0H/hwCCvI5I7tlCrnbh2njNgTeoACImpgritSxtDHjxxMYo EIYUtCAqZRXU7zLzc4JgKZ0sGds47F3XtIgynsHIHs6fnEm/FCHtRaDfCqgR7B/4NZ8i Gj9A== X-Forwarded-Encrypted: i=1; AFNElJ/nnpDWIJ9OL4CScv1plATrvtKDgIAyFXhikSzvqU3otkgcG4RbxQ7OMLxeiqS1UDTJhEfSxmx0ad5fxjs=@vger.kernel.org X-Gm-Message-State: AOJu0YwIYUUlfKUQdAMd9q0adVa5Rbn8IdwE8W8kRC9jXAr3luXmzc4y B3Teq+gvv0rTY7lY3BFtVoYbjL2zOwNLxU7nix2roVABaxMCzXcm9DEG3DiGBLSJDQ== X-Gm-Gg: Acq92OEl9PMnCIvb/DolBomwJgJpJSHFBCLwY1CFfthgEh4jJW31wN8QAcFqYGczh/m 0NwVl84wFppOToB1cK9x2m5okV7sVb6FGGO944rLUxJ/tugDGR/9htK8b90EPkfQ05Zc6GnwEkx 8tHFAqa9FtnKtIxe957dBFJfB4FHKxRzi1J94ei9H2W8BF7qJYm6/Yh97DValiQqvkh8f03CTPJ qCMh2srgvBYKqH53tLcGp+AMs5/BDGwOT4fVyFrh+ipZdbZk+ZUYF+2nYfmobXibI3BrE5lr0/k 19lptTmua0FnB83RQEVWIvpMPLtmR5JrCp9ELIg5zQehpjFRRQviVhhBCnNR2aCWA3ooW+IFsYt b/IIQo8xOyiv4okmWOmLpYQssAg0Your/vG+EvfYy0a34IjFBp19lkjDIFQ0PyZ55EEZDcA1op/ 69mQS6fSc+j3DRSv1RgaPMzuPQ0bmjTSv1bSjgjZ9Gjgw7aaddW46cCUKD X-Received: by 2002:a05:690c:7402:b0:7bd:4792:671e with SMTP id 00721157ae682-7d3368b514emr45771407b3.44.1779459391100; Fri, 22 May 2026 07:16:31 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7d389813ea8sm8532757b3.4.2026.05.22.07.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 07:16:30 -0700 (PDT) From: Zecheng Li To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot Cc: Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Rik van Riel , Chris Mason , Madadi Vineeth Reddy , Xu Liu , Blake Jones , Josh Don , Nilay Vaish , K Prateek Nayak , Andrew Morton , linux-kernel@vger.kernel.org, Zecheng Li , Zecheng Li Subject: [PATCH v10 3/3] sched/fair: Allocate cfs_tg_state with percpu allocator Date: Fri, 22 May 2026 10:15:50 -0400 Message-ID: <20260522141623.600235-4-zli94@ncsu.edu> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260522141623.600235-1-zli94@ncsu.edu> References: <20260522141623.600235-1-zli94@ncsu.edu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zecheng Li To remove the cfs_rq pointer array in task_group, allocate the combined cfs_rq and sched_entity using the per-cpu allocator. This patch implements the following: - Changes task_group->cfs_rq from struct cfs_rq ** to struct cfs_rq __percpu *. - Updates memory allocation in alloc_fair_sched_group() and free_fair_sched_group() to use alloc_percpu() and free_percpu() respectively. - Uses the inline accessor tg_cfs_rq(tg, cpu) with per_cpu_ptr() to retrieve the pointer to cfs_rq for the given task group and CPU. - Replaces direct accesses tg->cfs_rq[cpu] with calls to the new tg_cfs_rq(tg, cpu) helper. - Handles the root_task_group: since struct rq is already a per-cpu variable (runqueues), its embedded cfs_rq (rq->cfs) is also per-cpu. Therefore, we assign root_task_group.cfs_rq =3D &runqueues.cfs. - Cleanup the code in initializing the root task group. This change places each CPU's cfs_rq and sched_entity in its local per-cpu memory area to remove the per-task_group pointer arrays. Signed-off-by: Zecheng Li Signed-off-by: Zecheng Li Reviewed-by: K Prateek Nayak Reviewed-by: Josh Don --- kernel/sched/core.c | 35 +++++++++++----------------- kernel/sched/fair.c | 54 ++++++++++++++++++-------------------------- kernel/sched/sched.h | 14 ++++++++---- 3 files changed, 45 insertions(+), 58 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 86fbb38901aa..163930370cd0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8884,7 +8884,7 @@ static struct kmem_cache *task_group_cache __ro_after= _init; =20 void __init sched_init(void) { - unsigned long ptr =3D 0; + unsigned long __maybe_unused ptr =3D 0; int i; =20 /* Make sure the linker didn't screw up */ @@ -8900,33 +8900,24 @@ void __init sched_init(void) wait_bit_init(); =20 #ifdef CONFIG_FAIR_GROUP_SCHED - ptr +=3D nr_cpu_ids * sizeof(void **); -#endif -#ifdef CONFIG_RT_GROUP_SCHED - ptr +=3D 2 * nr_cpu_ids * sizeof(void **); -#endif - if (ptr) { - ptr =3D (unsigned long)kzalloc(ptr, GFP_NOWAIT); + root_task_group.cfs_rq =3D &runqueues.cfs; =20 -#ifdef CONFIG_FAIR_GROUP_SCHED - root_task_group.cfs_rq =3D (struct cfs_rq **)ptr; - ptr +=3D nr_cpu_ids * sizeof(void **); - - root_task_group.shares =3D ROOT_TASK_GROUP_LOAD; - init_cfs_bandwidth(&root_task_group.cfs_bandwidth, NULL); + root_task_group.shares =3D ROOT_TASK_GROUP_LOAD; + init_cfs_bandwidth(&root_task_group.cfs_bandwidth, NULL); #endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_EXT_GROUP_SCHED - scx_tg_init(&root_task_group); + scx_tg_init(&root_task_group); #endif /* CONFIG_EXT_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED - root_task_group.rt_se =3D (struct sched_rt_entity **)ptr; - ptr +=3D nr_cpu_ids * sizeof(void **); + ptr +=3D 2 * nr_cpu_ids * sizeof(void **); + ptr =3D (unsigned long)kzalloc(ptr, GFP_NOWAIT); + root_task_group.rt_se =3D (struct sched_rt_entity **)ptr; + ptr +=3D nr_cpu_ids * sizeof(void **); =20 - root_task_group.rt_rq =3D (struct rt_rq **)ptr; - ptr +=3D nr_cpu_ids * sizeof(void **); + root_task_group.rt_rq =3D (struct rt_rq **)ptr; + ptr +=3D nr_cpu_ids * sizeof(void **); =20 #endif /* CONFIG_RT_GROUP_SCHED */ - } =20 init_defrootdomain(); =20 @@ -9841,7 +9832,7 @@ static int tg_set_cfs_bandwidth(struct task_group *tg, } =20 for_each_online_cpu(i) { - struct cfs_rq *cfs_rq =3D tg->cfs_rq[i]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, i); struct rq *rq =3D cfs_rq->rq; =20 guard(rq_lock_irq)(rq); @@ -10009,7 +10000,7 @@ static u64 throttled_time_self(struct task_group *t= g) u64 total =3D 0; =20 for_each_possible_cpu(i) { - total +=3D READ_ONCE(tg->cfs_rq[i]->throttled_clock_self_time); + total +=3D READ_ONCE(tg_cfs_rq(tg, i)->throttled_clock_self_time); } =20 return total; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index db23951d6ba0..9f5b3b3e738c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -334,7 +334,7 @@ static inline bool list_add_leaf_cfs_rq(struct cfs_rq *= cfs_rq) * to a tree or when we reach the top of the tree */ if (cfs_rq->tg->parent && - cfs_rq->tg->parent->cfs_rq[cpu]->on_list) { + tg_cfs_rq(cfs_rq->tg->parent, cpu)->on_list) { /* * If parent is already on the list, we add the child * just before. Thanks to circular linked property of @@ -342,7 +342,7 @@ static inline bool list_add_leaf_cfs_rq(struct cfs_rq *= cfs_rq) * of the list that starts by parent. */ list_add_tail_rcu(&cfs_rq->leaf_cfs_rq_list, - &(cfs_rq->tg->parent->cfs_rq[cpu]->leaf_cfs_rq_list)); + &(tg_cfs_rq(cfs_rq->tg->parent, cpu)->leaf_cfs_rq_list)); /* * The branch is now connected to its tree so we can * reset tmp_alone_branch to the beginning of the @@ -5008,7 +5008,7 @@ static void __maybe_unused clear_tg_offline_cfs_rqs(s= truct rq *rq) =20 rcu_read_lock(); list_for_each_entry_rcu(tg, &task_groups, list) { - struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu_of(rq)]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, cpu_of(rq)); =20 clear_tg_load_avg(cfs_rq); } @@ -6565,7 +6565,7 @@ static inline int throttled_hierarchy(struct cfs_rq *= cfs_rq) =20 static inline int lb_throttled_hierarchy(struct task_struct *p, int dst_cp= u) { - return throttled_hierarchy(task_group(p)->cfs_rq[dst_cpu]); + return throttled_hierarchy(tg_cfs_rq(task_group(p), dst_cpu)); } =20 static inline bool task_is_throttled(struct task_struct *p) @@ -6711,7 +6711,7 @@ static void enqueue_task_fair(struct rq *rq, struct t= ask_struct *p, int flags); static int tg_unthrottle_up(struct task_group *tg, void *data) { struct rq *rq =3D data; - struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu_of(rq)]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, cpu_of(rq)); struct task_struct *p, *tmp; =20 if (--cfs_rq->throttle_count) @@ -6782,7 +6782,7 @@ static void record_throttle_clock(struct cfs_rq *cfs_= rq) static int tg_throttle_down(struct task_group *tg, void *data) { struct rq *rq =3D data; - struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu_of(rq)]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, cpu_of(rq)); =20 if (cfs_rq->throttle_count++) return 0; @@ -7256,8 +7256,8 @@ static void sync_throttle(struct task_group *tg, int = cpu) if (!tg->parent) return; =20 - cfs_rq =3D tg->cfs_rq[cpu]; - pcfs_rq =3D tg->parent->cfs_rq[cpu]; + cfs_rq =3D tg_cfs_rq(tg, cpu); + pcfs_rq =3D tg_cfs_rq(tg->parent, cpu); =20 cfs_rq->throttle_count =3D pcfs_rq->throttle_count; cfs_rq->throttled_clock_pelt =3D rq_clock_pelt(cpu_rq(cpu)); @@ -7449,7 +7449,7 @@ static void __maybe_unused update_runtime_enabled(str= uct rq *rq) rcu_read_lock(); list_for_each_entry_rcu(tg, &task_groups, list) { struct cfs_bandwidth *cfs_b =3D &tg->cfs_bandwidth; - struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu_of(rq)]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, cpu_of(rq)); =20 raw_spin_lock(&cfs_b->lock); cfs_rq->runtime_enabled =3D cfs_b->quota !=3D RUNTIME_INF; @@ -7478,7 +7478,7 @@ static void __maybe_unused unthrottle_offline_cfs_rqs= (struct rq *rq) =20 rcu_read_lock(); list_for_each_entry_rcu(tg, &task_groups, list) { - struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu_of(rq)]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, cpu_of(rq)); =20 if (!cfs_rq->runtime_enabled) continue; @@ -10403,7 +10403,7 @@ static inline int task_is_ineligible_on_dst_cpu(str= uct task_struct *p, int dest_ struct cfs_rq *dst_cfs_rq; =20 #ifdef CONFIG_FAIR_GROUP_SCHED - dst_cfs_rq =3D task_group(p)->cfs_rq[dest_cpu]; + dst_cfs_rq =3D tg_cfs_rq(task_group(p), dest_cpu); #else dst_cfs_rq =3D &cpu_rq(dest_cpu)->cfs; #endif @@ -14833,7 +14833,7 @@ static int task_is_throttled_fair(struct task_struc= t *p, int cpu) struct cfs_rq *cfs_rq; =20 #ifdef CONFIG_FAIR_GROUP_SCHED - cfs_rq =3D task_group(p)->cfs_rq[cpu]; + cfs_rq =3D tg_cfs_rq(task_group(p), cpu); #else cfs_rq =3D &cpu_rq(cpu)->cfs; #endif @@ -15098,39 +15098,31 @@ static void task_change_group_fair(struct task_st= ruct *p) =20 void free_fair_sched_group(struct task_group *tg) { - int i; - - for_each_possible_cpu(i) { - if (tg->cfs_rq) - kfree(tg->cfs_rq[i]); - } - - kfree(tg->cfs_rq); + free_percpu(tg->cfs_rq); } =20 int alloc_fair_sched_group(struct task_group *tg, struct task_group *paren= t) { - struct cfs_tg_state *state; + struct cfs_tg_state __percpu *state; struct sched_entity *se; struct cfs_rq *cfs_rq; int i; =20 - tg->cfs_rq =3D kzalloc_objs(cfs_rq, nr_cpu_ids); - if (!tg->cfs_rq) + state =3D alloc_percpu_gfp(struct cfs_tg_state, GFP_KERNEL); + if (!state) goto err; =20 + tg->cfs_rq =3D &state->cfs_rq; tg->shares =3D NICE_0_LOAD; =20 init_cfs_bandwidth(tg_cfs_bandwidth(tg), tg_cfs_bandwidth(parent)); =20 for_each_possible_cpu(i) { - state =3D kzalloc_node(sizeof(*state), - GFP_KERNEL, cpu_to_node(i)); - if (!state) + cfs_rq =3D tg_cfs_rq(tg, i); + if (!cfs_rq) goto err; =20 - cfs_rq =3D &state->cfs_rq; - se =3D &state->se; + se =3D tg_se(tg, i); init_cfs_rq(cfs_rq); init_tg_cfs_entry(tg, cfs_rq, se, i, tg_se(parent, i)); init_entity_runnable_average(se); @@ -15167,7 +15159,7 @@ void unregister_fair_sched_group(struct task_group = *tg) destroy_cfs_bandwidth(tg_cfs_bandwidth(tg)); =20 for_each_possible_cpu(cpu) { - struct cfs_rq *cfs_rq =3D tg->cfs_rq[cpu]; + struct cfs_rq *cfs_rq =3D tg_cfs_rq(tg, cpu); struct sched_entity *se =3D tg_se(tg, cpu); struct rq *rq =3D cpu_rq(cpu); =20 @@ -15204,8 +15196,6 @@ void init_tg_cfs_entry(struct task_group *tg, struc= t cfs_rq *cfs_rq, cfs_rq->rq =3D rq; init_cfs_rq_runtime(cfs_rq); =20 - tg->cfs_rq[cpu] =3D cfs_rq; - /* se could be NULL for root_task_group */ if (!se) return; @@ -15298,7 +15288,7 @@ int sched_group_set_idle(struct task_group *tg, lon= g idle) for_each_possible_cpu(i) { struct rq *rq =3D cpu_rq(i); struct sched_entity *se =3D tg_se(tg, i); - struct cfs_rq *grp_cfs_rq =3D tg->cfs_rq[i]; + struct cfs_rq *grp_cfs_rq =3D tg_cfs_rq(tg, i); bool was_idle =3D cfs_rq_is_idle(grp_cfs_rq); long idle_task_delta; struct rq_flags rf; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 63574f9d57f1..95a22baa172b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -481,7 +481,7 @@ struct task_group { =20 #ifdef CONFIG_FAIR_GROUP_SCHED /* runqueue "owned" by this group on each CPU */ - struct cfs_rq **cfs_rq; + struct cfs_rq __percpu *cfs_rq; unsigned long shares; /* * load_avg can be heavily contended at clock tick time, so put @@ -2299,6 +2299,12 @@ struct cfs_tg_state { struct sched_statistics stats; } __no_randomize_layout; =20 +/* Access a specific CPU's cfs_rq from a task group */ +static inline struct cfs_rq *tg_cfs_rq(struct task_group *tg, int cpu) +{ + return per_cpu_ptr(tg->cfs_rq, cpu); +} + static inline struct sched_entity *tg_se(struct task_group *tg, int cpu) { struct cfs_tg_state *state; @@ -2306,7 +2312,7 @@ static inline struct sched_entity *tg_se(struct task_= group *tg, int cpu) if (is_root_task_group(tg)) return NULL; =20 - state =3D container_of(tg->cfs_rq[cpu], struct cfs_tg_state, cfs_rq); + state =3D container_of(tg_cfs_rq(tg, cpu), struct cfs_tg_state, cfs_rq); return &state->se; } =20 @@ -2330,8 +2336,8 @@ static inline void set_task_rq(struct task_struct *p,= unsigned int cpu) #endif =20 #ifdef CONFIG_FAIR_GROUP_SCHED - set_task_rq_fair(&p->se, p->se.cfs_rq, tg->cfs_rq[cpu]); - p->se.cfs_rq =3D tg->cfs_rq[cpu]; + set_task_rq_fair(&p->se, p->se.cfs_rq, tg_cfs_rq(tg, cpu)); + p->se.cfs_rq =3D tg_cfs_rq(tg, cpu); p->se.parent =3D tg_se(tg, cpu); p->se.depth =3D p->se.parent ? p->se.parent->depth + 1 : 0; #endif --=20 2.54.0