Disable sched_numa_balancing on uma systems
v2 cover Disable sched_numa_balancing on uma systems
With recent commit 2a1ed24 ("sched/numa: Prefer NUMA hotness over cache hotness") sets sched feature NUMA to true. This can enable numa hinting faults on a uma system.
This patchset ensures that numa hinting faults occur only on a numa system by setting/resetting sched_numa_balancing.
This patchset
- Renames numabalancing_enabled to sched_numa_balancing
- Makes sched_numa_balancing common to CONFIG_SCHED_DEBUG and !CONFIG_SCHED_DEBUG. Earlier it was only in !CONFIG_SCHED_DEBUG
- Checks for sched_numa_balancing instead of sched_feat(NUMA)
- Removes NUMA sched feature
Srikar Dronamraju (3):
sched/numa: Rename numabalancing_enabled to sched_numa_balancing sched/numa: Disable sched_numa_balancing on uma systems sched/numa: Remove NUMA sched feature
kernel/sched/core.c | 16 +++------------- kernel/sched/fair.c | 8 ++++---- kernel/sched/features.h | 16 ---------------- kernel/sched/sched.h | 10 ++-------- 4 files changed, 9 insertions(+), 41 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/3 sched/numa: Rename numabalancing_enabled to sched_numa_balancing
Simple rename of numabalancing_enabled variable to sched_numa_balancing. No functional changes.
--- kernel/sched/core.c | 6 +++--- kernel/sched/fair.c | 4 ++-- kernel/sched/sched.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
kernel/sched/core.c +3 -3
@@ -2067,11 +2067,11 @@ void set_numabalancing_state(bool enabled) sched_feat_set("NO_NUMA"); }#else -__read_mostly bool numabalancing_enabled; +__read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { - numabalancing_enabled = enabled; + sched_numa_balancing = enabled; }#endif /* CONFIG_SCHED_DEBUG */
@@ -2081,7 +2081,7 @@ int sysctl_numa_balancing(struct ctl_table *table, int write, {struct ctl_table t;int err; -int state = numabalancing_enabled; +int state = sched_numa_balancing;if (write && !capable (CAP_SYS_ADMIN ))return -EPERM ;
kernel/sched/fair.c +2 -2
@@ -2069,7 +2069,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)int local = !!(flags &TNF_FAULT_LOCAL );int priv; -if (!numabalancing_enabled) +if (!sched_numa_balancing)return ;/* for example, ksmd faulting in a user's mm */
@@ -7810,7 +7810,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)entity_tick (cfs_rq, se, queued); } -if (numabalancing_enabled) +if (sched_numa_balancing)task_tick_numa (rq, curr); }
kernel/sched/sched.h +3 -3
@@ -1006,13 +1006,13 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#ifdef CONFIG_NUMA_BALANCING #define sched_feat_numa (x) sched_feat(x)#ifdef CONFIG_SCHED_DEBUG -#define numabalancing_enabled sched_feat_numa(NUMA) +#define sched_numa_balancing sched_feat_numa(NUMA)#else -extern bool numabalancing_enabled; +extern bool sched_numa_balancing;#endif /* CONFIG_SCHED_DEBUG */ #else #define sched_feat_numa (x) (0) -#define numabalancing_enabled (0) +#define sched_numa_balancing (0)#endif /* CONFIG_NUMA_BALANCING */ static inline u64 global_rt_period (void )
Signature · 1 line
1.8.3.1
tip-bot for Srikar Dronamraju
merge bot[tip:sched/core] sched/numa: Rename numabalancing_enabled to sched_numa_balancing
sched/numa: Rename numabalancing_enabled to sched_numa_balancing
Commit-ID: 78a9c54649ea220065aad9902460a1d137c7eafd Gitweb: http://git.kernel.org/tip/78a9c54649ea220065aad9902460a1d137c7eafd Author: Srikar Dronamraju <[email protected]> AuthorDate: Tue, 11 Aug 2015 16:30:11 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 13 Sep 2015 09:52:52 +0200
sched/numa: Rename numabalancing_enabled to sched_numa_balancing
Simple rename of the 'numabalancing_enabled' variable to 'sched_numa_balancing'. No functional changes.
--- kernel/sched/core.c | 6 +++--- kernel/sched/fair.c | 4 ++-- kernel/sched/sched.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
kernel/sched/core.c +3 -3
@@ -2124,11 +2124,11 @@ void set_numabalancing_state(bool enabled) sched_feat_set("NO_NUMA"); }#else -__read_mostly bool numabalancing_enabled; +__read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { - numabalancing_enabled = enabled; + sched_numa_balancing = enabled; }#endif /* CONFIG_SCHED_DEBUG */
@@ -2138,7 +2138,7 @@ int sysctl_numa_balancing(struct ctl_table *table, int write, {struct ctl_table t;int err; -int state = numabalancing_enabled; +int state = sched_numa_balancing;if (write && !capable (CAP_SYS_ADMIN ))return -EPERM ;
kernel/sched/fair.c +2 -2
@@ -2069,7 +2069,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)int local = !!(flags &TNF_FAULT_LOCAL );int priv; -if (!numabalancing_enabled) +if (!sched_numa_balancing)return ;/* for example, ksmd faulting in a user's mm */
@@ -7874,7 +7874,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)entity_tick (cfs_rq, se, queued); } -if (numabalancing_enabled) +if (sched_numa_balancing)task_tick_numa (rq, curr); }
kernel/sched/sched.h +3 -3
@@ -1006,13 +1006,13 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#ifdef CONFIG_NUMA_BALANCING #define sched_feat_numa (x) sched_feat(x)#ifdef CONFIG_SCHED_DEBUG -#define numabalancing_enabled sched_feat_numa(NUMA) +#define sched_numa_balancing sched_feat_numa(NUMA)#else -extern bool numabalancing_enabled; +extern bool sched_numa_balancing;#endif /* CONFIG_SCHED_DEBUG */ #else #define sched_feat_numa (x) (0) -#define numabalancing_enabled (0) +#define sched_numa_balancing (0)#endif /* CONFIG_NUMA_BALANCING */ static inline u64 global_rt_period (void )
PATCH v2 2/3 sched/numa: Disable sched_numa_balancing on uma systems
In reply to Srikar DronamrajuCommit 2a1ed24 ("sched/numa: Prefer NUMA hotness over cache hotness") sets sched feature NUMA to true. However this can enable numa hinting faults on a uma system.
This commit ensures that numa hinting faults occur only on a numa system by setting/resetting sched_numa_balancing.
This commit
- Makes sched_numa_balancing common to CONFIG_SCHED_DEBUG and !CONFIG_SCHED_DEBUG. Earlier it was only in !CONFIG_SCHED_DEBUG
- Checks for sched_numa_balancing instead of sched_feat(NUMA)
--- kernel/sched/core.c | 14 +++++--------- kernel/sched/fair.c | 4 ++-- kernel/sched/sched.h | 6 ------ 3 files changed, 7 insertions(+), 17 deletions(-)
kernel/sched/core.c +5 -9
@@ -2058,22 +2058,18 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) }#ifdef CONFIG_NUMA_BALANCING -#ifdef CONFIG_SCHED_DEBUG +__read_mostly bool sched_numa_balancing; +void set_numabalancing_state (bool enabled) { + sched_numa_balancing = enabled; +#ifdef CONFIG_SCHED_DEBUG if (enabled)sched_feat_set ("NUMA" );else sched_feat_set ("NO_NUMA" ); -} -#else -__read_mostly bool sched_numa_balancing; - -void set_numabalancing_state (bool enabled) -{ - sched_numa_balancing = enabled; -}#endif /* CONFIG_SCHED_DEBUG */ +}#ifdef CONFIG_PROC_SYSCTL int sysctl_numa_balancing(struct ctl_table *table, int write,
kernel/sched/fair.c +2 -2
@@ -5524,10 +5524,10 @@ static int migrate_degrades_locality(struct task_struct *p, struct lb_env *env)unsigned long src_faults, dst_faults;int src_nid, dst_nid; -if (!p->numa_faults || !(env->sd->flags &SD_NUMA )) +if (!sched_numa_balancing)return -1 ; -if (!sched_feat (NUMA )) +if (!p->numa_faults || !(env->sd->flags &SD_NUMA ))return -1 ; src_nid =cpu_to_node (env->src_cpu);
kernel/sched/sched.h +0 -6
@@ -1004,14 +1004,8 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */ #ifdef CONFIG_NUMA_BALANCING -#define sched_feat_numa (x) sched_feat(x) -#ifdef CONFIG_SCHED_DEBUG -#define sched_numa_balancing sched_feat_numa(NUMA) -#else extern bool sched_numa_balancing; -#endif /* CONFIG_SCHED_DEBUG */ #else -#define sched_feat_numa (x) (0)#define sched_numa_balancing (0)#endif /* CONFIG_NUMA_BALANCING */
Signature · 1 line
1.8.3.1
tip-bot for Srikar Dronamraju
merge bot[tip:sched/core] sched/numa: Disable sched_numa_balancing on UMA systems
sched/numa: Disable sched_numa_balancing on UMA systems
Commit-ID: c3b9bc5bbfc3750570d788afffd431263ef695c6 Gitweb: http://git.kernel.org/tip/c3b9bc5bbfc3750570d788afffd431263ef695c6 Author: Srikar Dronamraju <[email protected]> AuthorDate: Tue, 11 Aug 2015 16:30:12 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 13 Sep 2015 09:52:53 +0200
sched/numa: Disable sched_numa_balancing on UMA systems
Commit 2a1ed24 ("sched/numa: Prefer NUMA hotness over cache hotness") sets sched feature NUMA to true. However this can enable NUMA hinting faults on a UMA system.
This commit ensures that NUMA hinting faults occur only on a NUMA system by setting/resetting sched_numa_balancing.
This commit:
- Makes sched_numa_balancing common to CONFIG_SCHED_DEBUG and !CONFIG_SCHED_DEBUG. Earlier it was only in !CONFIG_SCHED_DEBUG.
- Checks for sched_numa_balancing instead of sched_feat(NUMA).
--- kernel/sched/core.c | 14 +++++--------- kernel/sched/fair.c | 4 ++-- kernel/sched/sched.h | 6 ------ 3 files changed, 7 insertions(+), 17 deletions(-)
kernel/sched/core.c +5 -9
@@ -2115,22 +2115,18 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) }#ifdef CONFIG_NUMA_BALANCING -#ifdef CONFIG_SCHED_DEBUG +__read_mostly bool sched_numa_balancing; +void set_numabalancing_state (bool enabled) { + sched_numa_balancing = enabled; +#ifdef CONFIG_SCHED_DEBUG if (enabled)sched_feat_set ("NUMA" );else sched_feat_set ("NO_NUMA" ); -} -#else -__read_mostly bool sched_numa_balancing; - -void set_numabalancing_state (bool enabled) -{ - sched_numa_balancing = enabled; -}#endif /* CONFIG_SCHED_DEBUG */ +}#ifdef CONFIG_PROC_SYSCTL int sysctl_numa_balancing(struct ctl_table *table, int write,
kernel/sched/fair.c +2 -2
@@ -5562,10 +5562,10 @@ static int migrate_degrades_locality(struct task_struct *p, struct lb_env *env)unsigned long src_faults, dst_faults;int src_nid, dst_nid; -if (!p->numa_faults || !(env->sd->flags &SD_NUMA )) +if (!sched_numa_balancing)return -1 ; -if (!sched_feat (NUMA )) +if (!p->numa_faults || !(env->sd->flags &SD_NUMA ))return -1 ; src_nid =cpu_to_node (env->src_cpu);
kernel/sched/sched.h +0 -6
@@ -1004,14 +1004,8 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */ #ifdef CONFIG_NUMA_BALANCING -#define sched_feat_numa (x) sched_feat(x) -#ifdef CONFIG_SCHED_DEBUG -#define sched_numa_balancing sched_feat_numa(NUMA) -#else extern bool sched_numa_balancing; -#endif /* CONFIG_SCHED_DEBUG */ #else -#define sched_feat_numa (x) (0)#define sched_numa_balancing (0)#endif /* CONFIG_NUMA_BALANCING */
PATCH v2 3/3 sched/numa: Remove NUMA sched feature
In reply to Srikar DronamrajuVariable sched_numa_balancing is available for both CONFIG_SCHED_DEBUG and !CONFIG_SCHED_DEBUG. All code paths now check for sched_numa_balancing. Hence remove sched_feat(NUMA).
--- kernel/sched/core.c | 6 ------ kernel/sched/features.h | 16 ---------------- 2 files changed, 22 deletions(-)
kernel/sched/core.c +0 -6
@@ -2063,12 +2063,6 @@ __read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { sched_numa_balancing = enabled; -#ifdef CONFIG_SCHED_DEBUG -if (enabled) -sched_feat_set ("NUMA" ); -else -sched_feat_set ("NO_NUMA" ); -#endif /* CONFIG_SCHED_DEBUG */ }#ifdef CONFIG_PROC_SYSCTL
kernel/sched/features.h +0 -16
@@ -72,19 +72,3 @@ SCHED_FEAT(RT_PUSH_IPI, true) SCHED_FEAT(FORCE_SD_OVERLAP, false) SCHED_FEAT(RT_RUNTIME_SHARE, true)SCHED_FEAT (LB_MIN , false) - -/* -* Apply the automatic NUMA scheduling policy. Enabled automatically -* at runtime if running on a NUMA machine. Can be controlled via -* numa_balancing= - */ -#ifdef CONFIG_NUMA_BALANCING - -/* -* NUMA will favor moving tasks towards nodes where a higher number of -* hinting faults are recorded during active load balancing. It will -* resist moving tasks towards nodes where a lower number of hinting -* faults have been recorded. -*/ -SCHED_FEAT(NUMA, true) -#endif
Signature · 1 line
1.8.3.1
Peter Zijlstra
maintainerRe: [PATCH v2 3/3] sched/numa: Remove NUMA sched feature
Quoted 16 lines · Srikar Dronamraju
Variable
sched_numa_balancingis available for bothCONFIG_SCHED_DEBUGand !CONFIG_SCHED_DEBUG. All code paths now check forsched_numa_balancing. Hence removesched_feat(NUMA).Suggested-by Ingo Molnar <[email protected]>Signed-off-by Srikar Dronamraju <[email protected]>--- kernel/sched/core.c | 6 ------ kernel/sched/features.h | 16 ---------------- 2 files changed, 22 deletions(-)kernel/sched/core.c +0
-0
kernel/sched/core.c __read_mostly bool sched_numa_balancing; · line 2066
Quoted 10 lines
kernel/sched/core.c +0
-6@@ -2063,12 +2063,6 @@ __read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { sched_numa_balancing = enabled; -#ifdef CONFIG_SCHED_DEBUG -if (enabled) -sched_feat_set ("NUMA" ); -else -sched_feat_set ("NO_NUMA" ); -#endif /* CONFIG_SCHED_DEBUG */ }
Could you at least replace sched_numa_balancing with a static_key thingy?
tip-bot for Srikar Dronamraju
merge bot[tip:sched/core] sched/numa: Remove the NUMA sched_feature
In reply to Srikar Dronamrajusched/numa: Remove the NUMA sched_feature
Commit-ID: 2b49d84b259fc18e131026e5d38e7855352f71b9 Gitweb: http://git.kernel.org/tip/2b49d84b259fc18e131026e5d38e7855352f71b9 Author: Srikar Dronamraju <[email protected]> AuthorDate: Tue, 11 Aug 2015 16:30:13 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 13 Sep 2015 09:52:53 +0200
sched/numa: Remove the NUMA sched_feature
Variable sched_numa_balancing is available for both CONFIG_SCHED_DEBUG and !CONFIG_SCHED_DEBUG. All code paths now check for sched_numa_balancing. Hence remove sched_feat(NUMA).
--- kernel/sched/core.c | 6 ------ kernel/sched/features.h | 16 ---------------- 2 files changed, 22 deletions(-)
kernel/sched/core.c +0 -6
@@ -2120,12 +2120,6 @@ __read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { sched_numa_balancing = enabled; -#ifdef CONFIG_SCHED_DEBUG -if (enabled) -sched_feat_set ("NUMA" ); -else -sched_feat_set ("NO_NUMA" ); -#endif /* CONFIG_SCHED_DEBUG */ }#ifdef CONFIG_PROC_SYSCTL
kernel/sched/features.h +0 -16
@@ -72,21 +72,5 @@ SCHED_FEAT(RT_PUSH_IPI, true) SCHED_FEAT(FORCE_SD_OVERLAP, false) SCHED_FEAT(RT_RUNTIME_SHARE, true) SCHED_FEAT(LB_MIN, false) -SCHED_FEAT (ATTACH_AGE_LOAD , true) -/* -* Apply the automatic NUMA scheduling policy. Enabled automatically -* at runtime if running on a NUMA machine. Can be controlled via -* numa_balancing= - */ -#ifdef CONFIG_NUMA_BALANCING - -/* -* NUMA will favor moving tasks towards nodes where a higher number of -* hinting faults are recorded during active load balancing. It will -* resist moving tasks towards nodes where a lower number of hinting -* faults have been recorded. -*/ -SCHED_FEAT(NUMA, true) -#endif
PATCH v2 4/4 sched/numa: Convert sched_numa_balancing to a static_branch
In reply to Srikar DronamrajuVariable sched_numa_balancing toggles numa_balancing feature. Hence moving from a simple read mostly variable to a more apt static_branch.
--- kernel/sched/core.c | 10 +++++++--- kernel/sched/fair.c | 6 +++--- kernel/sched/sched.h | 6 +----- 3 files changed, 11 insertions(+), 11 deletions(-)
kernel/sched/core.c +7 -3
@@ -2057,12 +2057,16 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)#endif /* CONFIG_NUMA_BALANCING */ } +DEFINE_STATIC_KEY_FALSE (sched_numa_balancing); +#ifdef CONFIG_NUMA_BALANCING -__read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { - sched_numa_balancing = enabled; +if (enabled) +static_branch_enable (&sched_numa_balancing); +else +static_branch_disable (&sched_numa_balancing); }#ifdef CONFIG_PROC_SYSCTL
@@ -2071,7 +2075,7 @@ int sysctl_numa_balancing(struct ctl_table *table, int write, {struct ctl_table t;int err; -int state = sched_numa_balancing; +int state =static_branch_likely (&sched_numa_balancing);if (write && !capable (CAP_SYS_ADMIN ))return -EPERM ;
kernel/sched/fair.c +3 -3
@@ -2069,7 +2069,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)int local = !!(flags &TNF_FAULT_LOCAL );int priv; -if (!sched_numa_balancing) +if (!static_branch_likely (&sched_numa_balancing))return ;/* for example, ksmd faulting in a user's mm */
@@ -5524,7 +5524,7 @@ static int migrate_degrades_locality(struct task_struct *p, struct lb_env *env)unsigned long src_faults, dst_faults;int src_nid, dst_nid; -if (!sched_numa_balancing) +if (!static_branch_likely (&sched_numa_balancing))return -1 ;if (!p->numa_faults || !(env->sd->flags &SD_NUMA ))
@@ -7810,7 +7810,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)entity_tick (cfs_rq, se, queued); } -if (sched_numa_balancing) +if (!static_branch_unlikely (&sched_numa_balancing))task_tick_numa (rq, curr); }
kernel/sched/sched.h +1 -5
@@ -1003,11 +1003,7 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#define sched_feat (x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x))#endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */ -#ifdef CONFIG_NUMA_BALANCING -extern bool sched_numa_balancing; -#else -#define sched_numa_balancing (0) -#endif /* CONFIG_NUMA_BALANCING */ +extern struct static_key_false sched_numa_balancing;static inline u64 global_rt_period (void ) {
Signature · 1 line
1.8.3.1
Re: [PATCH v2 4/4] sched/numa: Convert sched_numa_balancing to a static_branch
Hi Srikar,
Quoted 6 lines · Srikar Dronamraju
Variable
sched_numa_balancingtogglesnuma_balancingfeature. Hence moving from a simple read mostly variable to a more aptstatic_branch.Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Srikar Dronamraju <[email protected]>
This commit breaks Peter's queue:
kernel/sched/fair.c: In function ‘task_numa_fault’:kernel/sched/fair.c:2072: error: implicit declaration of function ‘static_branch_likely’ kernel/sched/fair.c: In function ‘task_tick_fair’:kernel/sched/fair.c:7867: error: implicit declaration of function ‘static_branch_unlikely’ make[1]: *** [kernel/sched/fair.o] Error 1
make[1]: *** Waiting for unfinished jobs....kernel/sched/core.c:2116: warning: data definition has no type or storage class kernel/sched/core.c:2116: error: type defaults to ‘int’ in declaration of ‘DEFINE_STATIC_KEY_FALSE’ kernel/sched/core.c:2116: warning: parameter names (without types) in function declaration kernel/sched/core.c: In function ‘set_numabalancing_state’:kernel/sched/core.c:2123: error: implicit declaration of function ‘static_branch_enable’ kernel/sched/core.c:2125: error: implicit declaration of function ‘static_branch_disable’ kernel/sched/core.c: In function ‘sysctl_numa_balancing’:kernel/sched/core.c:2134: error: implicit declaration of function ‘static_branch_likely’ make[1]: *** [kernel/sched/core.o] Error 1
make: *** [kernel/sched/] Error 2
Regards,
Wanpeng Li
Re: [PATCH v2 4/4] sched/numa: Convert sched_numa_balancing to a static_branch
* Wanpeng Li <[email protected]> [2015-09-06 12:01:10]:
Hi Wanpeng Li,
Quoted 10 lines
Hi Srikar,
Quoted 6 lines · Srikar Dronamraju
Variable
sched_numa_balancingtogglesnuma_balancingfeature. Hence moving from a simple read mostly variable to a more aptstatic_branch.Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Srikar Dronamraju <[email protected]>This commit breaks Peter's queue:
Quoted 10 lines
kernel/sched/fair.c: In function ?task_numa_fault?:kernel/sched/fair.c:2072: error: implicit declaration of function ?static_branch_likely?kernel/sched/fair.c: In function ?task_tick_fair?:kernel/sched/fair.c:7867: error: implicit declaration of function ?static_branch_unlikely?
make[1]: *** [kernel/sched/fair.o] Error 1
make[1]: *** Waiting for unfinished jobs....kernel/sched/core.c:2116: warning: data definition has no type or storage class
Thanks for reporting. Can you please confirm if you have the commit
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=11276d5306b8e5b438a36bbff855fe792d7eaa61
Quoted 1 line
From
11276d5306b8e5b438a36bbff855fe792d7eaa61Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <[email protected]>
Date: Fri, 24 Jul 2015 15:09:55 +0200
Subject: [PATCH] locking/static_keys: Add a new static_key interface
Signature · 2 lines
Thanks and Regards Srikar Dronamraju
Re: [PATCH v2 4/4] sched/numa: Convert sched_numa_balancing to a static_branch
Quoted 26 lines · Srikar Dronamraju
* Wanpeng Li <[email protected]> [2015-09-06 12:01:10]:
Hi Wanpeng Li,
Quoted 10 lines
Hi Srikar,
Quoted 6 lines · Srikar Dronamraju
Variable
sched_numa_balancingtogglesnuma_balancingfeature. Hence moving from a simple read mostly variable to a more aptstatic_branch.Suggested-by Peter Zijlstra <[email protected]>Signed-off-by Srikar Dronamraju <[email protected]>This commit breaks Peter's queue:
Quoted 10 lines
kernel/sched/fair.c: In function ?task_numa_fault?:kernel/sched/fair.c:2072: error: implicit declaration of function ?static_branch_likely?kernel/sched/fair.c: In function ?task_tick_fair?:kernel/sched/fair.c:7867: error: implicit declaration of function ?static_branch_unlikely?
make[1]: *** [kernel/sched/fair.o] Error 1
make[1]: *** Waiting for unfinished jobs....kernel/sched/core.c:2116: warning: data definition has no type or storage class
Quoted 2 lines
Thanks for reporting. Can you please confirm if you have the commit
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=11276d5306b8e5b438a36bbff855fe792d7eaa61
It seems that the sched/core branch of Peterz's queue doesn't include this commit. So your patch should be good.
Regards,
Wanpeng Li
tip-bot for Srikar Dronamraju
merge bot[tip:sched/core] sched/numa: Convert sched_numa_balancing to a static_branch
In reply to Srikar Dronamrajusched/numa: Convert sched_numa_balancing to a static_branch
Commit-ID: 2a595721a1fa6b684c1c818f379bef834ac3d65e Gitweb: http://git.kernel.org/tip/2a595721a1fa6b684c1c818f379bef834ac3d65e Author: Srikar Dronamraju <[email protected]> AuthorDate: Tue, 11 Aug 2015 21:54:21 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 13 Sep 2015 09:52:54 +0200
sched/numa: Convert sched_numa_balancing to a static_branch
Variable sched_numa_balancing toggles numa_balancing feature. Hence moving from a simple read mostly variable to a more apt static_branch.
--- kernel/sched/core.c | 10 +++++++--- kernel/sched/fair.c | 6 +++--- kernel/sched/sched.h | 6 +----- 3 files changed, 11 insertions(+), 11 deletions(-)
kernel/sched/core.c +7 -3
@@ -2114,12 +2114,16 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)#endif /* CONFIG_NUMA_BALANCING */ } +DEFINE_STATIC_KEY_FALSE (sched_numa_balancing); +#ifdef CONFIG_NUMA_BALANCING -__read_mostly bool sched_numa_balancing;void set_numabalancing_state (bool enabled) { - sched_numa_balancing = enabled; +if (enabled) +static_branch_enable (&sched_numa_balancing); +else +static_branch_disable (&sched_numa_balancing); }#ifdef CONFIG_PROC_SYSCTL
@@ -2128,7 +2132,7 @@ int sysctl_numa_balancing(struct ctl_table *table, int write, {struct ctl_table t;int err; -int state = sched_numa_balancing; +int state =static_branch_likely (&sched_numa_balancing);if (write && !capable (CAP_SYS_ADMIN ))return -EPERM ;
kernel/sched/fair.c +3 -3
@@ -2069,7 +2069,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)int local = !!(flags &TNF_FAULT_LOCAL );int priv; -if (!sched_numa_balancing) +if (!static_branch_likely (&sched_numa_balancing))return ;/* for example, ksmd faulting in a user's mm */
@@ -5562,7 +5562,7 @@ static int migrate_degrades_locality(struct task_struct *p, struct lb_env *env)unsigned long src_faults, dst_faults;int src_nid, dst_nid; -if (!sched_numa_balancing) +if (!static_branch_likely (&sched_numa_balancing))return -1 ;if (!p->numa_faults || !(env->sd->flags &SD_NUMA ))
@@ -7874,7 +7874,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)entity_tick (cfs_rq, se, queued); } -if (sched_numa_balancing) +if (!static_branch_unlikely (&sched_numa_balancing))task_tick_numa (rq, curr); }
kernel/sched/sched.h +1 -5
@@ -1003,11 +1003,7 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#define sched_feat (x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x))#endif /* SCHED_DEBUG && HAVE_JUMP_LABEL */ -#ifdef CONFIG_NUMA_BALANCING -extern bool sched_numa_balancing; -#else -#define sched_numa_balancing (0) -#endif /* CONFIG_NUMA_BALANCING */ +extern struct static_key_false sched_numa_balancing;static inline u64 global_rt_period (void ) {
Peter Zijlstra
maintainerQuoted 19 lines · Srikar Dronamraju
With recent commit 2a1ed24 ("sched/numa: Prefer NUMA hotness over cache hotness") sets sched feature NUMA to true. This can enable numa hinting faults on a uma system.
This patchset ensures that numa hinting faults occur only on a numa system by setting/resetting
sched_numa_balancing.This patchset
- Renamesnumabalancing_enabledtosched_numa_balancing
- Makessched_numa_balancingcommon toCONFIG_SCHED_DEBUGand !CONFIG_SCHED_DEBUG. Earlier it was only in !CONFIG_SCHED_DEBUG
- Checks forsched_numa_balancinginstead ofsched_feat(NUMA)
- Removes NUMA sched featureSrikar Dronamraju (3):
sched/numa: Renamenumabalancing_enabledtosched_numa_balancingsched/numa: Disablesched_numa_balancingon uma systems sched/numa: Remove NUMA sched feature
Quoted 5 lines
kernel/sched/core.c | 16 +++------------- kernel/sched/fair.c | 8 ++++---- kernel/sched/features.h | 16 ---------------- kernel/sched/sched.h | 10 ++-------- 4 files changed, 9 insertions(+), 41 deletions(-)
Thanks!