Skip to contentSkip to conversation

lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments

PATCH Superseded Alexander Egorenkov 2 participants 5 messages Nov 6, 2020 – Nov 9, 2020 Library code

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments

Support detection of virtualization environment on IBM System Z.

Alexander Egorenkov (2):
lib/tst_virt: fix detection when systemd-detect-virt returns 1 lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments

 include/tst_cpu.h |  3 +++
 lib/tst_virt.c    | 66 ++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 66 insertions(+), 3 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/2 lib/tst_virt: fix detection when systemd-detect-virt returns 1

From: Alexander Egorenkov <[email protected]>

When systemd-detect-virt detects no virtualization environment, it returns 1 as exit code. This leads to tst_is_virt not doing any fallback tests.

The problem can be reproduced inside a IBM System Z LPAR virtualization environment.

---
 lib/tst_virt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/tst_virt.c +2 -2
index 53d33e69c..914a08d96 100644
@@ -109,9 +109,9 @@ int tst_is_virt(int virt_type)
 {
 	int ret = try_systemd_detect_virt();
 
-	if (ret >= 0) {
+	if (ret > 0) {
 		if (virt_type == VIRT_ANY)
-			return ret != 0;
+			return 1;
 		else
 			return ret == virt_type;
 	}
Signature · 1 line
2.26.2
#2 lore raw

PATCH 1/2 lib/tst_virt: fix detection when systemd-detect-virt returns 1

Hi!
Good catch, applied, thanks.

Signature · 2 lines
Cyril Hrubis
[email protected]
#3 lore raw

PATCH 2/2 lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments

In reply to Alexander Egorenkov

From: Alexander Egorenkov <[email protected]>

Add 3 new virtualization types for IBM System Z architecture:
* VIRT_IBMZ (either LPAR ot z/VM)
* VIRT_IBMZ_LPAR (LPAR only)
* VIRT_IBMZ_ZVM (z/VM only)

VIRT_IBMZ is true when either VIRT_IBMZ_LPAR or VIRT_IBMZ_ZVM is true.

---
 include/tst_cpu.h |  3 +++
 lib/tst_virt.c    | 62 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 1 deletion(-)
include/tst_cpu.h +3 -0
index c83a58260..117e27087 100644
@@ -12,6 +12,9 @@ long tst_ncpus_max(void);
 #define VIRT_ANY	0	/* catch-all argument for tst_is_virt() */
 #define VIRT_XEN	1	/* xen dom0/domU */
 #define VIRT_KVM	2	/* only default virtual CPU */
+#define VIRT_IBMZ	3	/* ibm system z */
+#define VIRT_IBMZ_LPAR	4	/* ibm system z lpar */
+#define VIRT_IBMZ_ZVM	5	/* ibm system z zvm */
 #define VIRT_OTHER	0xffff	/* unrecognized hypervisor */
 
 int tst_is_virt(int virt_type);
lib/tst_virt.c +61 -1

84 lines not on this page · raw message

Signature · 1 line
2.26.2
#4 lore raw

PATCH 2/2 lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments

Hi!

Quoted 35 lines
lib/tst_virt.c +35 -0
+static int is_ibmz_lpar(void)
+{
+	FILE *cpuinfo;
+	char line[64];
+	int found_lpar, found_zvm;
+
+	if (access("/proc/sysinfo", F_OK) != 0)
+		return 0;
+
+	cpuinfo = SAFE_FOPEN(NULL, "/proc/sysinfo", "r");
+	found_lpar = 0;
+	found_zvm = 0;
+	while (fgets(line, sizeof(line), cpuinfo) != NULL) {
+		if (strstr(line, "LPAR"))
+			found_lpar = 1;
+		else if (strstr(line, "z/VM"))
+			found_zvm = 1;
+	}
+
+	SAFE_FCLOSE(NULL, cpuinfo);
+	return found_lpar && !found_zvm;
+}
+
+static int is_ibmz_zvm(void)
+{
+	FILE *cpuinfo;
+	char line[64];
+	int found_lpar, found_zvm;
+
+	if (access("/proc/sysinfo", F_OK) != 0)
+		return 0;
+
+	cpuinfo = SAFE_FOPEN(NULL, "/proc/sysinfo", "r");
+	found_lpar = 0;
+	found_zvm = 0;

lib/tst_virt.c static int is_xen(void) · line 111

Quoted 10 lines
lib/tst_virt.c +10 -0
+	while (fgets(line, sizeof(line), cpuinfo) != NULL) {
+		if (strstr(line, "LPAR"))
+			found_lpar = 1;
+		else if (strstr(line, "z/VM"))
+			found_zvm = 1;
+	}
+
+	SAFE_FCLOSE(NULL, cpuinfo);
+	return found_lpar && found_zvm;
+}

These two function are nearly identical apart from the last line, I guess that it would be cleaner to have one function and pass the VIRT_IBMZ_LPAR and VIRT_IBMZ_ZVM constants to select which result we want.

Other than this, the rest looks good.

Signature · 2 lines
Cyril Hrubis
[email protected]