diff options
| author | David Hildenbrand <david@redhat.com> | 2021-09-03 17:55:03 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-09-06 16:24:05 +0200 |
| commit | fe00c705fec7bf20f5832fd6d8245fd554097cfc (patch) | |
| tree | f7d6dec769c36bab51cfae8e8811b1eeed42c7fa /target/s390x | |
| parent | 634a0b51cb25800ebc585862121f764d02de7a28 (diff) | |
| download | qemu-fe00c705fec7bf20f5832fd6d8245fd554097cfc.zip qemu-fe00c705fec7bf20f5832fd6d8245fd554097cfc.tar.gz qemu-fe00c705fec7bf20f5832fd6d8245fd554097cfc.tar.bz2 | |
s390x/tcg: fix ignoring bit 63 when setting the storage key in SSKE
Right now we could set an 8-bit storage key via SSKE and retrieve it
again via ISKE, which is against the architecture description:
SSKE:
"
The new seven-bit storage-key value, or selected bits
thereof, is obtained from bit positions 56-62 of gen-
eral register R 1 . The contents of bit positions 0-55
and 63 of the register are ignored.
"
ISKE:
"
The seven-bit storage key is inserted in bit positions
56-62 of general register R 1 , and bit 63 is set to zero.
"
Let's properly ignore bit 63 to create the correct seven-bit storage key.
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210903155514.44772-3-david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/tcg/mem_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index e0befd0..3c0820d 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -2210,7 +2210,7 @@ void HELPER(sske)(CPUS390XState *env, uint64_t r1, uint64_t r2) skeyclass = S390_SKEYS_GET_CLASS(ss); } - key = (uint8_t) r1; + key = r1 & 0xfe; skeyclass->set_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key); /* * As we can only flush by virtual address and not all the entries |