File 0002-hcnmgr-Remove-some-dead-code.patch of Package powerpc-utils.24248

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-hcnmgr-Remove-some-dead-code.patch of Package powerpc-utils.24248

From 1e23f0265608f49679a462072d3a4f17139edfc0 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Tue, 30 Nov 2021 12:04:37 +0100
Subject: [PATCH 2/4] hcnmgr: Remove some dead code

References: jsc#SLE-23097
Upstream: accepted (expected in 1.3.10)
Git-commit: 1e23f0265608f49679a462072d3a4f17139edfc0

There is VNIC_SPT which enables support for vnic as beckup device which
is set based on value of VERSION variable which is hardcoded in the
script and does not correspond the actual HNV support level on the LPAR.

Remove all this. We do support vnic backend so enable it
unconditionally.

It is the job of HMC to decide if vnic backup device is supported and
can be configured. When it is configured by HMC make use of it.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Tested-by: Mingming Cao <mmc@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
---
 scripts/hcnmgr | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/scripts/hcnmgr b/scripts/hcnmgr
index 0742a97..870f544 100644
--- a/scripts/hcnmgr
+++ b/scripts/hcnmgr
@@ -21,7 +21,7 @@
 #	   support live partition migration with SR_IOV
 #
 
-VERSION="1.1"
+FEATURES="vnic"
 PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
 BOND_BASEPATH="/sys/class/net"
 BONDOPTIONS="mode=1,miimon=100,fail_over_mac=2"
@@ -39,7 +39,6 @@ MODE=""
 PHYSLOC=""
 DEVPATH=""
 VIO_TYPE=""
-VNIC_SPT=""
 
 # Usage statements
 usage() {
@@ -71,9 +70,9 @@ usage() {
 
 # Display current version of hybrid network support
 show_version() {
-	echo "$HCNMGR: Version $VERSION"
+	echo "$HCNMGR (features: $FEATURES)"
 	echo "Written by: Mingming Cao <mingming.cao@ibm.com>"
-	hcnlog INFO "HCN_VERSION=$VERSION"
+	hcnlog INFO "$HCNMGR (features: $FEATURES)"
 }
 
 # Error codes
@@ -365,10 +364,6 @@ cfghcn() {
 
 	hcnlog DEBUG "cfghcn: enter $1"
 	search_dev "$1"
-	if [[ $VIO_TYPE == "VNIC" && $VNIC_SPT == "OFF" ]]; then
-		hcnlog WARN "Backing device $VIO_TYPE for Migratable VF is not supported in hcnmgr version $VERSION"
-		err $E_INVAL_DEV
-	fi
 	while [ $retry != 0 ]; do
 		hcnlog DEBUG "cfg_hcn: calling do_confi_vdevice to enslave $DEVNAME to HNV"
 		if do_config_vdevice; then
@@ -596,20 +591,18 @@ scanhcn() {
 		fi
 	done
 
-	if [[ $VNIC_SPT != "OFF" ]]; then
-		hcnlog DEBUG "search vnic device with ibm,hcn-id propterty......"
-		# Look at every vNIC device with ibm,hcn-id propterty
-		# join or create bond for this hcnid if not exist, add vnic device as
-		# slave for this bond accosiated with hcnid, if not already to
-		for dev in "$DT_PATH"/vdevice/vnic*; do
-			[ -d "$dev" ] || continue
-			if [ -e "$dev"/ibm,hcn-id ] && get_dev_hcn "$dev"; then
-				hcnlog DEBUG "scanhcn found vnic device with hcnid "
-				hcnlog INFO "scanhcn configure HCN and vnic device"
-				do_config_vdevice
-			fi
-		done
-	fi
+	hcnlog DEBUG "search vnic device with ibm,hcn-id propterty......"
+	# Look at every vNIC device with ibm,hcn-id propterty
+	# join or create bond for this hcnid if not exist, add vnic device as
+	# slave for this bond accosiated with hcnid, if not already to
+	for dev in "$DT_PATH"/vdevice/vnic*; do
+		[ -d "$dev" ] || continue
+		if [ -e "$dev"/ibm,hcn-id ] && get_dev_hcn "$dev"; then
+			hcnlog DEBUG "scanhcn found vnic device with hcnid "
+			hcnlog INFO "scanhcn configure HCN and vnic device"
+			do_config_vdevice
+		fi
+	done
 
 	if [ ${#HcnIds[@]} -eq 0 ]; then
 		hcnlog DEBUG "scanhcn: scan for hybrid virtual network finished"
@@ -661,12 +654,6 @@ fi
 if ! nmcli --version >/dev/null 2>&1; then
 	err $E_ENETUNREACH
 fi
-# HNV can support VNIC or Veth as backup device.
-# In the first HNV version 1.0, the vNIC as backup support was turned off
-# HNV VERSION greater than 1.0 starts to support vNIC as the backup device
-if [[ $VERSION == "1.0" ]]; then
-	VNIC_SPT="OFF"
-fi
 
 #Validate bonding module is loaded
 if ! lsmod | grep -q bonding; then
-- 
2.34.1

Places

File 0002-hcnmgr-Remove-some-dead-code.patch of Package powerpc-utils.24248

Places