| Message ID | 20170516144244.yq4ppz2hs5ahwnn4@xps13.dannf |
|---|---|
| State | New |
| Headers | show |
On 16/05/17 15:42, dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1690914 > > Signed-off-by: dann frazier <dann.frazier@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 1 - > debian.master/config/annotations | 4 ++-- > debian.master/config/arm64/config.common.arm64 | 2 +- > debian.master/config/config.common.ubuntu | 1 + > debian.master/config/ppc64el/config.common.ppc64el | 1 - > debian.master/config/s390x/config.common.s390x | 1 - > 6 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index ff07271f157a..2cd277470e8c 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -268,7 +268,6 @@ CONFIG_NOZOMI=m > CONFIG_NR_CPUS=8192 > CONFIG_NTB=m > # CONFIG_NTFS_RW is not set > -CONFIG_NUMA_BALANCING=y > CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y > # CONFIG_NUMA_EMU is not set > CONFIG_NVMEM=m > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 22c169853f78..467785287949 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -8377,8 +8377,8 @@ CONFIG_IKCONFIG policy<{'amd64': 'n', 'arm64': ' > CONFIG_LOG_BUF_SHIFT policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}> > CONFIG_LOG_CPU_MAX_BUF_SHIFT policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}> > CONFIG_NMI_LOG_BUF_SHIFT policy<{'amd64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}> > -CONFIG_NUMA_BALANCING policy<{'amd64': 'y', 'arm64': 'n', 'ppc64el': 'y', 's390x': 'y'}> > -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED policy<{'amd64': 'y', 'ppc64el': 'y', 's390x': 'n'}> > +CONFIG_NUMA_BALANCING policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}> > +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'n'}> > CONFIG_CHECKPOINT_RESTORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_SCHED_AUTOGROUP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> > CONFIG_SYSFS_DEPRECATED policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> > diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 > index a2dcd7f00a67..fcd47ee6b79a 100644 > --- a/debian.master/config/arm64/config.common.arm64 > +++ b/debian.master/config/arm64/config.common.arm64 > @@ -287,7 +287,7 @@ CONFIG_NOZOMI=m > CONFIG_NR_CPUS=256 > CONFIG_NTB=m > # CONFIG_NTFS_RW is not set > -# CONFIG_NUMA_BALANCING is not set > +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y > CONFIG_NVMEM=m > CONFIG_N_GSM=m > CONFIG_OF=y > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 7ec30c359b52..2ec42eadb183 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -5830,6 +5830,7 @@ CONFIG_NTB_TRANSPORT=m > # CONFIG_NTFS_DEBUG is not set > CONFIG_NTFS_FS=m > CONFIG_NUMA=y > +CONFIG_NUMA_BALANCING=y > CONFIG_NVDIMM_DAX=y > CONFIG_NVDIMM_PFN=y > CONFIG_NVEC_PAZ00=m > diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el > index b51f9cb056b4..bcd4123e6064 100644 > --- a/debian.master/config/ppc64el/config.common.ppc64el > +++ b/debian.master/config/ppc64el/config.common.ppc64el > @@ -270,7 +270,6 @@ CONFIG_NOZOMI=m > CONFIG_NR_CPUS=2048 > CONFIG_NTB=m > # CONFIG_NTFS_RW is not set > -CONFIG_NUMA_BALANCING=y > CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y > CONFIG_NVMEM=m > CONFIG_N_GSM=m > diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x > index 9d675175bbad..cd886d62d0e7 100644 > --- a/debian.master/config/s390x/config.common.s390x > +++ b/debian.master/config/s390x/config.common.s390x > @@ -234,7 +234,6 @@ CONFIG_NODES_SHIFT=4 > CONFIG_NR_CPUS=256 > # CONFIG_NTB is not set > CONFIG_NTFS_RW=y > -CONFIG_NUMA_BALANCING=y > # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set > CONFIG_NUMA_EMU=y > # CONFIG_NVMEM is not set > Thanks Dann. This fixes performance degradation on NUMA-based arm64. Good test results. Acked-by: Colin Ian King <colin.king@canonical.com>
On Tue, May 16, 2017 at 08:42:44AM -0600, dann frazier wrote: > BugLink: https://bugs.launchpad.net/bugs/1690914 > > Signed-off-by: dann frazier <dann.frazier@canonical.com> Applied to artful/master-next and unstable/master.
Applied to zesty master-next branch. Thanks. Cascardo.
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ff07271f157a..2cd277470e8c 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -268,7 +268,6 @@ CONFIG_NOZOMI=m CONFIG_NR_CPUS=8192 CONFIG_NTB=m # CONFIG_NTFS_RW is not set -CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y # CONFIG_NUMA_EMU is not set CONFIG_NVMEM=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 22c169853f78..467785287949 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8377,8 +8377,8 @@ CONFIG_IKCONFIG policy<{'amd64': 'n', 'arm64': ' CONFIG_LOG_BUF_SHIFT policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'ppc64el': '17', 's390x': '17'}> CONFIG_LOG_CPU_MAX_BUF_SHIFT policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'ppc64el': '12', 's390x': '12'}> CONFIG_NMI_LOG_BUF_SHIFT policy<{'amd64': '13', 'armhf': '13', 'i386': '13', 'ppc64el': '13', 's390x': '13'}> -CONFIG_NUMA_BALANCING policy<{'amd64': 'y', 'arm64': 'n', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED policy<{'amd64': 'y', 'ppc64el': 'y', 's390x': 'n'}> +CONFIG_NUMA_BALANCING policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'n'}> CONFIG_CHECKPOINT_RESTORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SCHED_AUTOGROUP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_SYSFS_DEPRECATED policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index a2dcd7f00a67..fcd47ee6b79a 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -287,7 +287,7 @@ CONFIG_NOZOMI=m CONFIG_NR_CPUS=256 CONFIG_NTB=m # CONFIG_NTFS_RW is not set -# CONFIG_NUMA_BALANCING is not set +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NVMEM=m CONFIG_N_GSM=m CONFIG_OF=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 7ec30c359b52..2ec42eadb183 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5830,6 +5830,7 @@ CONFIG_NTB_TRANSPORT=m # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_FS=m CONFIG_NUMA=y +CONFIG_NUMA_BALANCING=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y CONFIG_NVEC_PAZ00=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index b51f9cb056b4..bcd4123e6064 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -270,7 +270,6 @@ CONFIG_NOZOMI=m CONFIG_NR_CPUS=2048 CONFIG_NTB=m # CONFIG_NTFS_RW is not set -CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NVMEM=m CONFIG_N_GSM=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 9d675175bbad..cd886d62d0e7 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -234,7 +234,6 @@ CONFIG_NODES_SHIFT=4 CONFIG_NR_CPUS=256 # CONFIG_NTB is not set CONFIG_NTFS_RW=y -CONFIG_NUMA_BALANCING=y # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set CONFIG_NUMA_EMU=y # CONFIG_NVMEM is not set
BugLink: https://bugs.launchpad.net/bugs/1690914 Signed-off-by: dann frazier <dann.frazier@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 4 ++-- debian.master/config/arm64/config.common.arm64 | 2 +- debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/s390x/config.common.s390x | 1 - 6 files changed, 4 insertions(+), 6 deletions(-)