All of lore.kernel.org
 help / color / mirror / Atom feed
From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
	david@redhat.com
Subject: [PATCH v10 12/16] s390x: protvirt: Disable address checks for PV guest IO emulation
Date: Wed, 18 Mar 2020 10:30:43 -0400	[thread overview]
Message-ID: <20200318143047.2335-13-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200318143047.2335-1-frankja@linux.ibm.com>

IO instruction data is routed through SIDAD for protected guests, so
adresses do not need to be checked, as this is kernel memory which is
always available.

Also the instruction data always starts at offset 0 of the SIDAD.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---
 target/s390x/ioinst.c | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
index 0e840cc5792afe02..8828482eec306a2b 100644
--- a/target/s390x/ioinst.c
+++ b/target/s390x/ioinst.c
@@ -16,6 +16,25 @@
 #include "hw/s390x/ioinst.h"
 #include "trace.h"
 #include "hw/s390x/s390-pci-bus.h"
+#include "hw/s390x/pv.h"
+
+/* All I/O instructions but chsc use the s format */
+static uint64_t get_address_from_regs(CPUS390XState *env, uint32_t ipb,
+                                      uint8_t *ar)
+{
+    /*
+     * Addresses for protected guests are all offsets into the
+     * satellite block which holds the IO control structures. Those
+     * control structures are always starting at offset 0 and are
+     * always aligned and accessible. So we can return 0 here which
+     * will pass the following address checks.
+     */
+    if (s390_is_pv()) {
+        *ar = 0;
+        return 0;
+    }
+    return decode_basedisp_s(env, ipb, ar);
+}
 
 int ioinst_disassemble_sch_ident(uint32_t value, int *m, int *cssid, int *ssid,
                                  int *schid)
@@ -114,7 +133,7 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)
     CPUS390XState *env = &cpu->env;
     uint8_t ar;
 
-    addr = decode_basedisp_s(env, ipb, &ar);
+    addr = get_address_from_regs(env, ipb, &ar);
     if (addr & 3) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
         return;
@@ -171,7 +190,7 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)
     CPUS390XState *env = &cpu->env;
     uint8_t ar;
 
-    addr = decode_basedisp_s(env, ipb, &ar);
+    addr = get_address_from_regs(env, ipb, &ar);
     if (addr & 3) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
         return;
@@ -203,7 +222,7 @@ void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb, uintptr_t ra)
     CPUS390XState *env = &cpu->env;
     uint8_t ar;
 
-    addr = decode_basedisp_s(env, ipb, &ar);
+    addr = get_address_from_regs(env, ipb, &ar);
     if (addr & 3) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
         return;
@@ -234,7 +253,7 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb,
     CPUS390XState *env = &cpu->env;
     uint8_t ar;
 
-    addr = decode_basedisp_s(env, ipb, &ar);
+    addr = get_address_from_regs(env, ipb, &ar);
     if (addr & 3) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
         return;
@@ -303,7 +322,7 @@ int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)
         return -EIO;
     }
     trace_ioinst_sch_id("tsch", cssid, ssid, schid);
-    addr = decode_basedisp_s(env, ipb, &ar);
+    addr = get_address_from_regs(env, ipb, &ar);
     if (addr & 3) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
         return -EIO;
@@ -601,7 +620,7 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb, uintptr_t ra)
 {
     ChscReq *req;
     ChscResp *res;
-    uint64_t addr;
+    uint64_t addr = 0;
     int reg;
     uint16_t len;
     uint16_t command;
@@ -610,7 +629,9 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb, uintptr_t ra)
 
     trace_ioinst("chsc");
     reg = (ipb >> 20) & 0x00f;
-    addr = env->regs[reg];
+    if (!s390_is_pv()) {
+        addr = env->regs[reg];
+    }
     /* Page boundary? */
     if (addr & 0xfff) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
-- 
2.25.1



  parent reply	other threads:[~2020-03-18 14:39 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-18 14:30 [PATCH v10 00/16] s390x: Protected Virtualization support Janosch Frank
2020-03-18 14:30 ` [PATCH v10 01/16] s390x: Move diagnose 308 subcodes and rcs into ipl.h Janosch Frank
2020-03-18 16:42   ` Cornelia Huck
2020-03-18 20:29   ` Christian Borntraeger
2020-03-19 12:42   ` Claudio Imbrenda
2020-03-18 14:30 ` [PATCH v10 02/16] Sync pv Janosch Frank
2020-03-18 14:30 ` [PATCH v10 03/16] s390x: protvirt: Support unpack facility Janosch Frank
2020-03-19 11:08   ` Cornelia Huck
2020-03-19 11:55     ` Janosch Frank
2020-03-19 11:57       ` Christian Borntraeger
2020-03-19 11:57         ` Janosch Frank
2020-03-18 14:30 ` [PATCH v10 04/16] s390x: protvirt: Add migration blocker Janosch Frank
2020-03-18 14:30 ` [PATCH v10 05/16] s390x: protvirt: Inhibit balloon when switching to protected mode Janosch Frank
2020-03-18 17:27   ` Cornelia Huck
2020-03-18 14:30 ` [PATCH v10 06/16] s390x: protvirt: KVM intercept changes Janosch Frank
2020-03-18 14:30 ` [PATCH v10 07/16] s390x: Add SIDA memory ops Janosch Frank
2020-03-18 14:30 ` [PATCH v10 08/16] s390x: protvirt: Move STSI data over SIDAD Janosch Frank
2020-03-18 17:57   ` Cornelia Huck
2020-03-18 14:30 ` [PATCH v10 09/16] s390x: protvirt: SCLP interpretation Janosch Frank
2020-03-19 12:09   ` Cornelia Huck
2020-03-19 12:46     ` Janosch Frank
2020-03-19 12:50       ` Cornelia Huck
2020-03-18 14:30 ` [PATCH v10 10/16] s390x: protvirt: Set guest IPL PSW Janosch Frank
2020-03-18 18:00   ` Cornelia Huck
2020-03-19  8:19     ` Janosch Frank
2020-03-18 14:30 ` [PATCH v10 11/16] s390x: protvirt: Move diag 308 data over SIDA Janosch Frank
2020-03-19 12:12   ` Cornelia Huck
2020-03-18 14:30 ` Janosch Frank [this message]
2020-03-18 14:30 ` [PATCH v10 13/16] s390x: protvirt: Move IO control structures " Janosch Frank
2020-03-19 12:23   ` Cornelia Huck
2020-03-19 12:50     ` Janosch Frank
2020-03-18 14:30 ` [PATCH v10 14/16] s390x: protvirt: Handle SIGP store status correctly Janosch Frank
2020-03-18 14:30 ` [PATCH v10 15/16] docs: system: Add protvirt docs Janosch Frank
2020-03-18 14:53   ` Cornelia Huck
2020-03-19  9:04     ` Janosch Frank
2020-03-19  9:59       ` Cornelia Huck
2020-03-18 16:50   ` Christian Borntraeger
2020-03-18 14:30 ` [PATCH v10 16/16] s390x: Add unpack facility feature to GA1 Janosch Frank
2020-03-18 16:43   ` 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=20200318143047.2335-13-frankja@linux.ibm.com \
    --to=frankja@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.