| Message ID | 1397209481-28542-5-git-send-email-vincent.guittot@linaro.org |
|---|---|
| State | Accepted |
| Commit | d77b3ed5c9f8ebedf154b52b5e943c461f3d37e6 |
| Headers | show |
On Fri, Apr 11, 2014 at 11:44:40AM +0200, Vincent Guittot wrote: > A new flag SD_SHARE_POWERDOMAIN is created to reflect whether groups of CPUs > in a sched_domain level can or not reach different power state. As an example, > the flag should be cleared at CPU level if groups of cores can be power gated > independently. This information can be used in the load balance decision or to > add load balancing level between group of CPUs that can power gate > independantly. > This flag is part of the topology flags that can be set by arch. > > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> > --- Building a cris-defconfig this gets me an endless stream of misery: In file included from /usr/src/linux-2.6/init/do_mounts.c:12:0: /usr/src/linux-2.6/include/linux/sched.h:1048:46: warning: 'struct sched_domain_topology_level' declared inside parameter list [enabled by default] /usr/src/linux-2.6/include/linux/sched.h:1048:46: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] In file included from /usr/src/linux-2.6/include/linux/utsname.h:5:0, from /usr/src/linux-2.6/include/linux/init_task.h:6, from /usr/src/linux-2.6/init/init_task.c:1: Might be something about UP builds, didn't check x86-UP. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 18 April 2014 12:58, Peter Zijlstra <peterz@infradead.org> wrote: > On Fri, Apr 11, 2014 at 11:44:40AM +0200, Vincent Guittot wrote: >> A new flag SD_SHARE_POWERDOMAIN is created to reflect whether groups of CPUs >> in a sched_domain level can or not reach different power state. As an example, >> the flag should be cleared at CPU level if groups of cores can be power gated >> independently. This information can be used in the load balance decision or to >> add load balancing level between group of CPUs that can power gate >> independantly. >> This flag is part of the topology flags that can be set by arch. >> >> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> >> --- > > Building a cris-defconfig this gets me an endless stream of misery: > > In file included from /usr/src/linux-2.6/init/do_mounts.c:12:0: > /usr/src/linux-2.6/include/linux/sched.h:1048:46: warning: 'struct sched_domain_topology_level' declared inside parameter list [enabled by default] > /usr/src/linux-2.6/include/linux/sched.h:1048:46: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] > In file included from /usr/src/linux-2.6/include/linux/utsname.h:5:0, > from /usr/src/linux-2.6/include/linux/init_task.h:6, > from /usr/src/linux-2.6/init/init_task.c:1: > > Might be something about UP builds, didn't check x86-UP. yes, you're right An empty set_sched_topology function has been define for UP whereas it can't because of the sched_domain_topology_level parameter which is available only in SMP I'm going to send a fix. sorry for the dumb error -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/include/linux/sched.h b/include/linux/sched.h index 7df3ca2..18464cb 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -865,6 +865,7 @@ enum cpu_idle_type { #define SD_BALANCE_WAKE 0x0010 /* Balance on wakeup */ #define SD_WAKE_AFFINE 0x0020 /* Wake task to waking CPU */ #define SD_SHARE_CPUPOWER 0x0080 /* Domain members share cpu power */ +#define SD_SHARE_POWERDOMAIN 0x0100 /* Domain members share power domain */ #define SD_SHARE_PKG_RESOURCES 0x0200 /* Domain members share cpu pkg resources */ #define SD_SERIALIZE 0x0400 /* Only a single load balancing instance */ #define SD_ASYM_PACKING 0x0800 /* Place busy groups earlier in the domain */ diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3743a6c..a30b0b4 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5295,7 +5295,8 @@ static int sd_degenerate(struct sched_domain *sd) SD_BALANCE_FORK | SD_BALANCE_EXEC | SD_SHARE_CPUPOWER | - SD_SHARE_PKG_RESOURCES)) { + SD_SHARE_PKG_RESOURCES | + SD_SHARE_POWERDOMAIN)) { if (sd->groups != sd->groups->next) return 0; } @@ -5326,7 +5327,8 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent) SD_BALANCE_EXEC | SD_SHARE_CPUPOWER | SD_SHARE_PKG_RESOURCES | - SD_PREFER_SIBLING); + SD_PREFER_SIBLING | + SD_SHARE_POWERDOMAIN); if (nr_node_ids == 1) pflags &= ~SD_SERIALIZE; } @@ -5935,6 +5937,7 @@ static int sched_domains_curr_level; * SD_SHARE_CPUPOWER - describes SMT topologies * SD_SHARE_PKG_RESOURCES - describes shared caches * SD_NUMA - describes NUMA topologies + * SD_SHARE_POWERDOMAIN - describes shared power domain * * Odd one out: * SD_ASYM_PACKING - describes SMT quirks @@ -5943,7 +5946,8 @@ static int sched_domains_curr_level; (SD_SHARE_CPUPOWER | \ SD_SHARE_PKG_RESOURCES | \ SD_NUMA | \ - SD_ASYM_PACKING) + SD_ASYM_PACKING | \ + SD_SHARE_POWERDOMAIN) static struct sched_domain * sd_init(struct sched_domain_topology_level *tl, int cpu)
A new flag SD_SHARE_POWERDOMAIN is created to reflect whether groups of CPUs in a sched_domain level can or not reach different power state. As an example, the flag should be cleared at CPU level if groups of cores can be power gated independently. This information can be used in the load balance decision or to add load balancing level between group of CPUs that can power gate independantly. This flag is part of the topology flags that can be set by arch. Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> --- include/linux/sched.h | 1 + kernel/sched/core.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-)