commit 380ac2bcce466f3b8f93eb749c7e85bfcf476cd6
author David Hildenbrand <david@redhat.com> Fri Sep 03 17:55:09 2021 +0200
committer Thomas Huth <thuth@redhat.com> Mon Sep 06 16:24:05 2021 +0200
tree b987e98e2b3ede78a69ecc7346c067986f98fa2f
parent 390191c6f6e2e912f45bc312464d59b84ca12db3

s390x/mmu_helper: avoid setting the storage key if nothing changed

Avoid setting the key if nothing changed.

Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210903155514.44772-9-david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>

target/s390x/mmu_helper.c

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index de6df92..e2b372e 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -301,7 +301,7 @@
 {
     static S390SKeysClass *skeyclass;
     static S390SKeysState *ss;
-    uint8_t key;
+    uint8_t key, old_key;
     int rc;
 
     /*
@@ -337,6 +337,7 @@
         trace_get_skeys_nonzero(rc);
         return;
     }
+    old_key = key;
 
     switch (rw) {
     case MMU_DATA_LOAD:
@@ -360,9 +361,11 @@
     /* Any store/fetch sets the reference bit */
     key |= SK_R;
 
-    rc = skeyclass->set_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key);
-    if (rc) {
-        trace_set_skeys_nonzero(rc);
+    if (key != old_key) {
+        rc = skeyclass->set_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key);
+        if (rc) {
+            trace_set_skeys_nonzero(rc);
+        }
     }
 }