Received-SPF: pass (google.com: domain of linux-kernel+bounces-191557-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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, Ankur Arora <ankur.a.arora@oracle.com>,
        Ingo Molnar <mingo@redhat.com>,
        Vincent Guittot <vincent.guittot@linaro.org>
Subject: [PATCH v2 12/35] sched: separate PREEMPT_DYNAMIC config logic
Date: Mon, 27 May 2024 17:34:58 -0700
Message-Id: <20240528003521.979836-13-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?rU8UNe5NDOCawAUe2UiBxRyJCCEq75NoJg7HTeLloT4kS4YOUfuMolKZe2QT?=
 =?us-ascii?Q?vHNFgL4kgDjZJEbwrqrUtJsYSMoOMTCgpIvA6ClBAXlgVsGiau3MUEL8iuJP?=
 =?us-ascii?Q?7vfio2tz1zREpIaL2sKLm4sg/O6TiIWqjZ7c6yNtBnCVbMBOuWcoq740EDJg?=
 =?us-ascii?Q?WxkqP5askRdV+64mxUqGvuVtGV7IXwDT4rYAeLqSsnXoh39SJXsUwdDAyBYB?=
 =?us-ascii?Q?UxYgUQbIQiHXBYrG9st0GAJZJo6gQMuPsReSw5BxxABFqtL1MPQltKYQ+AC5?=
 =?us-ascii?Q?fqbl1HVjJ03z7DYXhWkS2BZzDJaHE5ZfxMP0LuEsxySP7B9VQduWgC5wN6kb?=
 =?us-ascii?Q?7F6bEi0Eh4DvCZ4xD4CZUJnOnj3dIoaB5uorA/ECLa93yWfBDI3GGi1O/dls?=
 =?us-ascii?Q?0jxW3ZHsUiRH5NgctCPsm8N7l56XxvUTvIbxgfAd7kzHnoVK6fuubye4VqGy?=
 =?us-ascii?Q?zOBXYLsZ0ILHWJwotI7TqgWpPFPN4jSAmjPCb99ZXhwGwVmJzSMv1K8B820E?=
 =?us-ascii?Q?wYg1aHuPyIkhzaRPH9VHsWsUNpZGUNQx7HD0nOp+tOSi/dmOinl5DPh3XJJx?=
 =?us-ascii?Q?ym9lBFN4zdr6aELygBfJ6Q3w2bqi+Xp/yEUn+ObNBhAY7GPNV/lis/ieZA0M?=
 =?us-ascii?Q?m+B9cnstXExVM3v9EcAd5pLuKvEM45JF5EaJwsYbwjLiA1HE2VOZHjfgj2m+?=
 =?us-ascii?Q?lWI7Q9f3JDVTIzYI5dtY80EW33ZD23tFjB/lc/8K9lcJy3hYJ9MqlUEnKCsh?=
 =?us-ascii?Q?ZaR8Ag1K6OJQliD6VWl0Bq6V8PikvSbbEXGcj76+MIpJvQ+A8hYk23roGMGb?=
 =?us-ascii?Q?X1yYBd9GuFORDhSptqVntxApi0lONBHZBlBH0XVW5hfcj2eC8S0g4yzW5GNn?=
 =?us-ascii?Q?JDZs90q1zID5rFtoUcCHrG1X+N0lIVUBTEE+1PAWJU65ftjVwUdl9u3qw7iR?=
 =?us-ascii?Q?wZM6lpDxn8VJ62jCH7ZqROxGFpEU95hgLql+YrJJiRglNVs4YSUyouKV1D5X?=
 =?us-ascii?Q?IUEuOae4fxE7sm4JlOyk2F3qaHG649rrh1/CUeiKmf6tzQ3TbM+Ov5yqOX5J?=
 =?us-ascii?Q?9mETQr29KCXstP2B4E8M3cY+/jR36cJtaRPJk9bWU893YD9Rsta5MZ8mpolL?=
 =?us-ascii?Q?igFNkV7N9tlrTjacJTT1Mu4I2WBxdjUYVozYfKRbv0tml/vP0H5mWfEEVprD?=
 =?us-ascii?Q?JpgOTSCve+qYvw+kT8T8fQgdhsgAhH2QOdJJHZNKLd2TeWrkK4DaI9G8rNuh?=
 =?us-ascii?Q?6WLSBkA6MTwcrK6/cTSTQJ11j/SR43A6MA95Fl7yh1xzo/xVgEXrR2sShCpS?=
 =?us-ascii?Q?3BrozNtOml77KT1uPJM7ZFR7CQPwdEkznxmOZoq/+PXJyHs7TDSJvGhGbJkW?=
 =?us-ascii?Q?w0zp5biSKPG1AvPDDeh08UiPcTGTcxV37KAWXBgZQyJo8iwQBoLMpNs4siam?=
 =?us-ascii?Q?qzsRmFRQYcHjhKUZOtfRLpv5ie97MVmMq6hlTLMV9MmA0wpxBcIuxk0z4L7Z?=
 =?us-ascii?Q?MbHgW0d8WtOu8oEpKuwcgQnb1y4kRB8ARPjx9sJWc4d3E79Ua/WNu6VnA38G?=
 =?us-ascii?Q?VOjMxinisvmrmf5qAARg3nlcCH+OUa4zCKEg27q6dVh+LrzFKjGmT8fcm0JO?=
 =?us-ascii?Q?yw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	+Gk1BdfsQaSqaZi/Bb5bD+oF0JyCTiUlcMJxudXPMAfRbSvEtBsScMshZIUQDu7RB+8n50KOHCLuISG4bZOsVKCHwf2YAHq7yQkOgtyTmLXMVNPTupOcCvBKcnrzRNNNj6UB8DOxdtfF775VJVDmQFN4sFCC37PlCvgexRhwP+y39LwI/j2rXGPhsvZrEp8SCXdRr2jQpFiYtl+oXC2yEt9RwR0XFF7f5qHZEXUr3XyQrdeuf9+HXn6WQdgNfwVNFM9vmJj0JqQoY+9lR6krn2+KerYg3lzQUrXl3zIv1MEcLmWmO95zHoFN7JB7tBWmvUhDtbWYGHwluRONq7HvwdVuRgqckJHrPRS4oBNjAIDrM4hTepWktkBkxvn5lEMBYDwUoH62lJLAr/l+ztoY2WssO58Kl4RM5tGm2/rGcjsUaFVd7iJeJ5jMY2FZu1JRj6OqnhdEvMd1KGK9YtTgxJZhfeY3aWGtIktkN8gAnDJ/IjP6LFxkP6kWg2nuh7Le6k11A2nyBqvkC+nd4JOxsLu03KofEIXGhIjbj3hdl8pB2zRL2BjH9OZ0TafF7KShCwsrEsMzza5gJ307hSw0ixJAVr8CSlv1XUPrleAawqM=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c9fa83bb-1c78-499f-9955-08dc7eae28c8
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:36:05.4477
 (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: Ck3YrSaZD65n9QjOZdl8tsNaOGyFXxPV0djAAOCfhK+9szEXHYrirhTwz4BqIAHKW7KdTt8eJ+oiEJTYS9BRmso/6q0g3nCgc7DG/cJTAfQ=
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 mlxlogscore=999 spamscore=0
 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2405280003
X-Proofpoint-GUID: uOP2J1tWwx4LLgccY5Bo5yYUseXCkem_
X-Proofpoint-ORIG-GUID: uOP2J1tWwx4LLgccY5Bo5yYUseXCkem_

Pull out the PREEMPT_DYNAMIC setup logic to allow other preemption
models to dynamically configure preemption.

Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Ankur Arora <ankur.a.arora@oracle.com>
---
 kernel/sched/core.c | 165 +++++++++++++++++++++++---------------------
 1 file changed, 86 insertions(+), 79 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 0c26b60c1101..349f6257fdcd 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8713,6 +8713,89 @@ int __cond_resched_rwlock_write(rwlock_t *lock)
 }
 EXPORT_SYMBOL(__cond_resched_rwlock_write);
 
+#if defined(CONFIG_PREEMPT_DYNAMIC)
+
+#define PREEMPT_MODE "Dynamic Preempt"
+
+enum {
+	preempt_dynamic_undefined = -1,
+	preempt_dynamic_none,
+	preempt_dynamic_voluntary,
+	preempt_dynamic_full,
+};
+
+int preempt_dynamic_mode = preempt_dynamic_undefined;
+static DEFINE_MUTEX(sched_dynamic_mutex);
+
+int sched_dynamic_mode(const char *str)
+{
+	if (!strcmp(str, "none"))
+		return preempt_dynamic_none;
+
+	if (!strcmp(str, "voluntary"))
+		return preempt_dynamic_voluntary;
+
+	if (!strcmp(str, "full"))
+		return preempt_dynamic_full;
+
+	return -EINVAL;
+}
+
+static void __sched_dynamic_update(int mode);
+void sched_dynamic_update(int mode)
+{
+	mutex_lock(&sched_dynamic_mutex);
+	__sched_dynamic_update(mode);
+	mutex_unlock(&sched_dynamic_mutex);
+}
+
+static void __init preempt_dynamic_init(void)
+{
+	if (preempt_dynamic_mode == preempt_dynamic_undefined) {
+		if (IS_ENABLED(CONFIG_PREEMPT_NONE)) {
+			sched_dynamic_update(preempt_dynamic_none);
+		} else if (IS_ENABLED(CONFIG_PREEMPT_VOLUNTARY)) {
+			sched_dynamic_update(preempt_dynamic_voluntary);
+		} else {
+			/* Default static call setting, nothing to do */
+			WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPT));
+			preempt_dynamic_mode = preempt_dynamic_full;
+			pr_info("%s: full\n", PREEMPT_MODE);
+		}
+	}
+}
+
+static int __init setup_preempt_mode(char *str)
+{
+	int mode = sched_dynamic_mode(str);
+	if (mode < 0) {
+		pr_warn("%s: unsupported mode: %s\n", PREEMPT_MODE, str);
+		return 0;
+	}
+
+	sched_dynamic_update(mode);
+	return 1;
+}
+__setup("preempt=", setup_preempt_mode);
+
+#define PREEMPT_MODEL_ACCESSOR(mode) \
+	bool preempt_model_##mode(void)						 \
+	{									 \
+		WARN_ON_ONCE(preempt_dynamic_mode == preempt_dynamic_undefined); \
+		return preempt_dynamic_mode == preempt_dynamic_##mode;		 \
+	}									 \
+	EXPORT_SYMBOL_GPL(preempt_model_##mode)
+
+PREEMPT_MODEL_ACCESSOR(none);
+PREEMPT_MODEL_ACCESSOR(voluntary);
+PREEMPT_MODEL_ACCESSOR(full);
+
+#else /* !CONFIG_PREEMPT_DYNAMIC */
+
+static inline void preempt_dynamic_init(void) { }
+
+#endif /* !CONFIG_PREEMPT_DYNAMIC */
+
 #ifdef CONFIG_PREEMPT_DYNAMIC
 
 #ifdef CONFIG_GENERIC_ENTRY
@@ -8749,29 +8832,6 @@ EXPORT_SYMBOL(__cond_resched_rwlock_write);
  *   irqentry_exit_cond_resched <- irqentry_exit_cond_resched
  */
 
-enum {
-	preempt_dynamic_undefined = -1,
-	preempt_dynamic_none,
-	preempt_dynamic_voluntary,
-	preempt_dynamic_full,
-};
-
-int preempt_dynamic_mode = preempt_dynamic_undefined;
-
-int sched_dynamic_mode(const char *str)
-{
-	if (!strcmp(str, "none"))
-		return preempt_dynamic_none;
-
-	if (!strcmp(str, "voluntary"))
-		return preempt_dynamic_voluntary;
-
-	if (!strcmp(str, "full"))
-		return preempt_dynamic_full;
-
-	return -EINVAL;
-}
-
 #if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)
 #define preempt_dynamic_enable(f)	static_call_update(f, f##_dynamic_enabled)
 #define preempt_dynamic_disable(f)	static_call_update(f, f##_dynamic_disabled)
@@ -8782,7 +8842,6 @@ int sched_dynamic_mode(const char *str)
 #error "Unsupported PREEMPT_DYNAMIC mechanism"
 #endif
 
-static DEFINE_MUTEX(sched_dynamic_mutex);
 static bool klp_override;
 
 static void __sched_dynamic_update(int mode)
@@ -8807,7 +8866,7 @@ static void __sched_dynamic_update(int mode)
 		preempt_dynamic_disable(preempt_schedule_notrace);
 		preempt_dynamic_disable(irqentry_exit_cond_resched);
 		if (mode != preempt_dynamic_mode)
-			pr_info("Dynamic Preempt: none\n");
+			pr_info("%s: none\n", PREEMPT_MODE);
 		break;
 
 	case preempt_dynamic_voluntary:
@@ -8818,7 +8877,7 @@ static void __sched_dynamic_update(int mode)
 		preempt_dynamic_disable(preempt_schedule_notrace);
 		preempt_dynamic_disable(irqentry_exit_cond_resched);
 		if (mode != preempt_dynamic_mode)
-			pr_info("Dynamic Preempt: voluntary\n");
+			pr_info("%s: voluntary\n", PREEMPT_MODE);
 		break;
 
 	case preempt_dynamic_full:
@@ -8829,20 +8888,13 @@ static void __sched_dynamic_update(int mode)
 		preempt_dynamic_enable(preempt_schedule_notrace);
 		preempt_dynamic_enable(irqentry_exit_cond_resched);
 		if (mode != preempt_dynamic_mode)
-			pr_info("Dynamic Preempt: full\n");
+			pr_info("%s: full\n", PREEMPT_MODE);
 		break;
 	}
 
 	preempt_dynamic_mode = mode;
 }
 
-void sched_dynamic_update(int mode)
-{
-	mutex_lock(&sched_dynamic_mutex);
-	__sched_dynamic_update(mode);
-	mutex_unlock(&sched_dynamic_mutex);
-}
-
 #ifdef CONFIG_HAVE_PREEMPT_DYNAMIC_CALL
 
 static int klp_cond_resched(void)
@@ -8873,51 +8925,6 @@ void sched_dynamic_klp_disable(void)
 
 #endif /* CONFIG_HAVE_PREEMPT_DYNAMIC_CALL */
 
-static int __init setup_preempt_mode(char *str)
-{
-	int mode = sched_dynamic_mode(str);
-	if (mode < 0) {
-		pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);
-		return 0;
-	}
-
-	sched_dynamic_update(mode);
-	return 1;
-}
-__setup("preempt=", setup_preempt_mode);
-
-static void __init preempt_dynamic_init(void)
-{
-	if (preempt_dynamic_mode == preempt_dynamic_undefined) {
-		if (IS_ENABLED(CONFIG_PREEMPT_NONE)) {
-			sched_dynamic_update(preempt_dynamic_none);
-		} else if (IS_ENABLED(CONFIG_PREEMPT_VOLUNTARY)) {
-			sched_dynamic_update(preempt_dynamic_voluntary);
-		} else {
-			/* Default static call setting, nothing to do */
-			WARN_ON_ONCE(!IS_ENABLED(CONFIG_PREEMPT));
-			preempt_dynamic_mode = preempt_dynamic_full;
-			pr_info("Dynamic Preempt: full\n");
-		}
-	}
-}
-
-#define PREEMPT_MODEL_ACCESSOR(mode) \
-	bool preempt_model_##mode(void)						 \
-	{									 \
-		WARN_ON_ONCE(preempt_dynamic_mode == preempt_dynamic_undefined); \
-		return preempt_dynamic_mode == preempt_dynamic_##mode;		 \
-	}									 \
-	EXPORT_SYMBOL_GPL(preempt_model_##mode)
-
-PREEMPT_MODEL_ACCESSOR(none);
-PREEMPT_MODEL_ACCESSOR(voluntary);
-PREEMPT_MODEL_ACCESSOR(full);
-
-#else /* !CONFIG_PREEMPT_DYNAMIC */
-
-static inline void preempt_dynamic_init(void) { }
-
 #endif /* #ifdef CONFIG_PREEMPT_DYNAMIC */
 
 /**
-- 
2.31.1