sched: Provide migrate_disable/enable() inlines
Code which solely needs to prevent migration of a task uses preempt_disable()/enable() pairs. This is the only reliable way to do so as setting the task affinity to a single CPU can be undone by a setaffinity operation from a different task/process.
RT provides a seperate migrate_disable/enable() mechanism which does not disable preemption to achieve the semantic requirements of a (almost) fully preemptible kernel.
As it is unclear from looking at a given code path whether the intention is to disable preemption or migration, introduce migrate_disable/enable() inline functions which can be used to annotate code which merely needs to disable migration. Map them to preempt_disable/enable() for now. The RT substitution will be provided later.
Code which is annotated that way documents that it has no requirement to protect against reentrancy of a preempting task. Either this is not required at all or the call sites are already serialized by other means.
--- include/linux/preempt.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
include/linux/preempt.h +30 -0
@@ -322,4 +322,34 @@ static inline void preempt_notifier_init#endif +/** +* migrate_disable - Prevent migration of the current task +* +* Maps to preempt_disable() which also disables preemption. Use +* migrate_disable() to annotate that the intent is to prevent migration +* but not necessarily preemption. +* +* Can be invoked nested like preempt_disable() and needs the corresponding +* number of migrate_enable() invocations. +*/ +static __always_inline void migrate_disable(void) +{ +preempt_disable (); +} + +/** +* migrate_enable - Allow migration of the current task +* +* Counterpart to migrate_disable(). +* +* As migrate_disable() can be invoked nested only the uttermost invocation +* reenables migration. +* +* Currently mapped to preempt_enable(). +*/ +static __always_inline void migrate_enable(void) +{ +preempt_enable (); +} +#endif /* __LINUX_PREEMPT_H */
Quoted 57 lines · Thomas Gleixner
Code which solely needs to prevent migration of a task uses preempt_disable()/enable() pairs. This is the only reliable way to do so as setting the task affinity to a single CPU can be undone by a setaffinity operation from a different task/process.
RT provides a seperate migrate_disable/enable() mechanism which does not disable preemption to achieve the semantic requirements of a (almost) fully preemptible kernel.
As it is unclear from looking at a given code path whether the intention is to disable preemption or migration, introduce migrate_disable/enable() inline functions which can be used to annotate code which merely needs to disable migration. Map them to preempt_disable/enable() for now. The RT substitution will be provided later.
Code which is annotated that way documents that it has no requirement to protect against reentrancy of a preempting task. Either this is not required at all or the call sites are already serialized by other means.
Signed-off-by Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Juri Lelli <[email protected]>Cc Vincent Guittot <[email protected]>Cc Dietmar Eggemann <[email protected]>Cc Steven Rostedt <[email protected]>Cc Ben Segall <[email protected]>Cc Mel Gorman <[email protected]>--- include/linux/preempt.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)include/linux/preempt.h +19
-0@@ -322,4 +322,34 @@ static inline void preempt_notifier_init#endif +/** +* migrate_disable - Prevent migration of the current task +* +* Maps to preempt_disable() which also disables preemption. Use +* migrate_disable() to annotate that the intent is to prevent migration +* but not necessarily preemption. +* +* Can be invoked nested like preempt_disable() and needs the corresponding +* number of migrate_enable() invocations. +*/ +static __always_inline void migrate_disable(void) +{ +preempt_disable (); +} + +/** +* migrate_enable - Allow migration of the current task +* +* Counterpart to migrate_disable().
include/linux/preempt.h static inline void preempt_notifier_init · line 353
Quoted 10 lines
include/linux/preempt.h +10
-0+* +* As migrate_disable() can be invoked nested only the uttermost invocation +* reenables migration. +* +* Currently mapped to preempt_enable(). +*/ +static __always_inline void migrate_enable(void) +{ +preempt_enable (); +}
I've applied this with s/uttermost/outermost, which I suspect was the intention?
Thanks,
Ingo
[tip: sched/core] sched/rt: Provide migrate_disable/enable() inlines
In reply to Thomas GleixnerThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 9fe65747dbacf0c9fcf12350c3afb5fcf7e78534 Gitweb: https://git.kernel.org/tip/9fe65747dbacf0c9fcf12350c3afb5fcf7e78534 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 08 Feb 2020 20:48:29 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Sun, 09 Feb 2020 20:07:41 +01:00
sched/rt: Provide migrate_disable/enable() inlines
Code which solely needs to prevent migration of a task uses preempt_disable()/enable() pairs. This is the only reliable way to do so as setting the task affinity to a single CPU can be undone by a setaffinity operation from a different task/process.
RT provides a seperate migrate_disable/enable() mechanism which does not disable preemption to achieve the semantic requirements of a (almost) fully preemptible kernel.
As it is unclear from looking at a given code path whether the intention is to disable preemption or migration, introduce migrate_disable/enable() inline functions which can be used to annotate code which merely needs to disable migration. Map them to preempt_disable/enable() for now. The RT substitution will be provided later.
Code which is annotated that way documents that it has no requirement to protect against reentrancy of a preempting task. Either this is not required at all or the call sites are already serialized by other means.
--- include/linux/preempt.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
include/linux/preempt.h +30 -0
@@ -322,4 +322,34 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,#endif +/** +* migrate_disable - Prevent migration of the current task +* +* Maps to preempt_disable() which also disables preemption. Use +* migrate_disable() to annotate that the intent is to prevent migration, +* but not necessarily preemption. +* +* Can be invoked nested like preempt_disable() and needs the corresponding +* number of migrate_enable() invocations. +*/ +static __always_inline void migrate_disable(void) +{ +preempt_disable (); +} + +/** +* migrate_enable - Allow migration of the current task +* +* Counterpart to migrate_disable(). +* +* As migrate_disable() can be invoked nested, only the outermost invocation +* reenables migration. +* +* Currently mapped to preempt_enable(). +*/ +static __always_inline void migrate_enable(void) +{ +preempt_enable (); +} +#endif /* __LINUX_PREEMPT_H */
[tip: sched/rt] sched/rt: Provide migrate_disable/enable() inlines
In reply to Thomas GleixnerThe following commit has been merged into the sched/rt branch of tip:
The following commit has been merged into the sched/rt branch of tip:
Commit-ID: 66630058e56b26b3a9cf2625e250a8c592dd0207 Gitweb: https://git.kernel.org/tip/66630058e56b26b3a9cf2625e250a8c592dd0207 Author: Thomas Gleixner <[email protected]> AuthorDate: Sat, 08 Feb 2020 20:48:29 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 20 Feb 2020 21:17:24 +01:00
sched/rt: Provide migrate_disable/enable() inlines
Code which solely needs to prevent migration of a task uses preempt_disable()/enable() pairs. This is the only reliable way to do so as setting the task affinity to a single CPU can be undone by a setaffinity operation from a different task/process.
RT provides a seperate migrate_disable/enable() mechanism which does not disable preemption to achieve the semantic requirements of a (almost) fully preemptible kernel.
As it is unclear from looking at a given code path whether the intention is to disable preemption or migration, introduce migrate_disable/enable() inline functions which can be used to annotate code which merely needs to disable migration. Map them to preempt_disable/enable() for now. The RT substitution will be provided later.
Code which is annotated that way documents that it has no requirement to protect against reentrancy of a preempting task. Either this is not required at all or the call sites are already serialized by other means.
--- include/linux/preempt.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
include/linux/preempt.h +30 -0
@@ -322,4 +322,34 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier,#endif +/** +* migrate_disable - Prevent migration of the current task +* +* Maps to preempt_disable() which also disables preemption. Use +* migrate_disable() to annotate that the intent is to prevent migration, +* but not necessarily preemption. +* +* Can be invoked nested like preempt_disable() and needs the corresponding +* number of migrate_enable() invocations. +*/ +static __always_inline void migrate_disable(void) +{ +preempt_disable (); +} + +/** +* migrate_enable - Allow migration of the current task +* +* Counterpart to migrate_disable(). +* +* As migrate_disable() can be invoked nested, only the outermost invocation +* reenables migration. +* +* Currently mapped to preempt_enable(). +*/ +static __always_inline void migrate_enable(void) +{ +preempt_enable (); +} +#endif /* __LINUX_PREEMPT_H */