diff --git a/s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch b/s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch new file mode 100644 index 0000000..1c58336 --- /dev/null +++ b/s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch @@ -0,0 +1,35 @@ +Subject: [PATCH] [BZ 156627] chmem: try to online memory to zone movable +From: Gerald Schaefer + +Description: chmem: try to online memory to zone movable +Symptom: Standby/reserved memory that is onlined with chmem will be set + online to zone normal, instead of zone movable, and so it is much + less likely to be able to be offlined again. +Problem: With recent kernels, the default zone for hotplug memory was + changed from zone movable to zone normal. +Solution: Let chmem first try to online memory to the zone movable, before + setting it online to the default zone. +Reproduction: Set standby/reserved memory online with chmem, and check + /proc/zoneinfo for zone allocation. +Upstream-ID: - +Problem-ID: 156627 + +Signed-off-by: Gerald Schaefer +--- + zconf/chmem | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/zconf/chmem ++++ b/zconf/chmem +@@ -86,7 +86,10 @@ sub chmem_online($) + { + my $block = shift; + +- qx(echo online > $memdir/memory$block/state 2>/dev/null); ++ qx(echo online_movable > $memdir/memory$block/state 2>/dev/null); ++ if ($? >> 8 != 0) { ++ qx(echo online > $memdir/memory$block/state 2>/dev/null); ++ } + return $? >> 8; + } + diff --git a/s390-tools.changes b/s390-tools.changes index 1e31fed..2468205 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Mon Jul 3 17:29:19 CEST 2017 - ro@suse.de +Wed Jul 12 18:14:13 UTC 2017 - mpost@suse.com -- remove lsmem and chmem and their manpages from the package, - both tools have been added to util-linux-2.30 +- Added s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch + (bsc#1048363). ------------------------------------------------------------------- Wed May 31 21:26:50 UTC 2017 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index ab70acf..0068fef 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -133,6 +133,7 @@ Patch30: s390-tools-sles12sp3-util_proc-fix-memory-allocation-error-messa Patch31: s390-tools-sles12sp3-mon_fsstatd-fix-double-free-in-error-path-and-skip-virtual-fs.patch Patch32: s390-tools-sles12sp3-dbginfo-Collect-docker-debug-data.patch Patch33: s390-tools-sles12sp3-ziomon-no-blktrace-kill-which-can-corrupt-kernel-blk.patch +Patch34: s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 s390x @@ -222,6 +223,7 @@ to list files and directories. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 cp -vi %{S:22} CAUTION @@ -323,12 +325,6 @@ install -m755 -t sbin/ %{S:88} %{S:89} %{S:90} %{S:91} %{S:92} %{S:93} install -m644 -t $RPM_BUILD_ROOT/%{_mandir}/man8 %{S:94} %{S:95} %{S:96} %{S:97} %{S:98} %{S:99} ### -### lsmem/chmem have been added to util-linux -rm -fv $RPM_BUILD_ROOT/%{_mandir}/man8/lsmem.8* -rm -fv $RPM_BUILD_ROOT/%{_mandir}/man8/chmem.8* -rm -fv $RPM_BUILD_ROOT/%{_sbindir}/lsmem -rm -fv $RPM_BUILD_ROOT/%{_sbindir}/chmem - find . ! -type d | %__sed 's/^.//;\-/man/-s/^.*$/%doc &.gz/' > %{_builddir}/%{name}-filelist grep -v -E 'osasnmp|*\.conf$' %{_builddir}/%{name}-filelist >%{_builddir}/%{name}.list