Re: [PATCH v1 01/12] s390x/tcg: wrap address for RRBE

[Thomas Huth]

On 05/08/2021 17.27, David Hildenbrand wrote:

Let's wrap the address just like for SSKE and ISKE.

Signed-off-by: David Hildenbrand <da...@redhat.com>
---
  target/s390x/tcg/mem_helper.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 21a4de4067..e0befd0f03 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -2223,11 +2223,12 @@ void HELPER(sske)(CPUS390XState *env, uint64_t r1, 
uint64_t r2)
  uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2)
  {
      MachineState *ms = MACHINE(qdev_get_machine());
+    uint64_t addr = wrap_address(env, r2);
      static S390SKeysState *ss;
      static S390SKeysClass *skeyclass;
      uint8_t re, key;

- if (r2 > ms->ram_size) {

+    if (addr > ms->ram_size) {
          return 0;
      }

@@ -2236,14 +2237,14 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2)

          skeyclass = S390_SKEYS_GET_CLASS(ss);
      }

- if (skeyclass->get_skeys(ss, r2 / TARGET_PAGE_SIZE, 1, &key)) {

+    if (skeyclass->get_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key)) {
          return 0;
      }

re = key & (SK_R | SK_C);

      key &= ~SK_R;

- if (skeyclass->set_skeys(ss, r2 / TARGET_PAGE_SIZE, 1, &key)) {

+    if (skeyclass->set_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key)) {
          return 0;
      }

That's certainly the right thing to do!

Reviewed-by: Thomas Huth <th...@redhat.com>