From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8244D3019C6 for ; Thu, 4 Dec 2025 05:53:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764827625; cv=none; b=ieRQOwnsbwmDKQkz/hQyDNkeSoB2XfORrGwmo/5jY4Aet/5LUyP1qZbF3z/7RnwKrPcxsX2ityJhqbSN2ZYv4PVQ4ohmnXaWQYY88h3RHF1AF+gvzPCn16AYAdSbOUitfm6cl7iz4nSlD4V8AAHrP0tsSYhnPixfwH6afPyyOJY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764827625; c=relaxed/simple; bh=b2O6Zyabvv+iE0EI8z7JMwxA5/wqIljqfBdtC/uk9W4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iwwTVr6zCztcoeqeeUuGwOsh7W4se7iIrcMotsw2CkTlKabY2qgoXMXIUhYEd9vtXp9pf2xgMto/6vzaHvuiISTMnEXnzpW37esVvI7HR+uIy6Lhk64ctKmkiHOqBbvBTh4lLJsQ/lhd8vMtS2QNGZf3chIQdiOYJ9fB+AfLFX4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=rFvqG22X; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="rFvqG22X" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5B3MfF0R007211; Thu, 4 Dec 2025 05:53:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=35a8ux xIH8p/e+I4T3mGvAMh8crPHYH23XusLBXcweI=; b=rFvqG22XAfRLABhs0d+1k1 LybQm5PyZsRWy0eIqamFyWMG7wQiViZLzaIUjaY4u1RB+At0Sm/7uP+1MJnSrnhz MmMup7CLAx/8qGhT2ebxTsPT7XZHd25nv6pKBxeX7gUiBNX8HCpK++uVmgiEw0Bx HMX+XnrmeGh35ev9K3QS05zOI7DFg1kfsav/oVhTmEIWdMANuOS0rhZVNg73AvOY fJO0VR9rKx0m1b0MEGge1kh9d0PKhrumhiECaS9v8cV8wGGLsMMgZRojPNfQmIbD Tl+Agt2a+9+x+VlHJE/lP1w3O/FSjVrXqO1rXJlHkeajDwE04hRYZ3QwiO0pG89g == Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aqrg5p3ed-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 04 Dec 2025 05:53:20 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5B440x8p019120; Thu, 4 Dec 2025 05:53:20 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4arbhy671f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 04 Dec 2025 05:53:19 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5B45rISk53215524 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Dec 2025 05:53:18 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F1DEC20043; Thu, 4 Dec 2025 05:53:17 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A548820040; Thu, 4 Dec 2025 05:53:15 +0000 (GMT) Received: from [9.109.215.252] (unknown [9.109.215.252]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 4 Dec 2025 05:53:15 +0000 (GMT) Message-ID: <15fa87f0-3c29-485e-8a0e-db0eb2343f2c@linux.ibm.com> Date: Thu, 4 Dec 2025 11:23:14 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/6] sched/fair: Join two #ifdef CONFIG_CFS_BANDWIDTH blocks To: Ingo Molnar Cc: Peter Zijlstra , Juri Lelli , Dietmar Eggemann , Valentin Schneider , Vincent Guittot , Linus Torvalds , Mel Gorman , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org References: <20251201064647.1851919-1-mingo@kernel.org> <20251201064647.1851919-2-mingo@kernel.org> Content-Language: en-US From: Shrikanth Hegde In-Reply-To: <20251201064647.1851919-2-mingo@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: i-6gJI31Y2geWcbAvlLc3qpJYAXVkB8H X-Authority-Analysis: v=2.4 cv=Ir0Tsb/g c=1 sm=1 tr=0 ts=693121d0 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=xooa7zaK0iun8HTfJEIA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTI5MDAyMCBTYWx0ZWRfX6RCNq8QkixQw gbNRcOmIsTbrAY/Cnzxp1a/cGE0qr9mWqPVLXIoNhYLcO5FWL451XXynwCDWVYFl2uJFXqbjxOh 6rdNC2v0DWx8KaI7vmvtSvjA1TXZuXCyfjbe6a+02Jq+QL8d6tIl2OVID8iXidBn3pibpD3wZ4S V2ejYBMb3kwLJK8pIeXNhb83nngPZ1mul88SK5ewcbmsw53zEtz3Sy9qelAn90ZQJsX61d3i75p qxYZrq+e1JZPNRo8rNlAD6eiGuyH/gue6vFFTL1mHAhlDuoIpe27IMBPMgTWOxJYcpg2eRQhaFB PzwYGQP0xiHmXqFvqx3VOV5ArnrF6zTwv8rRsr+i465I/Krz8l0POotjgNB3C3cCCrFRezig/3M lGX0tGWr4xlsbELjZEPpR8ljZHathg== X-Proofpoint-GUID: i-6gJI31Y2geWcbAvlLc3qpJYAXVkB8H X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-04_01,2025-12-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511290020 On 12/1/25 12:16 PM, Ingo Molnar wrote: > Join two identical #ifdef blocks: > > #ifdef CONFIG_CFS_BANDWIDTH > ... > #endif > > #ifdef CONFIG_CFS_BANDWIDTH > ... > #endif > nit: I think it is CONFIG_FAIR_GROUP_SCHED here and in the subject line. > Also mark nested #ifdef blocks in the usual fashion, to make > it more apparent where in a nested hierarchy of #ifdefs we > are at a glance. > > Signed-off-by: Ingo Molnar > --- > kernel/sched/sched.h | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h > index b419a4d98461..a29965c93832 100644 > --- a/kernel/sched/sched.h > +++ b/kernel/sched/sched.h > @@ -726,9 +726,7 @@ struct cfs_rq { > unsigned long h_load; > u64 last_h_load_update; > struct sched_entity *h_load_next; > -#endif /* CONFIG_FAIR_GROUP_SCHED */ > > -#ifdef CONFIG_FAIR_GROUP_SCHED > struct rq *rq; /* CPU runqueue to which this cfs_rq is attached */ > > /* > @@ -746,14 +744,14 @@ struct cfs_rq { > /* Locally cached copy of our task_group's idle value */ > int idle; > > -#ifdef CONFIG_CFS_BANDWIDTH > +# ifdef CONFIG_CFS_BANDWIDTH > int runtime_enabled; > s64 runtime_remaining; > > u64 throttled_pelt_idle; > -#ifndef CONFIG_64BIT > +# ifndef CONFIG_64BIT > u64 throttled_pelt_idle_copy; > -#endif > +# endif > u64 throttled_clock; > u64 throttled_clock_pelt; > u64 throttled_clock_pelt_time; > @@ -765,7 +763,7 @@ struct cfs_rq { > struct list_head throttled_list; > struct list_head throttled_csd_list; > struct list_head throttled_limbo_list; > -#endif /* CONFIG_CFS_BANDWIDTH */ > +# endif /* CONFIG_CFS_BANDWIDTH */ > #endif /* CONFIG_FAIR_GROUP_SCHED */ > }; > Other than above nit, Reviewed-by: Shrikanth Hegde