From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Laurent Vivier <laurent@vivier.eu>,
Richard Henderson <richard.henderson@linaro.org>,
David Hildenbrand <david@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>,
qemu-devel@nongnu.org, qemu-s390x@nongnu.org,
Ilya Leoshkevich <iii@linux.ibm.com>,
qemu-stable@nongnu.org
Subject: [PATCH v2 05/12] target/s390x: Fix LRA overwriting the top 32 bits on DAT error
Date: Tue, 4 Jul 2023 10:12:29 +0200 [thread overview]
Message-ID: <20230704081506.276055-6-iii@linux.ibm.com> (raw)
In-Reply-To: <20230704081506.276055-1-iii@linux.ibm.com>
When a DAT error occurs, LRA is supposed to write the error information
to the bottom 32 bits of R1, and leave the top 32 bits of R1 alone.
Fix by passing the original value of R1 into helper and copying the
top 32 bits to the return value.
Fixes: d8fe4a9c284f ("target-s390: Convert LRA")
Cc: qemu-stable@nongnu.org
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
target/s390x/helper.h | 2 +-
target/s390x/tcg/mem_helper.c | 4 ++--
target/s390x/tcg/translate.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 6bc01df73d7..05102578fc9 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -355,7 +355,7 @@ DEF_HELPER_FLAGS_4(idte, TCG_CALL_NO_RWG, void, env, i64, i64, i32)
DEF_HELPER_FLAGS_4(ipte, TCG_CALL_NO_RWG, void, env, i64, i64, i32)
DEF_HELPER_FLAGS_1(ptlb, TCG_CALL_NO_RWG, void, env)
DEF_HELPER_FLAGS_1(purge, TCG_CALL_NO_RWG, void, env)
-DEF_HELPER_2(lra, i64, env, i64)
+DEF_HELPER_3(lra, i64, env, i64, i64)
DEF_HELPER_1(per_check_exception, void, env)
DEF_HELPER_FLAGS_3(per_branch, TCG_CALL_NO_RWG, void, env, i64, i64)
DEF_HELPER_FLAGS_2(per_ifetch, TCG_CALL_NO_RWG, void, env, i64)
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 84ad85212c9..f417fb1183c 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -2356,7 +2356,7 @@ void HELPER(purge)(CPUS390XState *env)
}
/* load real address */
-uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr)
+uint64_t HELPER(lra)(CPUS390XState *env, uint64_t r1, uint64_t addr)
{
uint64_t asc = env->psw.mask & PSW_MASK_ASC;
uint64_t ret, tec;
@@ -2370,7 +2370,7 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr)
exc = mmu_translate(env, addr, MMU_S390_LRA, asc, &ret, &flags, &tec);
if (exc) {
cc = 3;
- ret = exc | 0x80000000;
+ ret = (r1 & 0xFFFFFFFF00000000ULL) | exc | 0x80000000;
} else {
cc = 0;
ret |= addr & ~TARGET_PAGE_MASK;
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 0cef6efbef4..a6079ab7b4f 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -2932,7 +2932,7 @@ static DisasJumpType op_lctlg(DisasContext *s, DisasOps *o)
static DisasJumpType op_lra(DisasContext *s, DisasOps *o)
{
- gen_helper_lra(o->out, cpu_env, o->in2);
+ gen_helper_lra(o->out, cpu_env, o->out, o->in2);
set_cc_static(s);
return DISAS_NEXT;
}
--
2.41.0
next prev parent reply other threads:[~2023-07-04 8:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-04 8:12 [PATCH v2 00/12] target/s390x: Miscellaneous TCG fixes Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 01/12] linux-user: elfload: Add more initial s390x PSW bits Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 02/12] target/s390x: Fix EPSW CC reporting Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 03/12] target/s390x: Fix MDEB and MDEBR Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 04/12] target/s390x: Fix MVCRL with a large value in R0 Ilya Leoshkevich
2023-07-04 8:12 ` Ilya Leoshkevich [this message]
2023-07-04 8:16 ` [PATCH v2 05/12] target/s390x: Fix LRA overwriting the top 32 bits on DAT error David Hildenbrand
2023-07-04 8:12 ` [PATCH v2 06/12] target/s390x: Fix LRA when DAT is off Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 07/12] target/s390x: Fix relative long instructions with large offsets Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 08/12] tests/tcg/s390x: Test EPSW Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 09/12] tests/tcg/s390x: Test LARL with a large offset Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 10/12] tests/tcg/s390x: Test LRA Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 11/12] tests/tcg/s390x: Test MDEB and MDEBR Ilya Leoshkevich
2023-07-04 8:12 ` [PATCH v2 12/12] tests/tcg/s390x: Test MVCRL with a large value in R0 Ilya Leoshkevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230704081506.276055-6-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=david@redhat.com \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).