[prev in list] [next in list] [prev in thread] [next in thread]
List: kvm-ppc
Subject: [kvm-unit-tests PULL 2/5] s390x: Only look at relevant skey bits
From: Thomas Huth <thuth () redhat ! com>
Date: 2019-02-28 16:51:57
Message-ID: 1551372720-17321-3-git-send-email-thuth () redhat ! com
[Download RAW message or body]
From: Janosch Frank <frankja@linux.ibm.com>
Reference and change indication should not be consulted when checking
for ACC and FP values of storage keys.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
lib/s390x/asm/mem.h | 5 +++++
s390x/pfmf.c | 6 +++++-
s390x/skey.c | 15 +++++++++++----
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/lib/s390x/asm/mem.h b/lib/s390x/asm/mem.h
index 909e6d4..75bd778 100644
--- a/lib/s390x/asm/mem.h
+++ b/lib/s390x/asm/mem.h
@@ -10,6 +10,11 @@
#ifndef _ASM_S390_MEM_H
#define _ASM_S390_MEM_H
+#define SKEY_ACC 0xf0
+#define SKEY_FP 0x08
+#define SKEY_RF 0x04
+#define SKEY_CH 0x02
+
union skey {
struct {
uint8_t acc : 4;
diff --git a/s390x/pfmf.c b/s390x/pfmf.c
index 5e61267..4cc6bd1 100644
--- a/s390x/pfmf.c
+++ b/s390x/pfmf.c
@@ -70,6 +70,7 @@ static void test_4k_key(void)
r1.reg.key = 0x30;
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);
}
@@ -77,6 +78,7 @@ static void test_1m_key(void)
{
int i;
union r1 r1;
+ union skey skey;
r1.val = 0;
r1.reg.sk = 1;
@@ -84,7 +86,9 @@ static void test_1m_key(void)
r1.reg.key = 0x30;
pfmf(r1.val, (unsigned long) pagebuf);
for (i = 0; i < 256; i++) {
- if (get_storage_key((unsigned long) pagebuf + i * PAGE_SIZE) != 0x30) {
+ 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;
}
diff --git a/s390x/skey.c b/s390x/skey.c
index 1949533..f4894f1 100644
--- a/s390x/skey.c
+++ b/s390x/skey.c
@@ -35,9 +35,10 @@ static void test_set_mb(void)
while (addr < end)
addr = set_storage_key_mb(addr, skey.val);
- ret1.val = get_storage_key(end - PAGE_SIZE);
- ret2.val = get_storage_key(end - PAGE_SIZE * 2);
- report("multi block", ret1.val == ret2.val && ret1.val == skey.val);
+ ret1.val = get_storage_key(end - PAGE_SIZE) & (SKEY_ACC | SKEY_FP);
+ ret2.val = get_storage_key(end - PAGE_SIZE * 2) & (SKEY_ACC | SKEY_FP);
+ report("multi block",
+ ret1.val == ret2.val && ret1.val == skey.val);
}
static void test_chg(void)
@@ -60,7 +61,13 @@ static void test_set(void)
ret.val = get_storage_key(page0);
set_storage_key(page0, skey.val, 0);
ret.val = get_storage_key(page0);
- report("set key test", skey.val == ret.val);
+ /*
+ * For all set tests we only test the ACC and FP bits. RF and
+ * CH are set by the machine for memory references and changes
+ * and hence might change between a set and a get.
+ */
+ report("set key test",
+ skey.str.acc == ret.str.acc && skey.str.fp == ret.str.fp);
}
static void test_priv(void)
--
1.8.3.1
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic