qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v1] s390x/ioinst: Fix wrong MSCH alignment check on little endian
@ 2021-08-05 14:37 David Hildenbrand
  2021-08-05 15:21 ` Pierre Morel
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: David Hildenbrand @ 2021-08-05 14:37 UTC (permalink / raw)
  To: qemu-devel
  Cc: Thomas Huth, Pierre Morel, David Hildenbrand, Cornelia Huck,
	Richard Henderson, Halil Pasic, Christian Borntraeger, qemu-s390x

schib->pmcw.chars is 32bit, not 16bit. This fixes the kvm-unit-tests
"css" test, which fails with:

  FAIL: Channel Subsystem: measurement block format1: Unaligned MB origin:
  Program interrupt: expected(21) == received(0)

Because we end up not injecting an operand program exception.

Fixes: a54b8ac340c2 ("css: SCHIB measurement block origin must be aligned")
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Pierre Morel <pmorel@linux.ibm.com>
Cc: qemu-s390x@nongnu.org
Signed-off-by: David Hildenbrand <david@redhat.com>
---
 target/s390x/ioinst.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
index 4eb0a7a9f8..bdae5090bc 100644
--- a/target/s390x/ioinst.c
+++ b/target/s390x/ioinst.c
@@ -123,7 +123,7 @@ static int ioinst_schib_valid(SCHIB *schib)
     }
     /* for MB format 1 bits 26-31 of word 11 must be 0 */
     /* MBA uses words 10 and 11, it means align on 2**6 */
-    if ((be16_to_cpu(schib->pmcw.chars) & PMCW_CHARS_MASK_MBFC) &&
+    if ((be32_to_cpu(schib->pmcw.chars) & PMCW_CHARS_MASK_MBFC) &&
         (be64_to_cpu(schib->mba) & 0x03fUL)) {
         return 0;
     }
-- 
2.31.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-08-10 12:27 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-05 14:37 [PATCH v1] s390x/ioinst: Fix wrong MSCH alignment check on little endian David Hildenbrand
2021-08-05 15:21 ` Pierre Morel
2021-08-06  5:27 ` Thomas Huth
2021-08-06 11:19 ` Cornelia Huck
2021-08-06 11:30   ` David Hildenbrand
2021-08-06 14:17     ` Philippe Mathieu-Daudé
2021-08-06 14:35       ` David Hildenbrand
2021-08-06 14:49         ` Cornelia Huck
2021-08-09 23:09 ` Halil Pasic
2021-08-10 12:27 ` Cornelia Huck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).