Re: [kvm-unit-tests PATCH v2 2/3] s390x: Beautify pfmf report strings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 28.02.19 12:26, Thomas Huth wrote:
> On 28/02/2019 09.35, Janosch Frank wrote:
>> Use a 4k/1m prefix rather than mangling it into the report string.
>>
>> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
>> ---
>>  s390x/pfmf.c | 21 +++++++++++++++------
>>  1 file changed, 15 insertions(+), 6 deletions(-)
>>
>> diff --git a/s390x/pfmf.c b/s390x/pfmf.c
>> index 4cc6bd1..21f4e6a 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,15 +72,18 @@ 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)
>>  {
>>  	int i;
>> +	bool rp = true;
>>  	union r1 r1;
>>  	union skey skey;
>>  
>> +	report_prefix_push("1M");
>>  	r1.val = 0;
>>  	r1.reg.sk = 1;
>>  	r1.reg.fsc = FSC_1M;
>> @@ -89,11 +93,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);
>> -			return;
>> +			rp = false;
>> +			break;
>>  		}
>>  	}
>> -	report("set 1M", true);
>> +	report("set storage keys", rp);
>> +	report_prefix_pop();
>>  }
>>  
>>  static void test_4k_clear(void)
>> @@ -104,9 +109,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 +126,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);
> 
> I'd suggest to replace "clear 1m" with "clear memory" here now, like you
> did in the 4k function.
> If you agree, I can also do that when picking up the patch, no need to
> respin just because of this.
> 
>  Thomas

Sure, go ahead
> 


Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Kernel Development]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Info]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Linux Media]     [Device Mapper]

  Powered by Linux