rpms/powerpc-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Resolves: RHEL-80729, drmgr: return correct value

Browse Source 
- Resolves: RHEL-80277, lparstat: print memory mode correctly
This commit is contained in:
Than Ngo 2025-03-21 12:38:08 +01:00
parent ca84748422
commit 95a2148f78
3 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
powerpc-utils-fix-return-value-from-do_replace.patch Normal file
View File

@ -0,0 +1,31 @@
commit 3a8127ad7fe6615a8c6e8a3f0965addfdf888b38
Author: Haren Myneni <haren@linux.ibm.com>
Date: Fri Feb 14 21:43:33 2025 -0800
drmgr/pci: Return 0 for success from do_replace()
Added replace_add_work() in commit f40a63b15c563 to support
replacement node and the partner node. But this function returns
0 for user input and 1 for success which caused do_replace()
returns 1. This patch fixes the problem with return 0.
Fixes: f40a63b15c563 ("drmgr/pci: Add multipath partner device support for hotplug replace")
Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
diff --git a/src/drmgr/drslot_chrp_pci.c b/src/drmgr/drslot_chrp_pci.c
index 4c41fcd..91c08e9 100644
--- a/src/drmgr/drslot_chrp_pci.c
+++ b/src/drmgr/drslot_chrp_pci.c
@@ -1051,9 +1051,10 @@ static int do_replace(struct dr_node *all_nodes)
}
usr_prompt = prompt_save;
+ return rc;
}
- return rc;
+ return 0;
}
int valid_pci_options(void)

47
powerpc-utils-lparstat-print-memory-mode-correctly.patch Normal file
View File

@ -0,0 +1,47 @@
commit 4443a68d523043d69195e5a5a27fb9fc7ae8c50f
Author: Shrikanth Hegde <sshegde@linux.ibm.com>
Date: Mon Mar 10 22:29:16 2025 +0530
lparstat: print memory mode correctly (revised)
Starting from power10, active memory sharing(AMS) is not supported.
So from power10 onwards the H_GET_MPP hcall fails and hence
corresponding fields in lparcfg are not populated, such as
entitled_memory_pool_number etc.
Use HWCAP mechanism and print memory model as dedicated for power10
onwards.
Suggested-by: Peter Bergner <bergner@linux.ibm.com>
Signed-off-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
diff --git a/src/lparstat.c b/src/lparstat.c
index db22316..8eddd7c 100644
--- a/src/lparstat.c
+++ b/src/lparstat.c
@@ -37,6 +37,11 @@
#include "pseries_platform.h"
#include "cpu_info_helpers.h"
#include <time.h>
+#include <sys/auxv.h>
+
+#ifndef PPC_FEATURE2_ARCH_3_1
+#define PPC_FEATURE2_ARCH_3_1 0x00040000
+#endif
#define LPARCFG_FILE "/proc/ppc64/lparcfg"
#define SE_NOT_FOUND "???"
@@ -794,7 +799,11 @@ void get_memory_mode(struct sysentry *se, char *buf)
struct sysentry *tmp;
tmp = get_sysentry("entitled_memory_pool_number");
- if (atoi(tmp->value) == 65535)
+ /*
+ * from power10 onwards Active Memory Sharing(AMS) is not
+ * supported. Hence always display it as dedicated for those
+ */
+ if (atoi(tmp->value) == 65535 || (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_1))
sprintf(buf, "Dedicated");
else
sprintf(buf, "Shared");

8
powerpc-utils.spec
View File

@ -1,6 +1,6 @@
Name: powerpc-utils
Version: 1.3.13
Release: 1%{?dist}
Release: 2%{?dist}
Summary: PERL-based scripts for maintaining and servicing PowerPC systems
License: GPLv2
@ -10,6 +10,8 @@ Source1: nx-gzip.udev
Patch0: powerpc-utils-1.3.10-manpages.patch
# upstream patches
Patch10: powerpc-utils-fix-return-value-from-do_replace.patch
Patch11: powerpc-utils-lparstat-print-memory-mode-correctly.patch
ExclusiveArch: ppc %{power64}
@ -211,6 +213,10 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || :
%changelog
* Tue Mar 11 2025 Than Ngo <than@redhat.com> - 1.3.13-2
- Resolves: RHEL-80729, drmgr: return correct value
- Resolves: RHEL-80277, lparstat: print memory mode correctly
* Tue Dec 03 2024 Than Ngo <than@redhat.com> - 1.3.13-1
- Resolves: RHEL-30880, multipath - drmgr support
- Resolces: RHEL-61089, lparstat -E Fails to Display Correct Values for %Busy and %Idle States