Received-SPF: pass (google.com: domain of linux-kernel+bounces-158062-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
References: <20240312193911.1796717-1-seanjc@google.com>
 <20240312193911.1796717-2-seanjc@google.com>
User-agent: mu4e 1.4.10; emacs 27.2
From: Ankur Arora <ankur.a.arora@oracle.com>
To: Sean Christopherson <seanjc@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>, Ingo Molnar <mingo@redhat.com>,
        Peter
 Zijlstra <peterz@infradead.org>,
        Juri Lelli <juri.lelli@redhat.com>,
        Vincent Guittot <vincent.guittot@linaro.org>,
        Will Deacon
 <will@kernel.org>, linux-doc@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Valentin Schneider
 <valentin.schneider@arm.com>,
        Marco Elver <elver@google.com>,
        Frederic
 Weisbecker <frederic@kernel.org>,
        David Matlack <dmatlack@google.com>,
        Friedrich Weber <f.weber@proxmox.com>,
        Ankur Arora
 <ankur.a.arora@oracle.com>,
        Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH v2 1/2] sched/core: Move preempt_model_*() helpers from
 sched.h to preempt.h
In-reply-to: <20240312193911.1796717-2-seanjc@google.com>
Date: Wed, 24 Apr 2024 23:19:35 -0700
Message-ID: <878r12dkw8.fsf@oracle.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?gxWxQqkqj/bUQ6A6iCoWHIiYrerx/G1AoM8sZF7iPWcFsbHSQRRSVAnqAHTv?=
 =?us-ascii?Q?F8MW6cG9qRCfw0y5jspRTpWWg1N5+RhRG1+VHp97398MIi3UaW3bWGt47xpi?=
 =?us-ascii?Q?GQA9IYhLmnSAWJpgMSuA5lKWjNH+fXKHpvN5Bd8Xe4xYMB5A/ZBfeCGh7IHc?=
 =?us-ascii?Q?16dB9W30qv78nh5KbtFGr+pg5B+kdbXVZVl8HAiaSJ3et0vJcx6IkDSw3+us?=
 =?us-ascii?Q?VMl4EJUnolmRNSIty0bNjtX0BQavu5dn3HuZgtdXalGZVAA1PGA3ds8LLLKa?=
 =?us-ascii?Q?3DGS+yZWcvfNZAlQIsDKgXUtDVE+vCqcf9u9OvyqQwateaUonBZ9USOzZv3J?=
 =?us-ascii?Q?xJZxNFeeeBDxbFoDCtJn1QaajbWp8vBYKmVhYjocJp8kFaXFNxHRrGprScUb?=
 =?us-ascii?Q?bm26dsd0qPt7Q0yxfJNHnrbzlatlk4vaXjiplvmP67n5Pl7Y30C4iYLpJXug?=
 =?us-ascii?Q?dDi94dSmPq86SLjIfRzlQTJbkjyIe03ifxTN8nIguGYUB9/cl5mKwt0iZPip?=
 =?us-ascii?Q?PFeqmq6of+ap6DecHcD1qqABSCvMmESIXmyh5b7kdZly8KvXKFkpqed56w5E?=
 =?us-ascii?Q?UqWVOuP5bRb47pXYEOc9dzPc/fbl0hJsSRiPvmyPyzIMcguixMDDIGrGaGt6?=
 =?us-ascii?Q?pf9p/KcYQ1sXpVSU6oXJp6yDMYXnB4Tzx/3U+SyjIQEuR/KNSU8fRa71QDJB?=
 =?us-ascii?Q?ZpL7z0I69hXYVLgdG7D+eklp8Lq5gemVLPFSNlqvt6UpwRH3QeDmKS/KtJ8O?=
 =?us-ascii?Q?hKqinE7X0Npn8KRAQ/pK10MnIrqlCGEFJwkQRPVnyX3fu5pvj6mpKAPMYsPD?=
 =?us-ascii?Q?eB3Pb7EoZi8etzJ8PFDaEC2lAo7/acqJOIlr7zmU3Do0wth1ENJcmZAxApJl?=
 =?us-ascii?Q?ifpUsrVKssbgBQxQ5FRB8SQHEHVVy7Cp3u51zTn0Qdk9tI3ogwOuryvXA6WN?=
 =?us-ascii?Q?hbkVR3qDRIw0A/t8K/jYAJeJvv0Hi3IeWwkpdkWpJH9wS2DSsbSrqD31gisA?=
 =?us-ascii?Q?tEtEGRa+E2KOLFKaQ3KDuy5HLVirNyRFKnw7enOusuv6u17DVBe2TVRKggQW?=
 =?us-ascii?Q?k0wnWLPHSKe/XG728Qw0uXyqPKOnA0DwSPHxlVIGVng4xtFpGHdW/iJs+TWQ?=
 =?us-ascii?Q?wwGL7qstNy/7kVZO/ezCII4ZCF3kY0p/EvDwujocj2YqKP1FU+1QNpvqT+nV?=
 =?us-ascii?Q?k49IkUHAvrIgyt2A6MbUN2aLIeRXBWBzIeyhNmeLnPdRG4HxmDQgjPWBkDH0?=
 =?us-ascii?Q?Q/sPWc9iDwkbh32X+O/ub1MltJNHy1YfdmJYjD1kaeUPVgRsQZw17v4SS0g1?=
 =?us-ascii?Q?BZ91lpSac9Z/BnA/ADetHcLF9faKk1wJZKwYze/UK2gJDCTV3TZDvM5NXZal?=
 =?us-ascii?Q?O3HOl95Ojd4RE2pBQnvXMJ+xzHsN878l/Vn77+LowQt3tTOb973DNm09YWAj?=
 =?us-ascii?Q?ktEzSQhrz4JgtVhHwrdabgS8uDmHihVRGICouZkWrflYvX3gNYAz5qM8c8bF?=
 =?us-ascii?Q?2G8ZLtumUCoTGzwswzljuTsGx+b4bmRQ7+dLhcCykcWZOIiG8ysMs87Dv0yJ?=
 =?us-ascii?Q?IgFN2XZMvjXkj31lm38tNUeGYsJUFG6DWih3kMxRc2HnW892C5lZMH4pPy2p?=
 =?us-ascii?Q?SA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	RvLTTYenvj7JiHekaMJ52SISfT1Woy9SLunpTOhNK7rS5j7qFhmhkqvHx20iuzHF2fhAPX680K7Qxjp1OPFlZzoAqM5z+l3u+WDjMsGSgF1ltwutLMtUuJ84//HdOfp0yqShv2hcev71+pPY0SaGHnUND2XurZ6VlTF/w9LJ+f4WvM/zCU8Xpsb4jyGsF/5VwOQomWUJnkIb3144AMEBMN+ONn2tAyhQQZ56ErWhcmUQx+qiWe36yoRf5HJubOMIO9Pajc/JP0DL5fmhZovx3H5zyR5jL5OMH9i+bfHAADFvjwtMeUYsnejeJF/zfTiKQ/LCTiZdSMBYHsO8I5GYUWV5Z9pV3Z3gYppKXBnrd6sj91QmzLMS0+Gm9iSgYKXogGENoNX8w2SLRQKQjXLoTYW9jJHBDPVIK22jg8tS5eM/9aRhqgLSfQT506rIgJCmzNRbQbwPI32N8xtVeBFQMR7DIwSSOSVc75jMDSnJgKEumpipQrJl7nhAeMU0vo8Zz6SigGnGmMnyGzHaO8V+SCJOExBICUxYJ5T6C0lhL3VsgI+/Tgy1SakVNn+tXOA6/8Rk7j94sCHAjIFFrdj+fyInLRPkRgmxkKw1ddaS1Y0=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 86d4501f-ae70-41bd-92e4-08dc64efaea2
X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2024 06:19:37.0962
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LzOTlBcYbJOTP3P+z0YX/UODuQZOfkz6kNU93hyTJAsYOAebHmLSMty6dFLH6vcrzA01K6VlMvqTqODZ8U/xZ2nHL2kEz3LER4XhctEpDQ4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5683
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-25_04,2024-04-25_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999
 mlxscore=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2404250043
X-Proofpoint-GUID: R_Qk99QU7LlycdN8KcwZEyAhKgzG0d1s
X-Proofpoint-ORIG-GUID: R_Qk99QU7LlycdN8KcwZEyAhKgzG0d1s


Sean Christopherson <seanjc@google.com> writes:

> Move the declarations and inlined implementations of the preempt_model_*()
> helpers to preempt.h so that they can be referenced in spinlock.h without
> creating a potential circular dependency between spinlock.h and sched.h.
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <seanjc@google.com>

Reviewed-by: Ankur Arora <ankur.a.arora@oracle.com>

Ankur

> ---
>  include/linux/preempt.h | 41 +++++++++++++++++++++++++++++++++++++++++
>  include/linux/sched.h   | 41 -----------------------------------------
>  2 files changed, 41 insertions(+), 41 deletions(-)
>
> diff --git a/include/linux/preempt.h b/include/linux/preempt.h
> index 7233e9cf1bab..ce76f1a45722 100644
> --- a/include/linux/preempt.h
> +++ b/include/linux/preempt.h
> @@ -481,4 +481,45 @@ DEFINE_LOCK_GUARD_0(preempt, preempt_disable(), preempt_enable())
>  DEFINE_LOCK_GUARD_0(preempt_notrace, preempt_disable_notrace(), preempt_enable_notrace())
>  DEFINE_LOCK_GUARD_0(migrate, migrate_disable(), migrate_enable())
>
> +#ifdef CONFIG_PREEMPT_DYNAMIC
> +
> +extern bool preempt_model_none(void);
> +extern bool preempt_model_voluntary(void);
> +extern bool preempt_model_full(void);
> +
> +#else
> +
> +static inline bool preempt_model_none(void)
> +{
> +	return IS_ENABLED(CONFIG_PREEMPT_NONE);
> +}
> +static inline bool preempt_model_voluntary(void)
> +{
> +	return IS_ENABLED(CONFIG_PREEMPT_VOLUNTARY);
> +}
> +static inline bool preempt_model_full(void)
> +{
> +	return IS_ENABLED(CONFIG_PREEMPT);
> +}
> +
> +#endif
> +
> +static inline bool preempt_model_rt(void)
> +{
> +	return IS_ENABLED(CONFIG_PREEMPT_RT);
> +}
> +
> +/*
> + * Does the preemption model allow non-cooperative preemption?
> + *
> + * For !CONFIG_PREEMPT_DYNAMIC kernels this is an exact match with
> + * CONFIG_PREEMPTION; for CONFIG_PREEMPT_DYNAMIC this doesn't work as the
> + * kernel is *built* with CONFIG_PREEMPTION=y but may run with e.g. the
> + * PREEMPT_NONE model.
> + */
> +static inline bool preempt_model_preemptible(void)
> +{
> +	return preempt_model_full() || preempt_model_rt();
> +}
> +
>  #endif /* __LINUX_PREEMPT_H */
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index 17cb0761ff65..e9dc10f7a463 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -2058,47 +2058,6 @@ extern int __cond_resched_rwlock_write(rwlock_t *lock);
>  	__cond_resched_rwlock_write(lock);					\
>  })
>
> -#ifdef CONFIG_PREEMPT_DYNAMIC
> -
> -extern bool preempt_model_none(void);
> -extern bool preempt_model_voluntary(void);
> -extern bool preempt_model_full(void);
> -
> -#else
> -
> -static inline bool preempt_model_none(void)
> -{
> -	return IS_ENABLED(CONFIG_PREEMPT_NONE);
> -}
> -static inline bool preempt_model_voluntary(void)
> -{
> -	return IS_ENABLED(CONFIG_PREEMPT_VOLUNTARY);
> -}
> -static inline bool preempt_model_full(void)
> -{
> -	return IS_ENABLED(CONFIG_PREEMPT);
> -}
> -
> -#endif
> -
> -static inline bool preempt_model_rt(void)
> -{
> -	return IS_ENABLED(CONFIG_PREEMPT_RT);
> -}
> -
> -/*
> - * Does the preemption model allow non-cooperative preemption?
> - *
> - * For !CONFIG_PREEMPT_DYNAMIC kernels this is an exact match with
> - * CONFIG_PREEMPTION; for CONFIG_PREEMPT_DYNAMIC this doesn't work as the
> - * kernel is *built* with CONFIG_PREEMPTION=y but may run with e.g. the
> - * PREEMPT_NONE model.
> - */
> -static inline bool preempt_model_preemptible(void)
> -{
> -	return preempt_model_full() || preempt_model_rt();
> -}
> -
>  static __always_inline bool need_resched(void)
>  {
>  	return unlikely(tif_need_resched());