From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, pmorel@linux.ibm.com, david@redhat.com,
cohuck@redhat.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org,
mihajlov@linux.ibm.com
Subject: [PATCH v2 11/13] s390x: protvirt: Move diag 308 data over SIDAD
Date: Fri, 29 Nov 2019 04:48:07 -0500 [thread overview]
Message-ID: <20191129094809.26684-12-frankja@linux.ibm.com> (raw)
In-Reply-To: <20191129094809.26684-1-frankja@linux.ibm.com>
For protected guests the IPIB is written/read to/from the satellite
block, so we need to make those accesses virtual to make them go
through KVM mem ops.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
target/s390x/diag.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index 5489fc721a..6d78759151 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -88,6 +88,7 @@ static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,
void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
{
CPUState *cs = env_cpu(env);
+ S390CPU *cpu = S390_CPU(cs);
uint64_t addr = env->regs[r1];
uint64_t subcode = env->regs[r3];
IplParameterBlock *iplb;
@@ -118,14 +119,27 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
if (diag308_parm_check(env, r1, addr, ra, false)) {
return;
}
+
iplb = g_new0(IplParameterBlock, 1);
- cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
+ if (!env->pv) {
+ cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
+ } else {
+ s390_cpu_virt_mem_read(cpu, 0, 0, iplb, sizeof(iplb->len));
+ s390_cpu_virt_mem_handle_exc(cpu, ra);
+ }
+
if (!iplb_valid_len(iplb)) {
env->regs[r1 + 1] = DIAG_308_RC_INVALID;
goto out;
}
- cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
+ if (!env->pv) {
+ cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
+ } else {
+ s390_cpu_virt_mem_read(cpu, 0, 0, iplb, be32_to_cpu(iplb->len));
+ s390_cpu_virt_mem_handle_exc(cpu, ra);
+ }
+
if (!iplb_valid_ccw(iplb) && !iplb_valid_fcp(iplb) &&
!(iplb_valid_se(iplb) && s390_ipl_pv_check_comp(iplb) >= 0)) {
@@ -149,7 +163,13 @@ out:
iplb = s390_ipl_get_iplb();
}
if (iplb) {
- cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len));
+ if (!env->pv) {
+ cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len));
+ } else {
+ s390_cpu_virt_mem_write(cpu, 0, 0, iplb,
+ be32_to_cpu(iplb->len));
+ s390_cpu_virt_mem_handle_exc(cpu, ra);
+ }
env->regs[r1 + 1] = DIAG_308_RC_OK;
} else {
env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;
--
2.20.1
next prev parent reply other threads:[~2019-11-29 10:40 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 9:47 [PATCH v2 00/13] s390x: Protected Virtualization support Janosch Frank
2019-11-29 9:47 ` [PATCH v2 01/13] s390x: protvirt: Add diag308 subcodes 8 - 10 Janosch Frank
2019-11-29 10:09 ` David Hildenbrand
2019-11-29 11:18 ` Janosch Frank
2019-11-29 11:41 ` Cornelia Huck
2019-11-29 12:40 ` Thomas Huth
2019-11-29 14:08 ` Janosch Frank
2019-12-02 9:20 ` Cornelia Huck
2019-11-29 9:47 ` [PATCH v2 02/13] Header sync protvirt Janosch Frank
2019-11-29 9:47 ` [PATCH v2 03/13] s390x: protvirt: Support unpack facility Janosch Frank
2019-11-29 10:19 ` David Hildenbrand
2019-12-04 10:48 ` Thomas Huth
2019-12-04 11:32 ` Janosch Frank
2019-12-04 11:34 ` Thomas Huth
2019-12-04 11:46 ` Janosch Frank
2019-11-29 9:48 ` [PATCH v2 04/13] s390x: protvirt: Handle diag 308 subcodes 0,1,3,4 Janosch Frank
2019-11-29 10:23 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 05/13] s390x: protvirt: Add pv state to cpu env Janosch Frank
2019-11-29 10:30 ` David Hildenbrand
2019-11-29 11:22 ` Janosch Frank
2019-12-06 9:50 ` Janosch Frank
2019-12-06 9:56 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 06/13] s390x: protvirt: KVM intercept changes Janosch Frank
2019-11-29 10:34 ` David Hildenbrand
2019-12-05 17:15 ` Cornelia Huck
2019-12-05 17:34 ` Janosch Frank
2019-12-05 17:46 ` Cornelia Huck
2019-12-06 7:44 ` Janosch Frank
2019-12-06 8:29 ` Cornelia Huck
2019-12-06 8:45 ` Janosch Frank
2019-12-06 9:08 ` Cornelia Huck
2019-12-06 9:30 ` Janosch Frank
2019-11-29 9:48 ` [PATCH v2 07/13] s390x: protvirt: SCLP interpretation Janosch Frank
2019-11-29 10:43 ` David Hildenbrand
2019-11-29 11:15 ` Janosch Frank
2019-11-29 11:27 ` David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 08/13] s390x: protvirt: Add new VCPU reset functions Janosch Frank
2019-11-29 10:47 ` David Hildenbrand
2019-11-29 11:21 ` Janosch Frank
2019-11-29 11:24 ` David Hildenbrand
2019-12-04 11:58 ` Thomas Huth
2019-12-04 12:44 ` Janosch Frank
2019-11-29 9:48 ` [PATCH v2 09/13] s390x: Exit on vcpu reset error Janosch Frank
2019-11-29 9:48 ` [PATCH v2 10/13] s390x: protvirt: Set guest IPL PSW Janosch Frank
2019-11-29 11:30 ` David Hildenbrand
2019-11-29 11:47 ` David Hildenbrand
2019-11-29 9:48 ` Janosch Frank [this message]
2019-11-29 11:34 ` [PATCH v2 11/13] s390x: protvirt: Move diag 308 data over SIDAD David Hildenbrand
2019-11-29 9:48 ` [PATCH v2 12/13] s390x: protvirt: Disable address checks for PV guest IO emulation Janosch Frank
2019-11-29 11:42 ` David Hildenbrand
2019-12-04 12:16 ` Thomas Huth
2019-12-05 17:44 ` Cornelia Huck
2019-11-29 9:48 ` [PATCH v2 13/13] s390x: protvirt: Handle SIGP store status correctly Janosch Frank
2019-11-29 11:04 ` Thomas Huth
2019-11-29 11:08 ` David Hildenbrand
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=20191129094809.26684-12-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=mihajlov@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.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).