On Wed, 11 Mar 2020 09:21:46 -0400
Janosch Frank <fran...@linux.ibm.com> wrote:
> 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 <fran...@linux.ibm.com>
> Reviewed-by: David Hildenbrand <da...@redhat.com>
> ---
> target/s390x/diag.c | 27 +++++++++++++++++++++------
> 1 file changed, 21 insertions(+), 6 deletions(-)
>
> diff --git a/target/s390x/diag.c b/target/s390x/diag.c
> index b245e557037ded06..a733485caf162111 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;
> @@ -124,13 +125,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));
> + }
>
> if (!iplb_valid(iplb)) {
> env->regs[r1 + 1] = DIAG_308_RC_INVALID;
> @@ -152,12 +162,17 @@ out:
> } else {
> iplb = s390_ipl_get_iplb();
> }
> - if (iplb) {
> - cpu_physical_memory_write(addr, iplb,
> be32_to_cpu(iplb->len));
> - env->regs[r1 + 1] = DIAG_308_RC_OK;
> - } else {
> + 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));
> + } else {
> + 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();
Reviewed-by: Claudio Imbrenda <imbre...@linux.ibm.com>
