[RFC,04/86] Revert "preempt/dynamic: Introduce preemption model accessors"

Commit Message

Ankur Arora Nov. 7, 2023, 9:56 p.m. UTC

This reverts commit cfe43f478b79ba45573ca22d52d0d8823be068fa.

Signed-off-by: Ankur Arora <[e-mail]>
---
 include/linux/sched.h | 41 -----------------------------------------
 kernel/sched/core.c   | 12 ------------
 2 files changed, 53 deletions(-)

Comments

Steven Rostedt Nov. 7, 2023, 11:12 p.m. UTC | #1

On Tue,  7 Nov 2023 13:56:50 -0800
Ankur Arora <[e-mail]> wrote:

I know this is an RFC but I'll state it here just so that it is stated. All
reverts need a change log description to why a revert happened, even if you
are just cut and pasting the reason for every commit. That's because git
commits need to be stand alone and not depend on information in other git
commit change logs.

-- Steve


> This reverts commit cfe43f478b79ba45573ca22d52d0d8823be068fa.
> 
> Signed-off-by: Ankur Arora <[e-mail]>
> ---
>  include/linux/sched.h | 41 -----------------------------------------
>  kernel/sched/core.c   | 12 ------------
>  2 files changed, 53 deletions(-)
>

Ankur Arora Nov. 8, 2023, 4:59 a.m. UTC | #2

Steven Rostedt <[e-mail]> writes:

> On Tue,  7 Nov 2023 13:56:50 -0800
> Ankur Arora <[e-mail]> wrote:
>
> I know this is an RFC but I'll state it here just so that it is stated. All
> reverts need a change log description to why a revert happened, even if you
> are just cut and pasting the reason for every commit. That's because git
> commits need to be stand alone and not depend on information in other git
> commit change logs.

Ack. I will also take your suggestion in the other email and remove the
relevant code instead. Reverting is clearly the wrong mechanism for this.

And thanks for helping me with all of the process related issues.
Appreciate it.

--
ankur

Patch

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 77f01ac385f7..5bdf80136e42 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2178,47 +2178,6 @@  static inline void cond_resched_rcu(void)
 #endif
 }
 
-#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();
-}
-
 /*
  * Does a critical section need to be broken due to another
  * task waiting?: (technically does not depend on CONFIG_PREEMPTION,
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ab773ea2cb34..0e8764d63041 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8866,18 +8866,6 @@  static void __init preempt_dynamic_init(void)
 	}
 }
 
-#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) { }