Received-SPF: pass (google.com: domain of linux-kernel+bounces-191559-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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 13/35] sched: allow runtime config for PREEMPT_AUTO
Date: Mon, 27 May 2024 17:34:59 -0700
Message-Id: <20240528003521.979836-14-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?kzZRHq1rKStpqokafVzdzUWsvIsk5MWzHEWbATs/u/Koo13Tzq/vmJKcj7o7?=
 =?us-ascii?Q?VrtnC476UpTghitQD6/hieGZbdnLXdbJ7SM0ioO41cxgewRQ54ULw31HL3dQ?=
 =?us-ascii?Q?OKNoDps53w+cPOFIte9Qt9jA0HkSPiFz8Y8CkQkcbHKF7FzXV3fz2j4PPKks?=
 =?us-ascii?Q?rZUMC/k7XK4E5rzqzrQ9j48xlqGd7EJRwshNScJl+sVrKskUefE0Ny6GwJ4+?=
 =?us-ascii?Q?sCv++5hjOpuv+DmHRgocfJSlTYYVy3t78gNrHI+YnMCWQRkUGur0nTUfRDCn?=
 =?us-ascii?Q?BXSQyuajHeofGFghn5HJu4Ze33seTzTn8AIXU8CrlC2bD5zGrlqIisHTIlQt?=
 =?us-ascii?Q?HPRfx8pDGibtZYSORJPB8AL79v+CzqI5cYqypjyzg9q5OHOT7ghwVU7E5KqZ?=
 =?us-ascii?Q?cBuTaOIz0UY+SxmnkQqvUsfL7Is0Q3c+usIGnoh3SpHoiC3i24e5dQw8FY53?=
 =?us-ascii?Q?zhCWeAikscrxmo8/btAVGXWM6k2PzQ1dKaOf760fbKxXoyUEk4sgh9Ih9bdY?=
 =?us-ascii?Q?psKavL02/96Xii4jjkqHeLVE3tT1wBu1eGhxtYe7CgcUqJhIhqhxg78+hRBy?=
 =?us-ascii?Q?TA14jP4YR3FlZZ54xH3nUejY03rBMmdn3ibejGOSKL2rHaIpOByw6XTwsAta?=
 =?us-ascii?Q?O1Ug8tFdfu1sUGE0nVtuj99MS3N0RRzWWDCWyR5FKtPcqcGPSq0A30uT1Djt?=
 =?us-ascii?Q?mjF8VpJe+nevNqKZOJaR9ugqKGoXIgHYoQm13ateo3WekbmdT8mILVdw/aqH?=
 =?us-ascii?Q?BvyHYxmO4kUxI3uiUHK7PdfkQ61x8Oln5wdr6DO5COhcb+agcU8Q2Bjvt8du?=
 =?us-ascii?Q?FfCk5sa3Ai/B8a2cUTmjq7N1IfwcrxarE7MP8yqbmb2uFFnCRh5/5TtFxFPW?=
 =?us-ascii?Q?LLCxHAmy1VRHyddIoMsKyr9/8VZ0xVrc2iP0sd5cB68boWEAOvoJrHrG4N5a?=
 =?us-ascii?Q?akwtNeseXBjEU4jRYDVuu6l5u55Smw9jZnzUJSgGHGLkNqCBKJCuFKA54luj?=
 =?us-ascii?Q?99J75r4toHdrp7Z/oM6bGpNP/IApV4dW5m03/9pDnS58JyIs6g0+N2pPkZ24?=
 =?us-ascii?Q?VdKWcFdPDXqyJRUH4o2fK7JV6VFk8UV2fLOff7SpGMoDecEf45kJHw1iouYE?=
 =?us-ascii?Q?p1FkInqV50Qoo5LcVg5tMu6nslx/GgELsWES0EeODrny17P2wlh1tX34/Hkd?=
 =?us-ascii?Q?jzqtfyBDAKe9e7Y0jAuOhK+eUQkKATvEwL6ftQ+fdM9DwgSi5tRs9zjdRbIB?=
 =?us-ascii?Q?qhlIdWd2mcAZo6ssKKN3B47gOZqb5/fdMnrmYpZyJG5lXS3iOze8rv1eKu2s?=
 =?us-ascii?Q?pW6g6+n3wHVKhVK45fuc0rgsLiIQVSTtACmewyKqiHB8AguxW70pknUPwDuW?=
 =?us-ascii?Q?UZtaKCiBRUvh56g207/zwHaSZEtoBE4KTeNmDMjg6Zmsl3pw/lecv5a5zC3n?=
 =?us-ascii?Q?px0c1pD+vSv0Lm5k96GB4CtxqimAUq5Ti9uGEmFWWmNApnaKFw0RLRhrs2hf?=
 =?us-ascii?Q?dQwE7gcA6/nt0e4Cg6bWbr9MlzkFn/slDVn/FzOoKt7M5aKVCvAxwu0KcZpl?=
 =?us-ascii?Q?MKmb46vTza9pTtlgJWK3VEvGqwv8epdUXoQ7T1Aqh+FOsizqlvSxx1FmFRS9?=
 =?us-ascii?Q?yg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	K56weSQb7N+wiIEofK98AG7B19OiHnqtyhUrgkfXlWWQKxwnbtYP5xEJLLGte4D6Jluv7HJwvj3DyJ63+4PYF8kueF66El4v15U2ywyjFy0E/ZFsZUpqqx03VGFdHGMvNY5qKBeRsOVzcoyttAaT3BuBCn5OiRQuuMcBkEixJ1VZ3TzcjTYVaEesP5zzzctrcE0DQgxQNLJ+NhhiTB6HGoB3dMIWOUEaPEfqPWCIlt7ppP2evku2I+8MKI9q60bEGCIM30eq0NVOZNw7uQoGj3CkQGPDW9FAvAAWIjLjuWUv9a1AqkdMES/iRa2TawAND9ynOGX+8fkF7IUzmenwKlBvJn3UWYiQJ9duYwKsYccwxfleQkSTyITZZzIWatvescfJ8F3+gTkMFb9eyZDKCQG6r/xQQ1I2Y7Ylc1cfZ5hikUHfzlZd39fMA0ca53D1KgViypqfoAHPqbeoPqsTNJ627LdRFWlp/ZRzo/LAGmF5Lst4nfjIKMetm6W/BUjeCviZDBTI01D3Qmp+QsPA+MxpASypV78WSLXHDW3pff4voNwFjIrDPmGNDVK28hBWl3QWUeBNG4s2H0I98BzYILAb38vjvug9q2CnOgmPjVs=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7d00aae1-c204-4b6d-65a7-08dc7eae29d6
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:07.2397
 (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: 4X80sMRT2/zshg1KNS53hmDs1nu6M3W8+fLTPkJKwYxN2uDjt8nfbLCOU6hHtxm5Bj7RNoOg5a11zBMqPnI3IgDSsUZ4oVXHeBdav76+C+8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB7177
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: rZoeRqIuWdDNU5XlM7OSNSEjdQ3SA93A
X-Proofpoint-ORIG-GUID: rZoeRqIuWdDNU5XlM7OSNSEjdQ3SA93A

Reuse sched_dynamic_update() and related logic to enable choosing
the preemption model at boot or runtime for PREEMPT_AUTO.

The interface is identical to PREEMPT_DYNAMIC.

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>

Changelog:
  change title
---
 include/linux/preempt.h |  2 +-
 kernel/sched/core.c     | 31 +++++++++++++++++++++++++++----
 kernel/sched/debug.c    |  6 +++---
 kernel/sched/sched.h    |  2 +-
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index d453f5e34390..d4f568606eda 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -481,7 +481,7 @@ 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
+#if defined(CONFIG_PREEMPT_DYNAMIC) || defined(CONFIG_PREEMPT_AUTO)
 
 extern bool preempt_model_none(void);
 extern bool preempt_model_voluntary(void);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 349f6257fdcd..d7804e29182d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8713,9 +8713,13 @@ int __cond_resched_rwlock_write(rwlock_t *lock)
 }
 EXPORT_SYMBOL(__cond_resched_rwlock_write);
 
-#if defined(CONFIG_PREEMPT_DYNAMIC)
+#if defined(CONFIG_PREEMPT_DYNAMIC) || defined(CONFIG_PREEMPT_AUTO)
 
+#ifdef CONFIG_PREEMPT_DYNAMIC
 #define PREEMPT_MODE "Dynamic Preempt"
+#else
+#define PREEMPT_MODE "Preempt Auto"
+#endif
 
 enum {
 	preempt_dynamic_undefined = -1,
@@ -8790,11 +8794,11 @@ PREEMPT_MODEL_ACCESSOR(none);
 PREEMPT_MODEL_ACCESSOR(voluntary);
 PREEMPT_MODEL_ACCESSOR(full);
 
-#else /* !CONFIG_PREEMPT_DYNAMIC */
+#else /* !CONFIG_PREEMPT_DYNAMIC && !CONFIG_PREEMPT_AUTO */
 
 static inline void preempt_dynamic_init(void) { }
 
-#endif /* !CONFIG_PREEMPT_DYNAMIC */
+#endif /* !CONFIG_PREEMPT_DYNAMIC && !CONFIG_PREEMPT_AUTO */
 
 #ifdef CONFIG_PREEMPT_DYNAMIC
 
@@ -8925,7 +8929,26 @@ void sched_dynamic_klp_disable(void)
 
 #endif /* CONFIG_HAVE_PREEMPT_DYNAMIC_CALL */
 
-#endif /* #ifdef CONFIG_PREEMPT_DYNAMIC */
+#elif defined(CONFIG_PREEMPT_AUTO)
+
+static void __sched_dynamic_update(int mode)
+{
+	switch (mode) {
+	case preempt_dynamic_none:
+		preempt_dynamic_mode = preempt_dynamic_undefined;
+		break;
+
+	case preempt_dynamic_voluntary:
+		preempt_dynamic_mode = preempt_dynamic_undefined;
+		break;
+
+	case preempt_dynamic_full:
+		preempt_dynamic_mode = preempt_dynamic_undefined;
+		break;
+	}
+}
+
+#endif /* CONFIG_PREEMPT_AUTO */
 
 /**
  * yield - yield the current processor to other threads.
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 8d5d98a5834d..e53f1b73bf4a 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -216,7 +216,7 @@ static const struct file_operations sched_scaling_fops = {
 
 #endif /* SMP */
 
-#ifdef CONFIG_PREEMPT_DYNAMIC
+#if defined(CONFIG_PREEMPT_DYNAMIC) || defined(CONFIG_PREEMPT_AUTO)
 
 static ssize_t sched_dynamic_write(struct file *filp, const char __user *ubuf,
 				   size_t cnt, loff_t *ppos)
@@ -276,7 +276,7 @@ static const struct file_operations sched_dynamic_fops = {
 	.release	= single_release,
 };
 
-#endif /* CONFIG_PREEMPT_DYNAMIC */
+#endif /* CONFIG_PREEMPT_DYNAMIC || CONFIG_PREEMPT_AUTO */
 
 __read_mostly bool sched_debug_verbose;
 
@@ -343,7 +343,7 @@ static __init int sched_init_debug(void)
 
 	debugfs_create_file("features", 0644, debugfs_sched, NULL, &sched_feat_fops);
 	debugfs_create_file_unsafe("verbose", 0644, debugfs_sched, &sched_debug_verbose, &sched_verbose_fops);
-#ifdef CONFIG_PREEMPT_DYNAMIC
+#if defined(CONFIG_PREEMPT_DYNAMIC) || defined(CONFIG_PREEMPT_AUTO)
 	debugfs_create_file("preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops);
 #endif
 
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index ae50f212775e..c9239c0b0095 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -3231,7 +3231,7 @@ extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *w
 
 extern int try_to_wake_up(struct task_struct *tsk, unsigned int state, int wake_flags);
 
-#ifdef CONFIG_PREEMPT_DYNAMIC
+#if defined(CONFIG_PREEMPT_DYNAMIC) || defined(CONFIG_PREEMPT_AUTO)
 extern int preempt_dynamic_mode;
 extern int sched_dynamic_mode(const char *str);
 extern void sched_dynamic_update(int mode);
-- 
2.31.1