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 07/13] s390x: protvirt: SCLP interpretation
Date: Fri, 29 Nov 2019 04:48:03 -0500 [thread overview]
Message-ID: <20191129094809.26684-8-frankja@linux.ibm.com> (raw)
In-Reply-To: <20191129094809.26684-1-frankja@linux.ibm.com>
SCLP for a protected guest is done over the SIDAD, so we need to use
the s390_cpu_virt_mem_* functions to access the SIDAD instead of guest
memory when reading/writing SCBs.
To not confuse the sclp emulation, we set 0x4000 as the SCCB address,
since the function that injects the sclp external interrupt would
reject a zero sccb address.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
hw/s390x/sclp.c | 17 +++++++++++++++++
include/hw/s390x/sclp.h | 2 ++
target/s390x/kvm.c | 5 +++++
3 files changed, 24 insertions(+)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index f57ce7b739..ca71ace664 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -193,6 +193,23 @@ static void sclp_execute(SCLPDevice *sclp, SCCB *sccb, uint32_t code)
}
}
+#define SCLP_PV_DUMMY_ADDR 0x4000
+int sclp_service_call_protected(CPUS390XState *env, uint64_t sccb,
+ uint32_t code)
+{
+ SCLPDevice *sclp = get_sclp_device();
+ SCLPDeviceClass *sclp_c = SCLP_GET_CLASS(sclp);
+ SCCB work_sccb;
+ hwaddr sccb_len = sizeof(SCCB);
+
+ s390_cpu_virt_mem_read(env_archcpu(env), 0, 0, &work_sccb, sccb_len);
+ sclp_c->execute(sclp, &work_sccb, code);
+ s390_cpu_virt_mem_write(env_archcpu(env), 0, 0, &work_sccb,
+ be16_to_cpu(work_sccb.h.length));
+ sclp_c->service_interrupt(sclp, SCLP_PV_DUMMY_ADDR);
+ return 0;
+}
+
int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code)
{
SCLPDevice *sclp = get_sclp_device();
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index c54413b78c..c0a3faa37d 100644
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -217,5 +217,7 @@ void s390_sclp_init(void);
void sclp_service_interrupt(uint32_t sccb);
void raise_irq_cpu_hotplug(void);
int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);
+int sclp_service_call_protected(CPUS390XState *env, uint64_t sccb,
+ uint32_t code);
#endif
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 3d9c44ba9d..b802d02ff5 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -1174,6 +1174,11 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run,
sccb = env->regs[ipbh0 & 0xf];
code = env->regs[(ipbh0 & 0xf0) >> 4];
+ if (run->s390_sieic.icptcode == ICPT_PV_INSTR) {
+ sclp_service_call_protected(env, sccb, code);
+ return;
+ }
+
r = sclp_service_call(env, sccb, code);
if (r < 0) {
kvm_s390_program_interrupt(cpu, -r);
--
2.20.1
next prev parent reply other threads:[~2019-11-29 10:22 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 ` Janosch Frank [this message]
2019-11-29 10:43 ` [PATCH v2 07/13] s390x: protvirt: SCLP interpretation 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 ` [PATCH v2 11/13] s390x: protvirt: Move diag 308 data over SIDAD Janosch Frank
2019-11-29 11:34 ` 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-8-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).