Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package powerpc-utils for openSUSE:Factory checked in at 2023-01-04 17:50:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerpc-utils (Old) and /work/SRC/openSUSE:Factory/.powerpc-utils.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerpc-utils" Wed Jan 4 17:50:40 2023 rev:134 rq:1046196 version:1.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/powerpc-utils/powerpc-utils.changes 2022-12-01 16:58:59.071081552 +0100 +++ /work/SRC/openSUSE:Factory/.powerpc-utils.new.1563/powerpc-utils.changes 2023-01-04 17:50:48.113544752 +0100 @@ -1,0 +2,10 @@ +Mon Jan 2 10:27:16 UTC 2023 - Michal Suchanek <msucha...@suse.com> + +- Fix lparstat cpu mode display in a dedicated-donating LPAR (bsc#1206518 ltc#200949) + + lparstat-Fix-display-of-mode-for-dedicated-donating-.patch +- Fix cpu utilization display + + lparstat-Fix-array-overflow-issue.patch +- Fix setting primaty HNV link when using NM + + hcnmgr-Fix-setting-primary-slave-across-reboots.patch + +------------------------------------------------------------------- New: ---- hcnmgr-Fix-setting-primary-slave-across-reboots.patch lparstat-Fix-array-overflow-issue.patch lparstat-Fix-display-of-mode-for-dedicated-donating-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.ltCdsc/_old 2023-01-04 17:50:49.193551117 +0100 +++ /var/tmp/diff_new_pack.ltCdsc/_new 2023-01-04 17:50:49.201551165 +0100 @@ -1,7 +1,7 @@ # # spec file for package powerpc-utils # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,8 +33,11 @@ Patch6: lsslot-Fix-lsslot-c-mem-output-when-using-4GB-LMB-si.patch Patch7: bootlist-Add-install-boot-support-for-nvmf-devices.patch Patch8: ofpathname-Fix-several-issues-in-nvmf-boot-install-s.patch -Patch9: ofpathname-Handle-nsid-as-hex-in-nvmf-boot-install-s.patch -Patch10: Support-multiple-dev-paths-for-a-nvmf-boot-device.patch +Patch9: Support-multiple-dev-paths-for-a-nvmf-boot-device.patch +Patch10: ofpathname-Handle-nsid-as-hex-in-nvmf-boot-install-s.patch +Patch11: lparstat-Fix-display-of-mode-for-dedicated-donating-.patch +Patch12: lparstat-Fix-array-overflow-issue.patch +Patch13: hcnmgr-Fix-setting-primary-slave-across-reboots.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libnuma-devel ++++++ Support-multiple-dev-paths-for-a-nvmf-boot-device.patch ++++++ --- /var/tmp/diff_new_pack.ltCdsc/_old 2023-01-04 17:50:49.221551282 +0100 +++ /var/tmp/diff_new_pack.ltCdsc/_new 2023-01-04 17:50:49.225551307 +0100 @@ -1,24 +1,31 @@ -From 32c7dc10498ebc429b1fcb81a9dda449e2814951 Mon Sep 17 00:00:00 2001 +From 3847a1c25a640394c4afd2b8938ad21190bf5dbe Mon Sep 17 00:00:00 2001 From: Wen Xiong <wenxi...@linux.ibm.com> -Date: Wed, 26 Oct 2022 22:10:47 -0500 +Date: Fri, 28 Oct 2022 09:20:38 -0500 Subject: [PATCH] Support multiple dev paths for a nvmf boot device +Upstream: accepted, expected in 1.3.11 +Git-commit: 3847a1c25a640394c4afd2b8938ad21190bf5dbe + This patch adds the support for multiple dev/of paths with a nvmf boot dev +# bootlist -m normal -o nvme1n4 nvme1n4 nvme3n4 nvme5n4 nvme6n4 +# bootlist -m normal -o nvme1n4 nvme3n4 nvme5n4 nvme6n4 +# bootlist -m normal -r /pci@800000020000017/fibre-channel@0/nvme-of/controller@50050768101935e5,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147 /pci@800000020000017/fibre-channel@0/nvme-of/controller@5005076810193675,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147 /pci@800000020000017/fibre-channel@0,1/nvme-of/controller@5005076810193675,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147 /pci@800000020000017/fibre-channel@0,1/nvme-of/controller@50050768101935e5,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147 Signed-off-by: Wen Xiong <wenxi...@linux.ibm.com> +Signed-off-by: Tyrel Datwyler <tyr...@linux.ibm.com> --- scripts/bootlist | 30 +++++++++++++++--------------- scripts/ofpathname | 29 +++++++++++++++++++---------- @@ -73,7 +80,7 @@ DEVTYPE="nvme-of" add_nvmf $ctrl_name diff --git a/scripts/ofpathname b/scripts/ofpathname -index 752f8e9..d8b602c 100755 +index 33d7702..c576fb8 100755 --- a/scripts/ofpathname +++ b/scripts/ofpathname @@ -1875,19 +1875,28 @@ of2l_nvmf() @@ -87,7 +94,7 @@ - cd $dir - - local devnsid=`$CAT ./nsid 2>/dev/null` -- devnsid=$(printf "%x" $devnsid) +- devnsid=`echo "obase=16; $devnsid" |bc` - if [[ $devnsid = $nsid ]]; then - found=1 - LOGICAL_DEVNAME="${dir##*/}" @@ -101,7 +108,7 @@ + for dev_name in `$FIND /sys/block -name "${ana_name##*/}n[0-9]*"`; do + cd $dev_name + local devnsid=`$CAT ./nsid 2>/dev/null` -+ devnsid=$(printf "%x" $devnsid) ++ devnsid=`echo "obase=16; $devnsid" |bc` + if [[ $devnsid = $nsid ]]; then + found=1 + NS_ID="${dev_name##*n}" @@ -111,11 +118,11 @@ + done + done done -+ ++ if [[ $found -eq 0 ]]; then LOGICAL_DEVNAME="" fi -- -2.38.1 +2.39.0 ++++++ hcnmgr-Fix-setting-primary-slave-across-reboots.patch ++++++ >From acaf9c45a340f9bb49d6b21ba7ad60c21326ea73 Mon Sep 17 00:00:00 2001 From: Mingming Cao <m...@linux.vnet.ibm.com> Date: Mon, 7 Nov 2022 14:39:02 -0800 Subject: [PATCH] hcnmgr: Fix setting primary slave across reboots Upstream: accepted, expected in 1.3.11 Git-commit: acaf9c45a340f9bb49d6b21ba7ad60c21326ea73 Using nmcli to set bonding of primary slave so that is set correctly across reboots. Signed-off-by: Mingming Cao <m...@linux.vnet.ibm.com> [tyreld: Reworded commit log] Signed-off-by: Tyrel Datwyler <tyr...@linux.ibm.com> --- scripts/hcnmgr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/hcnmgr b/scripts/hcnmgr index 6946ff9..b5a6bfb 100644 --- a/scripts/hcnmgr +++ b/scripts/hcnmgr @@ -375,7 +375,8 @@ do_config_vdevice_nm() { # if the device is primary, and link is up, force it as primary se if [[ $MODE == "primary" ]]; then hcnlog INFO "Change bonding primary slave to $DEVNAME" - echo "$DEVNAME" >"$BOND_PATH"/primary + nmcli con mod id "$BONDNAME" +bond.options "primary=$DEVNAME" + nmcli con up "$BONDNAME" fi hcnlog DEBUG "do_config_vdevice: exit" -- 2.39.0 ++++++ lparstat-Fix-array-overflow-issue.patch ++++++ >From b6bd4ddd0c0a24cce97c220ab0cadfd004dd58c4 Mon Sep 17 00:00:00 2001 From: Sathvika Vasireddy <s...@linux.ibm.com> Date: Fri, 15 Jul 2022 14:35:13 +0530 Subject: [PATCH] lparstat: Fix array overflow issue Upstream: accepted, expected in 1.3.11 Git-commit: b6bd4ddd0c0a24cce97c220ab0cadfd004dd58c4 lparstat is trying to read from out of bound file descriptors. Fix this by making sure array overflow does not occur. Without this patch: =================================================================== ltcden8-lp7:/home/sathvika/powerpc-utils # lparstat -E 1 1 Failed to /sys/devices/system/cpu/cpu1162167776/spurr =================================================================== With this patch: =================================================================== ltcden8-lp7:/home/sathvika/powerpc-utils # ./src/lparstat -E 1 1 System Configuration type=Dedicated mode=Capped smt=8 lcpu=6 mem=81341376 kB cpus=0 ent=6.00 ---Actual--- -Normalized- %busy %idle Frequency %busy %idle ------ ------ ------------- ------ ------ 0.01 99.99 4.00GHz[116%] 0.02 115.98 ==================================================================== Reported-by: Sachin Sant <sach...@linux.ibm.com> Signed-off-by: Sathvika Vasireddy <s...@linux.ibm.com> Tested-by: Sachin Sant <sach...@linux.ibm.com> Signed-off-by: Tyrel Datwyler <tyr...@linux.ibm.com> --- src/lparstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lparstat.c b/src/lparstat.c index e998e8c..31a4ee8 100644 --- a/src/lparstat.c +++ b/src/lparstat.c @@ -180,7 +180,7 @@ int parse_sysfs_values(void) spurr = idle_spurr = idle_purr = 0UL; - for (i = 0; cpu_sysfs_fds[i].spurr > 0; i++) { + for (i = 0; (i < threads_in_system) && (cpu_sysfs_fds[i].spurr >= 0); i++) { rc = pread(cpu_sysfs_fds[i].spurr, (void *)line, sizeof(line), 0); if (rc == -1) { fprintf(stderr, "Failed to read /sys/devices/system/cpu/cpu%d/spurr\n", -- 2.39.0 ++++++ lparstat-Fix-display-of-mode-for-dedicated-donating-.patch ++++++ >From f4c2b0d142f623e7dd28a5d685e446d41be75601 Mon Sep 17 00:00:00 2001 From: "Naveen N. Rao" <naveen.n....@linux.vnet.ibm.com> Date: Thu, 25 Aug 2022 12:19:27 +0530 Subject: [PATCH] lparstat: Fix display of mode for dedicated-donating partition Upstream: accepted, expected in 1.3.11 Git-commit: f4c2b0d142f623e7dd28a5d685e446d41be75601 From the lparstat man page: mode Indicates whether the partition processor capacity is capped or uncapped allowing it to consume idle cycles from the shared pool. Dedicated LPAR is capped or donating. However, on a dedicated partition, lparstat always displays the mode as 'Capped' today. Fix this by using 'DedDonMode' field from lparcfg for determining the cycle donation status of a dedicated partition. On a dedicated-donating partition: $ grep -e shared -e DedDonMode -e capped /proc/powerpc/lparcfg DedDonMode=1 capped=1 shared_processor_mode=0 Before this patch: $ lparstat System Configuration type=Dedicated mode=Capped smt=8 lcpu=1 mem=3335424 kB cpus=0 ent=1.00 After this patch: $ lparstat System Configuration type=Dedicated mode=Donating smt=8 lcpu=1 mem=3335424 kB cpus=0 ent=1.00 Signed-off-by: Naveen N. Rao <naveen.n....@linux.vnet.ibm.com> Reviewed-by: Nathan Lynch <nath...@linux.ibm.com> Signed-off-by: Tyrel Datwyler <tyr...@linux.ibm.com> --- src/lparstat.c | 15 ++++++++++++++- src/lparstat.h | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lparstat.c b/src/lparstat.c index 0b30fc9..e998e8c 100644 --- a/src/lparstat.c +++ b/src/lparstat.c @@ -718,6 +718,16 @@ void get_capped_mode(struct sysentry *se, char *buf) sprintf(buf, "%s", value); } +void get_dedicated_mode(struct sysentry *se, char *buf) +{ + const char *value = "Capped"; + + if (se->value[0] == '1') + value = "Donating"; + + sprintf(buf, "%s", value); +} + void get_percent_entry(struct sysentry *se, char *buf) { float value; @@ -1057,7 +1067,10 @@ void print_system_configuration(void) get_sysdata("shared_processor_mode", &descr, value); offset = sprintf(buf, "type=%s ", value); sprintf(type, "%s", value); - get_sysdata("capped", &descr, value); + if (!strcmp(value, "Dedicated")) + get_sysdata("DedDonMode", &descr, value); + else + get_sysdata("capped", &descr, value); offset += sprintf(buf + offset, "mode=%s ", value); get_sysdata("smt_state", &descr, value); offset += sprintf(buf + offset, "smt=%s ", value); diff --git a/src/lparstat.h b/src/lparstat.h index 26ed4ba..b7c88e9 100644 --- a/src/lparstat.h +++ b/src/lparstat.h @@ -47,6 +47,7 @@ typedef struct cpu_sysfs_file_desc cpu_sysfs_fd; extern void get_smt_state(struct sysentry *, char *); extern void get_capped_mode(struct sysentry *, char *); +extern void get_dedicated_mode(struct sysentry *, char *); extern void get_memory_mode(struct sysentry *, char *); extern void get_percent_entry(struct sysentry *, char *); extern void get_phys_cpu_percentage(struct sysentry *, char *); @@ -110,7 +111,8 @@ struct sysentry system_data[] = { {.name = "DesVarCapWt", .descr = "Desired Variable Capacity Weight"}, {.name = "DedDonMode", - .descr = "Dedicated Donation Mode"}, + .descr = "Dedicated Donation Mode", + .get = &get_dedicated_mode}, {.name = "partition_entitled_capacity", .descr = "Partition Entitled Capacity"}, {.name = "system_active_processors", -- 2.39.0 ++++++ ofpathname-Handle-nsid-as-hex-in-nvmf-boot-install-s.patch ++++++ --- /var/tmp/diff_new_pack.ltCdsc/_old 2023-01-04 17:50:49.277551613 +0100 +++ /var/tmp/diff_new_pack.ltCdsc/_new 2023-01-04 17:50:49.281551637 +0100 @@ -1,8 +1,11 @@ -From feea6c60f9dae48d5d270683cc08393b8e21d53e Mon Sep 17 00:00:00 2001 +From 04e5c9646296e1f12048723bba4cee663c3f74ed Mon Sep 17 00:00:00 2001 From: Wen Xiong <wenxi...@linux.ibm.com> -Date: Mon, 21 Nov 2022 13:34:15 -0500 +Date: Thu, 1 Dec 2022 05:22:37 -0600 Subject: [PATCH] ofpathname: Handle nsid as hex in nvmf boot/install support +Upstream: accepted, expected in 1.3.11 +Git-commit: 04e5c9646296e1f12048723bba4cee663c3f74ed + Didn't handle nsid correctly in nvmf boot/install support. Need to handle it as hexadecimal number @@ -13,12 +16,13 @@ 26c should be a hexadecimal number. Signed-off-by: Wen Xiong <wenxi...@linux.ibm.com> +Signed-off-by: Tyrel Datwyler <tyr...@linux.ibm.com> --- scripts/ofpathname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ofpathname b/scripts/ofpathname -index 33d7702..752f8e9 100755 +index c576fb8..3abe4d1 100755 --- a/scripts/ofpathname +++ b/scripts/ofpathname @@ -809,7 +809,7 @@ l2of_nvmf() @@ -26,20 +30,20 @@ goto_dir $res devnsid=`$CAT $PWD/nsid | tr -d '\000'` - devnsid=`echo "obase=16; $devnsid" |bc` -+ devnsid=$(printf "%x" $devnsid) ++ devnsid=$(printf "%x" $devnsid) OF_PATH="$OF_PATH/namespace@$devnsid" fi fi -@@ -1881,7 +1881,7 @@ of2l_nvmf() - cd $dir - - local devnsid=`$CAT ./nsid 2>/dev/null` -- devnsid=`echo "obase=16; $devnsid" |bc` -+ devnsid=$(printf "%x" $devnsid) - if [[ $devnsid = $nsid ]]; then - found=1 - LOGICAL_DEVNAME="${dir##*/}" +@@ -1886,7 +1886,7 @@ of2l_nvmf() + for dev_name in `$FIND /sys/block -name "${ana_name##*/}n[0-9]*"`; do + cd $dev_name + local devnsid=`$CAT ./nsid 2>/dev/null` +- devnsid=`echo "obase=16; $devnsid" |bc` ++ devnsid=$(printf "%x" $devnsid) + if [[ $devnsid = $nsid ]]; then + found=1 + NS_ID="${dev_name##*n}" -- -2.38.0 +2.39.0