From nobody Fri Apr 3 07:15:41 2026 Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) (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 8A2463F0754 for ; Thu, 19 Mar 2026 17:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773942765; cv=none; b=jzt9hn383CUpg7Et9cciSFQsPcUAfBISilO+OgiI7KSmsOSMXsIF/Dds4VKSKihPn5B/w40Bph7EWZ3i5Fc9p1z8EzLIaIDBtvCNYyz3oKyqZCbTqjNV7KGGlnGVdiA1cm2RzfSZ3rKdEZfN1+vsqVa3ani/90mgUBVzmlXhqwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773942765; c=relaxed/simple; bh=gAJU4zC5x6JuY+pTVSWv+bDUwPqDdTnR5X4UgnLK29s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fzv7Cfno5N/vAyOhLxPPDUb0QCYLi4OwHwj9F21UXTiy1fBJDUZEH/1kWMPKG7tYN5TxvZD4Da+YbemLY0+z/AvGdZ18JTofwHZDf8IVF3GLSEKY+GFrPiAM1aG1VnQ8n4h9zBv9AKZEX6BI3Nb5jQFk8NN4//6ONORPh8CxEF0= 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=Y8rWRQhR; arc=none smtp.client-ip=209.85.128.176 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="Y8rWRQhR" Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-79800183233so15633007b3.1 for ; Thu, 19 Mar 2026 10:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1773942759; x=1774547559; 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=NZL/wJBtZ7x/udHyrL9BfhVlsQqTeT94Yhy16V0LzLA=; b=Y8rWRQhRUClwGGujO5Wb6jF07Q9u03jtwmQN/ERSEjmuSALo4VmIHH+dtfnP7CD7kp /51opWM5fyKJStxxbIYTHo4/VTvZ6+nx4FpwT0vHzjFcbC4wuND8+BBUjK7LzhIGIe42 GeUsk59lRC7Al3gHqBQYcL/DIVOY1Pw98XGxu6ULQuXFsvRRbTYpOnInQLKEopO8jBKr wHqxVOSVovZTpuQxuT9fppx4z+WOPCnAhuO5xoCgXm74WIrVCLRlhw5UperhGFdhaOPs cX+T8L9qsqe2Xn6vhN4/9TwFbWR3jl/cxzEOtD5F2pLHeLcXjGJDgSWxPY5siFs2VXe6 a+2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773942759; x=1774547559; 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=NZL/wJBtZ7x/udHyrL9BfhVlsQqTeT94Yhy16V0LzLA=; b=Osx4TOfzpFuOf0Tfpy3rtyv8gSMh4BqN/hwMD87bsycE5TjEdCKb/Q75vxBWc6UuCS t4FBncv9SOqMJ38uZd6veMvrsf/aNzkqGAI6+m0U6Jdb6RJW5/W5bH466vOtI79gtigY hCPZQgSd11Xu/d+KwLAE48xAFBfpfhZ8NBjnxYTm2iXehLZbVtWOPA8rQwCnXNceC41N v2kW0c4pw7Mb2Fc509Yf/IZtEPge3X7l8dUTNZ3qvfLNzT+Can+y0cIZolG0wMZI4pCx jImVOyDj86ScEjDmP+8BGdrjSPmbJ2cAS90mhDIUur0+JsgpyoQz4AA+MWSMqcLtOqTQ blNg== X-Forwarded-Encrypted: i=1; AJvYcCXq0xFnWZgr5dD/y7fg+yV7AmS7eLdV5gNbHsrudh4bbTvmJO7WjyiBtOPshdHcp50Jct1HpakA7mx9Xfc=@vger.kernel.org X-Gm-Message-State: AOJu0YyOsSMYi3ZO6eNsffCAdjEUyNXl8Uq111mwd7gmFCEXGeg0VM1i YcAaBqHADe9tuTLs2tMczSjwYqkP02lTm4T1GxvERHsy3FOR5VM1xYLcoGC6NOAzzg== X-Gm-Gg: ATEYQzxnQki88zR2aYWxiydEn5VEcr0f8L8g8z7v5AlipLLvdFUHlnxlWSXPfkTzlfY +ro4DI2C+WLA1Dpf+hM0Y6ujwSQJO60nv1Qk/TxLPNJfhWiBZCZWe0CPU9v34iPvjb5nyUK5fJD vM3k7r+WDsaguFW02t7rSdTL0s8SAnrsEKnEDjMBuxJeqSBsJ1ISnVcm7XtWFdeCcUmB6wJRrzr co5o3Usy5NHg9/sbhM1d6OQfYq7oGyLji8g5L4FYWaZOPSy7LwyoPtjkwCj3uL3fBvPllGCwfJD F/d92D4Peit/c20uDD5Bk/nOj/o0MoNCFrnn8ccP90omoCVv4+OAAU0/xz1n01aqm4AcahfvYPu uu3nv52gtTowrsKH/6LEf9SdG9rcqEUx8xBo/byzEQejxe1DGHlw4b6O+vfBOSkibL12Jny0lHE b3J9GMiDRa3KPRbcRqbfL5TjdfKIhuSAwjj8W1NA7Pjb0NFYU/ER95W/bB X-Received: by 2002:a05:690c:e3c6:b0:798:6665:ca0d with SMTP id 00721157ae682-79a90484c37mr2266357b3.28.1773942759151; Thu, 19 Mar 2026 10:52:39 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 00721157ae682-79a905bda3esm784667b3.47.2026.03.19.10.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 10:52:38 -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 v9 RESEND 1/3] sched/fair: Co-locate cfs_rq and sched_entity in cfs_tg_state Date: Thu, 19 Mar 2026 13:52:13 -0400 Message-ID: <20260319175235.995183-2-zli94@ncsu.edu> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319175235.995183-1-zli94@ncsu.edu> References: <20260319175235.995183-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 0a35a82e4792..79160d419c9f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -13877,8 +13877,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); @@ -13887,6 +13885,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; @@ -13903,16 +13902,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); @@ -13920,8 +13916,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 b863bbda6de8..826f21fa3f36 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2249,6 +2249,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.53.0 From nobody Fri Apr 3 07:15:41 2026 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (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 C078F3F166E for ; Thu, 19 Mar 2026 17:52:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773942767; cv=none; b=IISLWHiJWvlZf4FuYsrogEixpowZW/pA7Y/+P62Jd+Z6/kh+VcTn6wymzOEIYQnhE6zwMXdBxFn3qc1+FSwz9IHDdAlMCThVrrdcn8RaKS9+Qzs9AAI3iEygI13GHj0eeGIqP9of5/sVuBSvPvu1sHaZUWQLyWfnUcJaNH+FXq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773942767; c=relaxed/simple; bh=q0ND4yMrmH1YomFb9IGsMzFWWV+rd3Ua1sZmJ42tbV4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j3swmqBpmiJPd6NX87OmyyPM7GHC8x26yS1MP5Rjfk9XksXn0Ul3e0npQOjXjfMp+z4tz1YxSxS4NAVmrhkvtYzZXwSijKWntg+2dnTGYdXgUCZzwzp8qmM7leld4DQ7mjNQUlSGo/rigrkLv4luSkxxskMkSNH99M8tSM0sB8I= 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=PBqEq1Aa; arc=none smtp.client-ip=209.85.128.175 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="PBqEq1Aa" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-79827d28fc4so12246187b3.1 for ; Thu, 19 Mar 2026 10:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1773942760; x=1774547560; 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=vSfyDfjcn1C7mC/PR2RRKlXH5W58p8V5M3927Neltqs=; b=PBqEq1AaLu4Jf5R9hmbckDM5iowbQnfwFOpwWxrYGWaPtVyivpTI0mn4gYM/BZRNLQ q/h8cPmawLeb7c/jypRmMjfxak7DjuB8fOQTkUC5gE6M99DEBqXPH173b61Zo2RV2YXZ ycKSvcx2tk40w+xB8S2Ed0DebVDtiy+mKKf6idUmYIJamadocG1OUmjkSL4wUapqI1In 3FM4IYnn0/MVLrKRXn41ErojJJFPW6WNWEqHxTpwqduNrp5/BXDicYiD+MOb6hsP2gSA xGA8/dOOc3dGZIWYjkQ/BfhZUwu5/B92g2AhL3cr8ysUaRb2NW2Rw1jegmazw0PLGjmr ml4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773942760; x=1774547560; 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=vSfyDfjcn1C7mC/PR2RRKlXH5W58p8V5M3927Neltqs=; b=m4VfQGRYh2jbW8OwO/jPTeI89q0f+m8FvpP7rtVDIhWN0mYkZXGD6QJhFeEvZeoQ0/ BQTNqBMg0Wmrl2ZH9nuwAQBejQ8aSKYlnF/pJoW7lr25XGl2d6kWpKiuwCDjZFywuFNL WZre1xxBEX3McqrOs/p+pUqk/wZrqiyzejUj2vvnVDRoTejoPWspEBDIEBgiIBGo954Q H7kq4ithFYkIgt1sx3oJHwyVeJJHQ+KdXvTDXCBU/2nos7t37MXQAoXQhVwboOhZ1psc cP7GOKbS8nR1QEKTIYHoWqhWcks2s177I10W993jgTyBYRCS+e9v0rz309U/tImm+ULe Im9g== X-Forwarded-Encrypted: i=1; AJvYcCX6cQatZizB3nVVL70KNW06rwo1L2pnDE2oNKUg07daU3F2UDFQg1wE1gzFEdQOPfqpNUgKGOerBwOFGR0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxx8IeiXXGpR17uG9/UMph1ukcRMctn7SsPxi86l8yepxAeT/d6 EForaYKFOgTX+FLVpqnuTwzvzWuK/sFDy7jwMvGdjqltHCEraz4qZzVzp777cYz6Wg== X-Gm-Gg: ATEYQzyhmtOV0Q9Fv6hAillqzffSITh0BIl+ut3xfFyx0IOi1KVqKX92rKnPQsHQX7E vj6gS+y2Vu2Jkaue08DsZvKpSygaSa6cwt+oOq5Fn+rN5vVeE+AhaADiMzeyaRGFaN5zhhLDAkU unEoU+HbmTN61vntqOpyVp5IB8pSoVhBApozULvJq0XIi/lIFNoUEREaQTvDU/fsLRvCQpWVtJd Z9IV5zKUtYYQMPK6WQGgdEKHd/L432pXtyL6LzBiegYraoGpCDjDBZHK1COhbRbq3m+SgIAuv+8 c/SkNrffhE0xJBk0b8RNOOl9eFx291U5qKg3101yvcHtFNhJkEEq9XroSCujNOVkkJ1K/Ij4Vd1 o1r2+gItyJHnmnADFQshscVZgN5LiB0F/xvaQKjYkCv+93EDBsuccv4L1uxwD3zAMacSDScraYE bu8buIKBP2JzY5nMD2hVA7OCG9gtvZzBJ8Pfj37HnkArulbs4vxWdOnov3 X-Received: by 2002:a05:690c:f09:b0:798:56eb:f238 with SMTP id 00721157ae682-79a71ade0b4mr83808197b3.36.1773942760222; Thu, 19 Mar 2026 10:52:40 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 00721157ae682-79a905bda3esm784667b3.47.2026.03.19.10.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 10:52:39 -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 v9 RESEND 2/3] sched/fair: Remove task_group->se pointer array Date: Thu, 19 Mar 2026 13:52:14 -0400 Message-ID: <20260319175235.995183-3-zli94@ncsu.edu> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319175235.995183-1-zli94@ncsu.edu> References: <20260319175235.995183-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 64b467c1d5b6..2df42786f780 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8609,7 +8609,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 **); @@ -8618,9 +8618,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 @@ -9697,7 +9694,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 6246008c431e..7e7860d56b4b 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -750,7 +750,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 79160d419c9f..c116e7c2b916 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6212,7 +6212,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 @@ -10067,7 +10067,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 @@ -10087,7 +10086,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 @@ -10113,8 +10112,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 @@ -13880,7 +13878,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) @@ -13893,9 +13890,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 @@ -13910,7 +13904,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 @@ -13929,7 +13923,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); @@ -13946,7 +13940,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) { @@ -13983,7 +13977,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) @@ -14014,7 +14007,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)); @@ -14025,7 +14018,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 */ @@ -14076,7 +14069,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 826f21fa3f36..258dc689a535 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; @@ -920,7 +918,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 @@ -2259,6 +2258,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= */ @@ -2271,8 +2292,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.53.0 From nobody Fri Apr 3 07:15:41 2026 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) (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 D63C0389DE0 for ; Thu, 19 Mar 2026 17:52:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773942768; cv=none; b=ltoGfRpZOe8ws46E+dHZ/dCfIq1wAkIbi9tt8WestZNINKVgjgA1LJiQHgq1rSc5lhq/rsnCGv/zR2jspYI84ltQUw5M/LB30uHaCXYcynFD/OV62xe8PW9mJoyVmLbMmSuhpl0alXQoPP0whnBoJTsM13xLFrtGByOaP3L9c5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773942768; c=relaxed/simple; bh=UCkCte7WiHCq4yQkiqq1brTnkl+ALKYPJxT+9jsckz8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c+vb3SbW2LQvMUVy4M6IdaFKWYOBToB1eZcQDWxq6RptBX59A9qoQ3Fk9/joaNwVH8rhnocY8kNuTSzQsCpDAjvTPWtGVb4e9lbfyWB0bQbwnXFkBqtT3GG9N6kUtuUsJVWWmvEjryXk+sAG02yb46y1XusN+H4xuO8AnNhmAMo= 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=OdZ38jDu; arc=none smtp.client-ip=209.85.128.173 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="OdZ38jDu" Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-78fc4425b6bso12898217b3.1 for ; Thu, 19 Mar 2026 10:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1773942761; x=1774547561; 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=UoUS2WogCfwmVhkFhiQQopzO9BXXtaFBus16kYgbVhQ=; b=OdZ38jDuoAwMsc01pJt8PGE/QbHmMYHecdiwFHkVivUtwRcMPJQW0q10YskmsrXQM5 932ux510dVk/gNn2WJKZk25B7NU9JvP/xEASgiyxaxs5WOoYrS1e0G4Zj7kqvEN7XYV5 Rv5KCG6+JU48Vv+4We0O/8tb3ceqpTGWW/ehK6kYHe2kh4OxlYKaP4y55OHv2c1Q12Ut s6PA4bzjsSdunLfw3u266VKVU1ijCBI97clfjHcq+S1n0T64mWHCIVFjQ65RGyDOpQ+M Nvbr/82tEfbdNhrPFbOLECf+2u/WHlpuwbKlfmMOAWP+AMbEV7W2jHxv1TPhK3j4yupE R3BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773942761; x=1774547561; 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=UoUS2WogCfwmVhkFhiQQopzO9BXXtaFBus16kYgbVhQ=; b=att+8zsnMuhEQRlj4IyGn1eB7X+WWP4cjgwW5JPuW4N9SlNCSVIaHIhFbJYCyPIA/o EPoNkgOh1T8oTvobtMyLdyp1t1YhfnO9SImVs6sjypARmwUJGNl9mxzOo+7l6bM7j7Ed LtXVF7rmOZfv/tDQQMHlTTJc3PqJIIEQoKg3hGhVhKKvGA3GFhV7VaMcVgBLvqAjD9CK OzTUlAAOuOcHUFbae2gc35RUweqjuck3XbAEuf7Pie8fxy/v0BIjD1pJuC0xdzRP8okc MDwcUiTXj3iLrJeWwP247ZoMTIYYzcUR/yCTsDNLSXE7EDCk33Apl9nYlz+dSF2Kkw4J mGdw== X-Forwarded-Encrypted: i=1; AJvYcCVN0PEPIYKQ2KmuJXM7M0PxvUVLk4zQy0mAUySwPufe4posoZZeXDW4oBfvR1YKERxuXSUm1vfvup+vix0=@vger.kernel.org X-Gm-Message-State: AOJu0YyMGFLkkp/1Qekag694F+q5NEeqk0yaEbQ5p4BqO0Hdi6Xan93h Qpe6ON3EbS0UbN6JxDKaxGDoanHbSl5R458FVgIMo6XP0wHGvRekAKt5yiWwUBaFDw== X-Gm-Gg: ATEYQzzO2ofhAhsz6Sm6lx1J6kZADSI05oKtvoR0VjElYLY7UnZr7Ocx4XZ9+E6ksRh lJH4+5gDGjjTjhxjvuYCBgKgooOs/1As/ptY1OC+Ic8xCMloQpGpGcGVot7Hz9mW+4KkIGDuuqE 6Omipajra3A5Uqxtq8L74+bj6tgKTB3FqSjKwpd1CEWkJODHDM7RERHwXmfvJAqs1QE9b+8rgn5 fVRc6hlrfhnN9JjtF4UMjeNn7ahegNC6JYcOyvHPu+52X6nffFpmcbDGETxxiZ82DlkV86lIVjj qpn2fTjqJ89GjKM7swQ126y3iva+MH1dyFN78mmS3bm1LcDKnUab6Qgp0qA6TYr+JeMUQ991+/D JW4e3cw0zg/r1J6loKF1kbVmPm+RcZ0rp8c1h184pXlF+jmT99MiWxGs7OeRhwIvAf1Dh0gCF5k +aHlJJKprqBizCRK0tHSQDkBJ+z5zXCI32vcrcH1YagvRKY8kJ+i34MrucleLnjZJjzRo= X-Received: by 2002:a05:690c:ec5:b0:79a:5164:bb1f with SMTP id 00721157ae682-79a90ac2292mr119777b3.7.1773942761331; Thu, 19 Mar 2026 10:52:41 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 00721157ae682-79a905bda3esm784667b3.47.2026.03.19.10.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 10:52:40 -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 v9 RESEND 3/3] sched/fair: Allocate cfs_tg_state with percpu allocator Date: Thu, 19 Mar 2026 13:52:15 -0400 Message-ID: <20260319175235.995183-4-zli94@ncsu.edu> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319175235.995183-1-zli94@ncsu.edu> References: <20260319175235.995183-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 2df42786f780..0e03b257ca9a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8593,7 +8593,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 */ @@ -8609,33 +8609,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 @@ -9545,7 +9536,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); @@ -9713,7 +9704,7 @@ static u64 throttled_time_self(struct task_group *tg) 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 c116e7c2b916..5a6491edcf31 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 @@ -4387,7 +4387,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); } @@ -5930,7 +5930,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) @@ -6076,7 +6076,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) @@ -6147,7 +6147,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; @@ -6621,8 +6621,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)); @@ -6814,7 +6814,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; @@ -6843,7 +6843,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; @@ -9636,7 +9636,7 @@ static inline int task_is_ineligible_on_dst_cpu(struc= t 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 @@ -13604,7 +13604,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 @@ -13870,39 +13870,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); @@ -13939,7 +13931,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 @@ -13976,8 +13968,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; @@ -14070,7 +14060,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 258dc689a535..0d0f87e873fe 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 @@ -2259,6 +2259,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; @@ -2266,7 +2272,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 @@ -2290,8 +2296,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.53.0