pool/s390-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 522151 from Base:System

Browse Source 
Bug fixes for SLE15

OBS-URL: https://build.opensuse.org/request/show/522151
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/s390-tools?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2017-09-12 17:39:36 +00:00 committed by Git OBS Bridge
commit 32d11d674a
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch Normal file
View File

@ -0,0 +1,35 @@
Subject: [PATCH] [BZ 156627] chmem: try to online memory to zone movable
From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
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 <gerald.schaefer@de.ibm.com>
---
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;
}

14
s390-tools.changes
View File

@ -1,7 +1,19 @@
-------------------------------------------------------------------
Thu Sep 7 19:41:39 UTC 2017 - mpost@suse.com
- Temporarily added BuildIgnore: gcc-PIE to the spec file to
avoid a problem with zipl not working. (bsc#1055343)
-------------------------------------------------------------------
Wed Jul 12 18:14:13 UTC 2017 - mpost@suse.com
- Added s390-tools-sles12sp3-chmem-try-to-online-zone-movable.patch
(bsc#1048363).
-------------------------------------------------------------------
Mon Jul 3 17:29:19 CEST 2017 - ro@suse.de
- remove lsmem and chmem and their manpages from the package,
- Remove lsmem and chmem and their manpages from the package,
both tools have been added to util-linux-2.30
-------------------------------------------------------------------

4
s390-tools.spec
View File

@ -44,6 +44,8 @@ Requires: rsync
Requires: tar
Requires: util-linux
Provides: s390utils:/sbin/dasdfmt
# Don't build with pie to avoid problems with zipl
#!BuildIgnore: gcc-PIE
Source: s390-tools-%{version}.tar.bz2
Source1: s390-tools-rpmlintrc
Source2: zipl.conf
@ -133,6 +135,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 +225,7 @@ to list files and directories.
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
cp -vi %{S:22} CAUTION