diff mbox series

[v2,1/1] lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments

Message ID 20201109145657.602251-1-egorenar@linux.ibm.com
State Accepted
Headers show
Series [v2,1/1] lib/tst_virt: support IBM/Z LPAR and z/VM virtualization environments | expand

Commit Message

Alexander Egorenkov Nov. 9, 2020, 2:56 p.m. UTC 
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.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
---

 v1 -> v2:
  * Remove redundancy by merging is_ibmz_lpar() and is_ibmz_zvm()
    into is_ibmz_vm()
  * Fix variable naming in is_ibmz_vm()

 include/tst_cpu.h |  3 +++
 lib/tst_virt.c    | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

Comments

Cyril Hrubis Nov. 9, 2020, 3:09 p.m. UTC | #1 
Hi!
Actually we can simplify the code like this:

+static int is_ibmz(int virt_type)
+{
+	FILE *sysinfo;
+	char line[64];
+	int found_lpar, found_zvm;
+
+	if (virt_type != VIRT_IBMZ_LPAR && virt_type != VIRT_IBMZ_ZVM)
+		return 0;
+
+	if (access("/proc/sysinfo", F_OK) != 0)
+		return 0;
+
+	sysinfo = SAFE_FOPEN(NULL, "/proc/sysinfo", "r");
+	found_lpar = 0;
+	found_zvm = 0;
+	while (fgets(line, sizeof(line), sysinfo) != NULL) {
+		if (strstr(line, "LPAR"))
+			found_lpar = 1;
+		else if (strstr(line, "z/VM"))
+			found_zvm = 1;
+	}
+
+	SAFE_FCLOSE(NULL, sysinfo);
+
+	switch (virt_type) {
+	case VIRT_IBMZ:
+		return found_lpar;
+	case VIRT_IBMZ_LPAR:
+		return found_lpar && !found_zvm;
+	case VIRT_IBMZ_ZVM:
+		return found_lpar && found_zvm;
+	default:
+		return 0;
+	}
+}
+
 static int try_systemd_detect_virt(void)
 {
 	FILE *f;
@@ -102,6 +138,9 @@ static int try_systemd_detect_virt(void)
 	if (!strncmp("xen", virt_type, 3))
 		return VIRT_XEN;
 
+	if (!strncmp("zvm", virt_type, 3))
+		return VIRT_IBMZ_ZVM;
+
 	return VIRT_OTHER;
 }
 
@@ -118,11 +157,15 @@ int tst_is_virt(int virt_type)
 
 	switch (virt_type) {
 	case VIRT_ANY:
-		return is_xen() || is_kvm();
+		return is_xen() || is_kvm() || is_ibmz(VIRT_IBMZ);
 	case VIRT_XEN:
 		return is_xen();
 	case VIRT_KVM:
 		return is_kvm();
+	case VIRT_IBMZ:
+	case VIRT_IBMZ_LPAR:
+	case VIRT_IBMZ_ZVM:
+		return is_ibmz(virt_type);
 	case VIRT_OTHER:
 		return 0;
 	}


Do you agree with these changes?
Alexander Egorenkov Nov. 9, 2020, 3:11 p.m. UTC | #2 
Cyril Hrubis <chrubis@suse.cz> writes:

> Hi!
> Actually we can simplify the code like this:
>
> +static int is_ibmz(int virt_type)
> +{
> +	FILE *sysinfo;
> +	char line[64];
> +	int found_lpar, found_zvm;
> +
> +	if (virt_type != VIRT_IBMZ_LPAR && virt_type != VIRT_IBMZ_ZVM)
> +		return 0;
> +
> +	if (access("/proc/sysinfo", F_OK) != 0)
> +		return 0;
> +
> +	sysinfo = SAFE_FOPEN(NULL, "/proc/sysinfo", "r");
> +	found_lpar = 0;
> +	found_zvm = 0;
> +	while (fgets(line, sizeof(line), sysinfo) != NULL) {
> +		if (strstr(line, "LPAR"))
> +			found_lpar = 1;
> +		else if (strstr(line, "z/VM"))
> +			found_zvm = 1;
> +	}
> +
> +	SAFE_FCLOSE(NULL, sysinfo);
> +
> +	switch (virt_type) {
> +	case VIRT_IBMZ:
> +		return found_lpar;
> +	case VIRT_IBMZ_LPAR:
> +		return found_lpar && !found_zvm;
> +	case VIRT_IBMZ_ZVM:
> +		return found_lpar && found_zvm;
> +	default:
> +		return 0;
> +	}
> +}
> +
>  static int try_systemd_detect_virt(void)
>  {
>  	FILE *f;
> @@ -102,6 +138,9 @@ static int try_systemd_detect_virt(void)
>  	if (!strncmp("xen", virt_type, 3))
>  		return VIRT_XEN;
>  
> +	if (!strncmp("zvm", virt_type, 3))
> +		return VIRT_IBMZ_ZVM;
> +
>  	return VIRT_OTHER;
>  }
>  
> @@ -118,11 +157,15 @@ int tst_is_virt(int virt_type)
>  
>  	switch (virt_type) {
>  	case VIRT_ANY:
> -		return is_xen() || is_kvm();
> +		return is_xen() || is_kvm() || is_ibmz(VIRT_IBMZ);
>  	case VIRT_XEN:
>  		return is_xen();
>  	case VIRT_KVM:
>  		return is_kvm();
> +	case VIRT_IBMZ:
> +	case VIRT_IBMZ_LPAR:
> +	case VIRT_IBMZ_ZVM:
> +		return is_ibmz(virt_type);
>  	case VIRT_OTHER:
>  		return 0;
>  	}
>
>
> Do you agree with these changes?
>
> -- 
> Cyril Hrubis
> chrubis@suse.cz

Hi, perfect.

Thanks

Regards
Alex
Alexander Egorenkov Nov. 9, 2020, 3:13 p.m. UTC | #3 
Cyril Hrubis <chrubis@suse.cz> writes:

> Hi!
> Actually we can simplify the code like this:
>
> +static int is_ibmz(int virt_type)
> +{
> +	FILE *sysinfo;
> +	char line[64];
> +	int found_lpar, found_zvm;
> +
> +	if (virt_type != VIRT_IBMZ_LPAR && virt_type != VIRT_IBMZ_ZVM)
> +		return 0;

Missed VIRT_IBMZ.

Otherwise is good.
Shall i create a new patch ?

Regards
Alex
Cyril Hrubis Nov. 9, 2020, 3:14 p.m. UTC | #4 
Hi!
Pushed, thanks.
diff mbox series

Patch

diff --git a/include/tst_cpu.h b/include/tst_cpu.h
index c83a58260..117e27087 100644
--- a/include/tst_cpu.h
+++ b/include/tst_cpu.h
@@ -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);
diff --git a/lib/tst_virt.c b/lib/tst_virt.c
index 914a08d96..86e7cf729 100644
--- a/lib/tst_virt.c
+++ b/lib/tst_virt.c
@@ -64,6 +64,41 @@  static int is_xen(void)
 	return 0;
 }
 
+static int is_ibmz_vm(int virt_type)
+{
+	FILE *sysinfo;
+	char line[64];
+	int found_lpar, found_zvm;
+
+	if (virt_type != VIRT_IBMZ_LPAR && virt_type != VIRT_IBMZ_ZVM)
+		return 0;
+
+	if (access("/proc/sysinfo", F_OK) != 0)
+		return 0;
+
+	sysinfo = SAFE_FOPEN(NULL, "/proc/sysinfo", "r");
+	found_lpar = 0;
+	found_zvm = 0;
+	while (fgets(line, sizeof(line), sysinfo) != NULL) {
+		if (strstr(line, "LPAR"))
+			found_lpar = 1;
+		else if (strstr(line, "z/VM"))
+			found_zvm = 1;
+	}
+
+	SAFE_FCLOSE(NULL, sysinfo);
+
+	if (virt_type == VIRT_IBMZ_LPAR)
+		return found_lpar && !found_zvm;
+	else
+		return found_lpar && found_zvm;
+}
+
+static int is_ibmz(void)
+{
+	return is_ibmz_vm(VIRT_IBMZ_LPAR) || is_ibmz_vm(VIRT_IBMZ_ZVM);
+}
+
 static int try_systemd_detect_virt(void)
 {
 	FILE *f;
@@ -102,6 +137,9 @@  static int try_systemd_detect_virt(void)
 	if (!strncmp("xen", virt_type, 3))
 		return VIRT_XEN;
 
+	if (!strncmp("zvm", virt_type, 3))
+		return VIRT_IBMZ_ZVM;
+
 	return VIRT_OTHER;
 }
 
@@ -118,11 +156,17 @@  int tst_is_virt(int virt_type)
 
 	switch (virt_type) {
 	case VIRT_ANY:
-		return is_xen() || is_kvm();
+		return is_xen() || is_kvm() || is_ibmz();
 	case VIRT_XEN:
 		return is_xen();
 	case VIRT_KVM:
 		return is_kvm();
+	case VIRT_IBMZ:
+		return is_ibmz();
+	case VIRT_IBMZ_LPAR:
+		return is_ibmz_vm(VIRT_IBMZ_LPAR);
+	case VIRT_IBMZ_ZVM:
+		return is_ibmz_vm(VIRT_IBMZ_ZVM);
 	case VIRT_OTHER:
 		return 0;
 	}