From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: Janosch Frank <frankja@linux.ibm.com>
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
qemu-devel@nongnu.org, david@redhat.com
Subject: Re: [PATCH v9 12/15] s390x: protvirt: Move IO control structures over SIDA
Date: Fri, 13 Mar 2020 13:57:42 +0100 [thread overview]
Message-ID: <20200313135742.37a78d26@p-imbrenda> (raw)
In-Reply-To: <20200311132151.172389-13-frankja@linux.ibm.com>
On Wed, 11 Mar 2020 09:21:48 -0400
Janosch Frank <frankja@linux.ibm.com> wrote:
> For protected guests, we need to put the IO emulation results into the
> SIDA, so SIE will write them into the guest at the next entry.
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
> target/s390x/ioinst.c | 87
> ++++++++++++++++++++++++++++++------------- 1 file changed, 61
> insertions(+), 26 deletions(-)
>
> diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
> index 481d789de9e09a04..61095bdc9ffef436 100644
> --- a/target/s390x/ioinst.c
> +++ b/target/s390x/ioinst.c
> @@ -136,9 +136,13 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t
> reg1, uint32_t ipb, uintptr_t ra) s390_program_interrupt(env,
> PGM_SPECIFICATION, ra); return;
> }
> - if (s390_cpu_virt_mem_read(cpu, addr, ar, &schib,
> sizeof(schib))) {
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> - return;
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_read(cpu, addr, &schib, sizeof(schib));
> + } else {
> + if (s390_cpu_virt_mem_read(cpu, addr, ar, &schib,
> sizeof(schib))) {
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> + return;
> + }
> }
> if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid,
> &schid) || !ioinst_schib_valid(&schib)) {
> @@ -193,9 +197,13 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t
> reg1, uint32_t ipb, uintptr_t ra) s390_program_interrupt(env,
> PGM_SPECIFICATION, ra); return;
> }
> - if (s390_cpu_virt_mem_read(cpu, addr, ar, &orig_orb,
> sizeof(orb))) {
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> - return;
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_read(cpu, addr, &orig_orb, sizeof(orb));
> + } else {
> + if (s390_cpu_virt_mem_read(cpu, addr, ar, &orig_orb,
> sizeof(orb))) {
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> + return;
> + }
> }
> copy_orb_from_guest(&orb, &orig_orb);
> if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid,
> &schid) || @@ -229,14 +237,19 @@ void ioinst_handle_stcrw(S390CPU
> *cpu, uint32_t ipb, uintptr_t ra) cc = css_do_stcrw(&crw);
> /* 0 - crw stored, 1 - zeroes stored */
>
> - if (s390_cpu_virt_mem_write(cpu, addr, ar, &crw, sizeof(crw)) ==
> 0) {
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_write(cpu, addr, &crw, sizeof(crw));
> setcc(cpu, cc);
> } else {
> - if (cc == 0) {
> - /* Write failed: requeue CRW since STCRW is suppressing
> */
> - css_undo_stcrw(&crw);
> + if (s390_cpu_virt_mem_write(cpu, addr, ar, &crw,
> sizeof(crw)) == 0) {
> + setcc(cpu, cc);
> + } else {
> + if (cc == 0) {
> + /* Write failed: requeue CRW since STCRW is
> suppressing */
> + css_undo_stcrw(&crw);
> + }
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> }
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> }
> }
>
> @@ -258,6 +271,9 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t
> reg1, uint32_t ipb, }
>
> if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid,
> &schid)) {
> + if (s390_is_pv()) {
> + return;
> + }
If the operand is invalid, should we not inject an operand exception?
If instead the Ultravisor or KVM make sure that we don't end up here,
then, why handle this at all?
> /*
> * As operand exceptions have a lower priority than access
> exceptions,
> * we check whether the memory area is writeable (injecting
> the @@ -290,14 +306,19 @@ void ioinst_handle_stsch(S390CPU *cpu,
> uint64_t reg1, uint32_t ipb, }
> }
> if (cc != 3) {
> - if (s390_cpu_virt_mem_write(cpu, addr, ar, &schib,
> - sizeof(schib)) != 0) {
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> - return;
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_write(cpu, addr, &schib, sizeof(schib));
> + } else {
> + if (s390_cpu_virt_mem_write(cpu, addr, ar, &schib,
> + sizeof(schib)) != 0) {
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> + return;
> + }
> }
> } else {
> /* Access exceptions have a higher priority than cc3 */
> - if (s390_cpu_virt_mem_check_write(cpu, addr, ar,
> sizeof(schib)) != 0) {
> + if (!s390_is_pv() &&
> + s390_cpu_virt_mem_check_write(cpu, addr, ar,
> sizeof(schib)) != 0) { s390_cpu_virt_mem_handle_exc(cpu, ra);
> return;
> }
> @@ -334,15 +355,20 @@ int ioinst_handle_tsch(S390CPU *cpu, uint64_t
> reg1, uint32_t ipb, uintptr_t ra) }
> /* 0 - status pending, 1 - not status pending, 3 - not
> operational */ if (cc != 3) {
> - if (s390_cpu_virt_mem_write(cpu, addr, ar, &irb, irb_len) !=
> 0) {
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> - return -EFAULT;
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_write(cpu, addr, &irb, irb_len);
> + } else {
> + if (s390_cpu_virt_mem_write(cpu, addr, ar, &irb,
> irb_len) != 0) {
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> + return -EFAULT;
> + }
> }
> css_do_tsch_update_subch(sch);
> } else {
> irb_len = sizeof(irb) - sizeof(irb.emw);
> /* Access exceptions have a higher priority than cc3 */
> - if (s390_cpu_virt_mem_check_write(cpu, addr, ar, irb_len) !=
> 0) {
> + if (!s390_is_pv() &&
> + s390_cpu_virt_mem_check_write(cpu, addr, ar, irb_len) !=
> 0) { s390_cpu_virt_mem_handle_exc(cpu, ra);
> return -EFAULT;
> }
> @@ -640,9 +666,13 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t
> ipb, uintptr_t ra)
> * present CHSC sub-handlers ... if we ever need more, we should
> take
> * care of req->len here first.
> */
> - if (s390_cpu_virt_mem_read(cpu, addr, reg, buf,
> sizeof(ChscReq))) {
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> - return;
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_read(cpu, addr, buf, sizeof(ChscReq));
> + } else {
> + if (s390_cpu_virt_mem_read(cpu, addr, reg, buf,
> sizeof(ChscReq))) {
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> + return;
> + }
> }
> req = (ChscReq *)buf;
> len = be16_to_cpu(req->len);
> @@ -673,11 +703,16 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t
> ipb, uintptr_t ra) break;
> }
>
> - if (!s390_cpu_virt_mem_write(cpu, addr + len, reg, res,
> - be16_to_cpu(res->len))) {
> + if (s390_is_pv()) {
> + s390_cpu_pv_mem_write(cpu, addr + len, res,
> be16_to_cpu(res->len)); setcc(cpu, 0); /* Command execution
> complete */ } else {
> - s390_cpu_virt_mem_handle_exc(cpu, ra);
> + if (!s390_cpu_virt_mem_write(cpu, addr + len, reg, res,
> + be16_to_cpu(res->len))) {
> + setcc(cpu, 0); /* Command execution complete */
> + } else {
> + s390_cpu_virt_mem_handle_exc(cpu, ra);
> + }
> }
> }
>
next prev parent reply other threads:[~2020-03-13 13:06 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 13:21 [PATCH v9 00/15] s390x: Protected Virtualization support Janosch Frank
2020-03-11 13:21 ` [PATCH v9 01/15] Sync pv Janosch Frank
2020-03-11 13:21 ` [PATCH v9 02/15] s390x: protvirt: Support unpack facility Janosch Frank
2020-03-12 8:33 ` Christian Borntraeger
2020-03-13 9:35 ` Janosch Frank
2020-03-13 9:52 ` [PATCH v9] fixup! Fix subcode/pbt Janosch Frank
2020-03-13 14:30 ` Christian Borntraeger
2020-03-13 14:44 ` Janosch Frank
2020-03-16 14:27 ` Cornelia Huck
2020-03-16 14:47 ` Janosch Frank
2020-03-16 14:54 ` Cornelia Huck
2020-03-16 15:04 ` Christian Borntraeger
2020-03-16 17:57 ` Cornelia Huck
2020-03-16 19:42 ` Christian Borntraeger
2020-03-17 9:53 ` Cornelia Huck
2020-03-16 15:05 ` Janosch Frank
2020-03-16 17:58 ` Cornelia Huck
[not found] ` <a0edb6d5-284f-5f10-02e5-d2f252043d71@redhat.com>
2020-03-12 8:54 ` [PATCH v9 02/15] s390x: protvirt: Support unpack facility Janosch Frank
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-11 13:21 ` [PATCH v9 03/15] s390x: protvirt: Add migration blocker Janosch Frank
2020-03-12 8:42 ` Christian Borntraeger
2020-03-12 9:34 ` Janosch Frank
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-16 14:49 ` Cornelia Huck
2020-03-11 13:21 ` [PATCH v9 04/15] s390x: protvirt: Inhibit balloon when switching to protected mode Janosch Frank
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-18 11:42 ` Cornelia Huck
2020-03-18 12:30 ` Janosch Frank
2020-03-11 13:21 ` [PATCH v9 05/15] s390x: protvirt: KVM intercept changes Janosch Frank
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-17 9:56 ` Cornelia Huck
2020-03-11 13:21 ` [PATCH v9 06/15] s390x: Add SIDA memory ops Janosch Frank
2020-03-12 8:50 ` Christian Borntraeger
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-17 10:24 ` Cornelia Huck
2020-03-17 11:56 ` Janosch Frank
2020-03-11 13:21 ` [PATCH v9 07/15] s390x: protvirt: Move STSI data over SIDAD Janosch Frank
2020-03-12 10:42 ` Christian Borntraeger
2020-03-12 11:20 ` Janosch Frank
2020-03-17 10:28 ` Cornelia Huck
2020-03-17 10:32 ` Janosch Frank
2020-03-17 10:41 ` Cornelia Huck
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-11 13:21 ` [PATCH v9 08/15] s390x: protvirt: SCLP interpretation Janosch Frank
2020-03-11 13:24 ` David Hildenbrand
2020-03-11 13:31 ` Janosch Frank
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-13 13:14 ` Christian Borntraeger
2020-03-17 11:05 ` Cornelia Huck
2020-03-17 11:54 ` Janosch Frank
2020-03-17 12:01 ` Cornelia Huck
2020-03-11 13:21 ` [PATCH v9 09/15] s390x: protvirt: Set guest IPL PSW Janosch Frank
2020-03-12 15:08 ` Christian Borntraeger
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-13 14:21 ` Janosch Frank
2020-03-13 14:22 ` Christian Borntraeger
2020-03-13 14:29 ` Claudio Imbrenda
2020-03-13 14:32 ` Claudio Imbrenda
2020-03-11 13:21 ` [PATCH v9 10/15] s390x: protvirt: Move diag 308 data over SIDA Janosch Frank
2020-03-12 15:17 ` Christian Borntraeger
2020-03-12 16:05 ` Janosch Frank
2020-03-12 16:09 ` Christian Borntraeger
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-11 13:21 ` [PATCH v9 11/15] s390x: protvirt: Disable address checks for PV guest IO emulation Janosch Frank
2020-03-12 15:41 ` Christian Borntraeger
2020-03-12 16:07 ` Janosch Frank
2020-03-12 16:10 ` Christian Borntraeger
2020-03-12 16:17 ` Janosch Frank
2020-03-13 7:38 ` Christian Borntraeger
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-17 11:36 ` Cornelia Huck
2020-03-17 12:00 ` Janosch Frank
2020-03-11 13:21 ` [PATCH v9 12/15] s390x: protvirt: Move IO control structures over SIDA Janosch Frank
2020-03-13 12:57 ` Claudio Imbrenda [this message]
2020-03-13 13:15 ` Janosch Frank
2020-03-11 13:21 ` [PATCH v9 13/15] s390x: protvirt: Handle SIGP store status correctly Janosch Frank
2020-03-12 15:51 ` Christian Borntraeger
2020-03-12 16:13 ` Janosch Frank
2020-03-13 7:39 ` Christian Borntraeger
2020-03-13 7:39 ` Christian Borntraeger
2020-03-17 16:48 ` Cornelia Huck
2020-03-13 12:57 ` Claudio Imbrenda
2020-03-11 13:21 ` [PATCH v9 14/15] docs: Add protvirt docs Janosch Frank
[not found] ` <569575c9-5819-f890-e218-99f3a23bee99@redhat.com>
2020-03-12 12:10 ` Janosch Frank
2020-03-13 13:00 ` Claudio Imbrenda
2020-03-13 13:18 ` Janosch Frank
2020-03-13 13:28 ` Peter Maydell
2020-03-17 18:23 ` Cornelia Huck
2020-03-18 8:41 ` Janosch Frank
2020-03-18 11:25 ` Cornelia Huck
2020-03-18 12:34 ` Janosch Frank
2020-03-11 13:21 ` [PATCH v9 15/15] s390x: Add unpack facility feature to GA1 Janosch Frank
2020-03-13 13:01 ` Claudio Imbrenda
2020-03-17 18:06 ` Cornelia Huck
2020-03-18 8:44 ` Janosch Frank
2020-03-18 9:27 ` Cornelia Huck
2020-03-18 9:42 ` Janosch Frank
2020-03-11 14:15 ` [PATCH v9 00/15] s390x: Protected Virtualization support no-reply
2020-03-11 14:36 ` no-reply
2020-03-12 16:25 ` [PATCH v9] s390x: protvirt: Fence huge pages Janosch Frank
2020-03-13 8:21 ` Christian Borntraeger
2020-03-16 10:06 ` Janosch Frank
2020-03-16 16:33 ` Christian Borntraeger
2020-03-17 16:57 ` Cornelia Huck
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=20200313135742.37a78d26@p-imbrenda \
--to=imbrenda@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/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).