| From 33d4e21cfd236aecd9e4dbe8228d058fd1f22400 Mon Sep 17 00:00:00 2001 |
| From: Thomas Huth <thuth@redhat.com> |
| Date: Fri, 29 May 2020 05:54:12 -0400 |
| Subject: [PATCH 30/42] s390x: protvirt: Move diag 308 data over SIDA |
| |
| RH-Author: Thomas Huth <thuth@redhat.com> |
| Message-id: <20200529055420.16855-31-thuth@redhat.com> |
| Patchwork-id: 97048 |
| O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 30/38] s390x: protvirt: Move diag 308 data over SIDA |
| Bugzilla: 1828317 |
| RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com> |
| RH-Acked-by: Cornelia Huck <cohuck@redhat.com> |
| RH-Acked-by: David Hildenbrand <david@redhat.com> |
| |
| From: Janosch Frank <frankja@linux.ibm.com> |
| |
| For protected guests the IPIB is written/read to/from the SIDA, so we |
| need those accesses to go through s390_cpu_pv_mem_read/write(). |
| |
| Signed-off-by: Janosch Frank <frankja@linux.ibm.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> |
| Message-Id: <20200319131921.2367-12-frankja@linux.ibm.com> |
| Signed-off-by: Cornelia Huck <cohuck@redhat.com> |
| (cherry picked from commit 9c61e11238cfa8f70e3eb90aac5d3e5646e5432f) |
| Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com> |
| |
| target/s390x/diag.c | 25 ++++++++++++++++++++----- |
| 1 file changed, 20 insertions(+), 5 deletions(-) |
| |
| diff --git a/target/s390x/diag.c b/target/s390x/diag.c |
| index b2cbefb8cf..1a48429564 100644 |
| |
| |
| @@ -75,6 +75,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) |
| { |
| bool valid; |
| CPUState *cs = env_cpu(env); |
| + S390CPU *cpu = S390_CPU(cs); |
| uint64_t addr = env->regs[r1]; |
| uint64_t subcode = env->regs[r3]; |
| IplParameterBlock *iplb; |
| @@ -111,13 +112,22 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) |
| return; |
| } |
| iplb = g_new0(IplParameterBlock, 1); |
| - cpu_physical_memory_read(addr, iplb, sizeof(iplb->len)); |
| + if (!s390_is_pv()) { |
| + cpu_physical_memory_read(addr, iplb, sizeof(iplb->len)); |
| + } else { |
| + s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len)); |
| + } |
| + |
| 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 (!s390_is_pv()) { |
| + cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len)); |
| + } else { |
| + s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len)); |
| + } |
| |
| valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : iplb_valid(iplb); |
| if (!valid) { |
| @@ -140,12 +150,17 @@ out: |
| } else { |
| iplb = s390_ipl_get_iplb(); |
| } |
| - if (iplb) { |
| + if (!iplb) { |
| + env->regs[r1 + 1] = DIAG_308_RC_NO_CONF; |
| + return; |
| + } |
| + |
| + if (!s390_is_pv()) { |
| cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->len)); |
| - env->regs[r1 + 1] = DIAG_308_RC_OK; |
| } else { |
| - env->regs[r1 + 1] = DIAG_308_RC_NO_CONF; |
| + s390_cpu_pv_mem_write(cpu, 0, iplb, be32_to_cpu(iplb->len)); |
| } |
| + env->regs[r1 + 1] = DIAG_308_RC_OK; |
| return; |
| case DIAG308_PV_START: |
| iplb = s390_ipl_get_iplb_pv(); |
| -- |
| 2.27.0 |
| |