Received-SPF: pass (google.com: domain of linux-kernel+bounces-191545-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Ankur Arora <ankur.a.arora@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org,
        paulmck@kernel.org, rostedt@goodmis.org, mark.rutland@arm.com,
        juri.lelli@redhat.com, joel@joelfernandes.org, raghavendra.kt@amd.com,
        sshegde@linux.ibm.com, boris.ostrovsky@oracle.com,
        konrad.wilk@oracle.com, Sean Christopherson <seanjc@google.com>,
        Ankur Arora <ankur.a.arora@oracle.com>
Subject: [PATCH v2 01/35] sched/core: Move preempt_model_*() helpers from sched.h to preempt.h
Date: Mon, 27 May 2024 17:34:47 -0700
Message-Id: <20240528003521.979836-2-ankur.a.arora@oracle.com>
In-Reply-To: <20240528003521.979836-1-ankur.a.arora@oracle.com>
References: <20240528003521.979836-1-ankur.a.arora@oracle.com>
Content-Transfer-Encoding: 8bit
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?KJqb0JLGi5nIoHidtFv9sWBpdRHSYQjfULMb4sW0AE5/3viJU9PcHrYiKGgt?=
 =?us-ascii?Q?quu8iuzz/18wCHGdbI4AY8IwXzGiVGowq/Oahpwz9iKbxoeQeaLK7QY7vzay?=
 =?us-ascii?Q?IHb1dSxUG1CHXnaX0cqIvqGwc458CBoampyOOxKvYSFtg7AxPwZjugV+ADzy?=
 =?us-ascii?Q?pNbHKR+hBVyfqRjTlSHYVFc1YKv0EwptvjXFoNjgrarCyq6B7a0lQdSGc55I?=
 =?us-ascii?Q?LW2/50XQvQbbbjFmje7QkDnRCmd1syVXJyACI3vTXM7OuyLaw/mrCZxX0dAy?=
 =?us-ascii?Q?UCL0+HKpT2YHPMIQFrZcVw2q5OWvIBvuzRRpZ7x72+2wrjtd30WQihXdbrl4?=
 =?us-ascii?Q?UVRzk/gUbzffsVhOHKXH7pBwU6dgyABksknlGjv3cjZzvjx/fZSP9Wg+clfL?=
 =?us-ascii?Q?bxoQO+l9vMWHW/+zVhErUir/8XTNK73tiGFt3QzeJgOe+fgJUhYqV+GnEMFe?=
 =?us-ascii?Q?HzDTBRDua1PCoIUZfihYdDZWtv9TaMEHsXeqp6Gt6bdrqbxFkPRwl3V34oGY?=
 =?us-ascii?Q?hO70ZdgqrK98gIP1dyH+hRBIRyZmaPuhS0xWgGDypK1qFaqTRYU8/3GTh9ZV?=
 =?us-ascii?Q?e1BA4rcXTfD33INQ2yyf39/IsX6CLiz7H3Z91T99LKdZlO7h9PX/vRLzwmin?=
 =?us-ascii?Q?xtaSeOcJXbgZEibn04hBuErWZwaeiRTGJ72UClDKNU13h5nMKV7IIJIZKJiK?=
 =?us-ascii?Q?Rm9cqgwWepCs9ounzpfPVbCuoLxLjhhAGn1dea+XsVi7PpVlqdkcA61ZpxG+?=
 =?us-ascii?Q?s//jRiVygEAN5/55vskhjD11MYCQ08/mUqi1nV5N12dR67i+JnHuEA1uWJk4?=
 =?us-ascii?Q?Dv2slJIKdg4bYOl8OM7d10hBHRpK0ErMAWlFZtya+7r0+onFYVyixa9vJwzg?=
 =?us-ascii?Q?nTzVKyxz1RXmub05bBRN5NUX2yAEiE1PdojSsr1s8WUmjrv4r1FsZnFZC+yc?=
 =?us-ascii?Q?wL6Jy31bN3icTkOS1Szs8p9ildWhJQtMoSZ2xgEz7wyPMNzkM/yibKx/tFef?=
 =?us-ascii?Q?nZ1ZeRqQm37geypqoSFXk6hL9kwuyd3EVICinh8//3QP9upu//4DphUITP+V?=
 =?us-ascii?Q?2rVLNXp51n2eMWbuEpNkn3KpNKuYh0WJsgBpM304ZEdB20p7iI4k6pZTvqtU?=
 =?us-ascii?Q?/sKTOTomxeU1ctQpuIEjk6Pop8dfoXB8wz9c1YBEQEuJJ8zEkoipqFq/amjy?=
 =?us-ascii?Q?IfeecHrKcfyr9CoGWpYaEc93Wmbo+QaHJ/ScUYkLg3IHCgQOrr/FmNU9LL75?=
 =?us-ascii?Q?GeSGfeRdt6zKwtGej8wM0FDGHX6L5SzHHr242qFsLP40YHq4QDXMRm8BxKAj?=
 =?us-ascii?Q?3dJrjjZAryxUNDkmFEwGxop5hlX/UGE5SAARTIjqGIQTtURK4JK000sf15of?=
 =?us-ascii?Q?3O2ubQNEo1FFlCvlA9Fn7FfbEPWMZ5BOCmg7Q99VpzyWdHs0WrpCX/3J7bSN?=
 =?us-ascii?Q?LfpZiqPs3EakvJYgIdUo22+EIjIEDQYo083ccvj3sp1tEpaSFbcl5aV1WwLV?=
 =?us-ascii?Q?3A8eKviRnBPgT/nfs5DUCAPugkF5+/YJ6feFF2BJzD2mnWXLHWZlab8yq1E9?=
 =?us-ascii?Q?cV0/Cror5E43K3OUudwRwUpHQDn7vhfEPOaaodoR8Z4Mw4S5q7d4KEyeqfvV?=
 =?us-ascii?Q?Gg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	cG+VzrE8rmnzSFGOatR8krpEdiKmqbAmFH3P0zJhhJRE1in9fvQEyShcj1Cm35vBJpMCJgCr6steww0VtKqrKOTyuagA5zbGo0Jnd8CpIv4cXUJk0jPTwzqbQBQ4hR5dU6aUGJuCTZCYJqYvszGAAlEZAN+eGUgOoZeoI6u2RPRS35OSsRUte337XNMXSKm0smEvdL8PilSyCERFx4oQFPM8mm/WQcSJSuDTFMw8W0XzYNR8FAzZ0k7aADU3nm7/C5j3aKroiG0DdzQCDLv51BWYGGCle9/gQqq3Nm4bfpyLmy/wbTuU+pR3GtBURWEqRKc5tyugQVYV6DMyVCRkh0xwQsNuSseh18oRVx5h6DNvTKFObb50lGs51Md/Dr7eGoZv9bGYMnOolBG2R2lLbpy8rO0D+wDu9J61RbdgM3BjItX2hftMRuW/9Z4PlhdvkXNx3zPlBfBzXX676BKc6+NK3l+btORNuIBKXS4oKCHjvpz6xGJLHUY275LSJI0nn/HTy+Eh3dh3Fb1yqAqALpgq+Idv/0YKsf6c0oKqpKHfb9jwHk+szo/5NbSgZ1uetyuF+QvU8qSQ78etLpqT1n1GWHhP1UtSS7a/KS4/rUA=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2f429ddc-e135-49fc-f32d-08dc7eae10bc
X-MS-Exchange-CrossTenant-AuthSource: CO6PR10MB5409.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 00:35:25.1587
 (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: ONOwvO6UYj5KLvpVf8pZ1FPCGHCKpjnoJZiDrkK32E6wf5QhhvsL1Ezj1SDTcaNicZdptNCXmFCapVJ2UMTkXnA2POQ4b/M7MmtFzOwcc80=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6510
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16
 definitions=2024-05-27_06,2024-05-27_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0
 adultscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2405280003
X-Proofpoint-GUID: sqQF8NwCgKKtjT8AtbbIFawalAkU6iL1
X-Proofpoint-ORIG-GUID: sqQF8NwCgKKtjT8AtbbIFawalAkU6iL1

From: Sean Christopherson <seanjc@google.com>

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>
---
 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 3c2abbc587b4..73a3402843c6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2060,47 +2060,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());
-- 
2.31.1