[kvm-unit-tests,2/3] s390x: Beautify pfmf report strings
diff mbox series

Message ID 20190219084913.198737-3-frankja@linux.ibm.com
State New
Headers show
Series
  • s390x: Report string cleanup
Related show

Commit Message

Janosch Frank Feb. 19, 2019, 8:49 a.m. UTC
Use a 4k/1m prefix rather than mangling it into the report string.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 s390x/pfmf.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

Thomas Huth Feb. 25, 2019, 12:39 p.m. UTC | #1
On 19/02/2019 09.49, Janosch Frank wrote:
> Use a 4k/1m prefix rather than mangling it into the report string.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>  s390x/pfmf.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/s390x/pfmf.c b/s390x/pfmf.c
> index 4cc6bd1..340b0bd 100644
> --- a/s390x/pfmf.c
> +++ b/s390x/pfmf.c
> @@ -64,6 +64,7 @@ static void test_4k_key(void)
>  	union r1 r1;
>  	union skey skey;
>  
> +	report_prefix_push("4K");
>  	r1.val = 0;
>  	r1.reg.sk = 1;
>  	r1.reg.fsc = FSC_4K;
> @@ -71,7 +72,8 @@ static void test_4k_key(void)
>  	pfmf(r1.val, (unsigned long) pagebuf);
>  	skey.val = get_storage_key((unsigned long) pagebuf);
>  	skey.val &= SKEY_ACC | SKEY_FP;
> -	report("set 4k", skey.val == 0x30);
> +	report("set storage keys", skey.val == 0x30);
> +	report_prefix_pop();
>  }
>  
>  static void test_1m_key(void)
> @@ -80,6 +82,7 @@ static void test_1m_key(void)
>  	union r1 r1;
>  	union skey skey;
>  
> +	report_prefix_push("1M");
>  	r1.val = 0;
>  	r1.reg.sk = 1;
>  	r1.reg.fsc = FSC_1M;
> @@ -89,11 +92,12 @@ static void test_1m_key(void)
>  		skey.val = get_storage_key((unsigned long) pagebuf + i * PAGE_SIZE);
>  		skey.val &= SKEY_ACC | SKEY_FP;
>  		if (skey.val != 0x30) {
> -			report("set 1M", false);
> +			report("set storage keys", false);
>  			return;

I think you need a report_prefix_pop() before that return now.

>  		}
>  	}
> -	report("set 1M", true);
> +	report("set storage keys", true);
> +	report_prefix_pop();
>  }

 Thomas
Janosch Frank Feb. 25, 2019, 2:29 p.m. UTC | #2
On 25.02.19 13:39, Thomas Huth wrote:
> On 19/02/2019 09.49, Janosch Frank wrote:
>> Use a 4k/1m prefix rather than mangling it into the report string.
>>
>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>> ---
>>  s390x/pfmf.c | 18 +++++++++++++-----
>>  1 file changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/s390x/pfmf.c b/s390x/pfmf.c
>> index 4cc6bd1..340b0bd 100644
>> --- a/s390x/pfmf.c
>> +++ b/s390x/pfmf.c
>> @@ -64,6 +64,7 @@ static void test_4k_key(void)
>>  	union r1 r1;
>>  	union skey skey;
>>  
>> +	report_prefix_push("4K");
>>  	r1.val = 0;
>>  	r1.reg.sk = 1;
>>  	r1.reg.fsc = FSC_4K;
>> @@ -71,7 +72,8 @@ static void test_4k_key(void)
>>  	pfmf(r1.val, (unsigned long) pagebuf);
>>  	skey.val = get_storage_key((unsigned long) pagebuf);
>>  	skey.val &= SKEY_ACC | SKEY_FP;
>> -	report("set 4k", skey.val == 0x30);
>> +	report("set storage keys", skey.val == 0x30);
>> +	report_prefix_pop();
>>  }
>>  
>>  static void test_1m_key(void)
>> @@ -80,6 +82,7 @@ static void test_1m_key(void)
>>  	union r1 r1;
>>  	union skey skey;
>>  
>> +	report_prefix_push("1M");
>>  	r1.val = 0;
>>  	r1.reg.sk = 1;
>>  	r1.reg.fsc = FSC_1M;
>> @@ -89,11 +92,12 @@ static void test_1m_key(void)
>>  		skey.val = get_storage_key((unsigned long) pagebuf + i * PAGE_SIZE);
>>  		skey.val &= SKEY_ACC | SKEY_FP;
>>  		if (skey.val != 0x30) {
>> -			report("set 1M", false);
>> +			report("set storage keys", false);
>>  			return;
> 
> I think you need a report_prefix_pop() before that return now.

I'll introduce a new bool rp = true, set it to false on error and break
put of the loop.

The report will be based on rp.

> 
>>  		}
>>  	}
>> -	report("set 1M", true);
>> +	report("set storage keys", true);
>> +	report_prefix_pop();
>>  }
> 
>  Thomas
>

Patch
diff mbox series

diff --git a/s390x/pfmf.c b/s390x/pfmf.c
index 4cc6bd1..340b0bd 100644
--- a/s390x/pfmf.c
+++ b/s390x/pfmf.c
@@ -64,6 +64,7 @@  static void test_4k_key(void)
 	union r1 r1;
 	union skey skey;
 
+	report_prefix_push("4K");
 	r1.val = 0;
 	r1.reg.sk = 1;
 	r1.reg.fsc = FSC_4K;
@@ -71,7 +72,8 @@  static void test_4k_key(void)
 	pfmf(r1.val, (unsigned long) pagebuf);
 	skey.val = get_storage_key((unsigned long) pagebuf);
 	skey.val &= SKEY_ACC | SKEY_FP;
-	report("set 4k", skey.val == 0x30);
+	report("set storage keys", skey.val == 0x30);
+	report_prefix_pop();
 }
 
 static void test_1m_key(void)
@@ -80,6 +82,7 @@  static void test_1m_key(void)
 	union r1 r1;
 	union skey skey;
 
+	report_prefix_push("1M");
 	r1.val = 0;
 	r1.reg.sk = 1;
 	r1.reg.fsc = FSC_1M;
@@ -89,11 +92,12 @@  static void test_1m_key(void)
 		skey.val = get_storage_key((unsigned long) pagebuf + i * PAGE_SIZE);
 		skey.val &= SKEY_ACC | SKEY_FP;
 		if (skey.val != 0x30) {
-			report("set 1M", false);
+			report("set storage keys", false);
 			return;
 		}
 	}
-	report("set 1M", true);
+	report("set storage keys", true);
+	report_prefix_pop();
 }
 
 static void test_4k_clear(void)
@@ -104,9 +108,11 @@  static void test_4k_clear(void)
 	r1.reg.cf = 1;
 	r1.reg.fsc = FSC_4K;
 
+	report_prefix_push("4K");
 	memset(pagebuf, 42, PAGE_SIZE);
 	pfmf(r1.val, (unsigned long) pagebuf);
-	report("clear 4k", !memcmp(pagebuf, pagebuf + PAGE_SIZE, PAGE_SIZE));
+	report("clear memory", !memcmp(pagebuf, pagebuf + PAGE_SIZE, PAGE_SIZE));
+	report_prefix_pop();
 }
 
 static void test_1m_clear(void)
@@ -119,11 +125,13 @@  static void test_1m_clear(void)
 	r1.reg.cf = 1;
 	r1.reg.fsc = FSC_1M;
 
+	report_prefix_push("1M");
 	memset(pagebuf, 42, PAGE_SIZE * 256);
 	pfmf(r1.val, (unsigned long) pagebuf);
 	for (i = 0; i < PAGE_SIZE * 256; i++)
 		sum |= pagebuf[i];
 	report("clear 1m", !sum);
+	report_prefix_pop();
 }
 
 int main(void)
@@ -141,8 +149,8 @@  int main(void)
 	memset(pagebuf, 0, PAGE_SIZE * 256);
 
 	test_4k_key();
-	test_1m_key();
 	test_4k_clear();
+	test_1m_key();
 	test_1m_clear();
 
 done: