From nobody Thu May 2 16:02:59 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623726563835931.2033019842438; Mon, 14 Jun 2021 20:09:23 -0700 (PDT) Received: from localhost ([::1]:47848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lszS6-0006zl-Oj for importer2@patchew.org; Mon, 14 Jun 2021 23:09:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lszQe-0004bw-Lx for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:52 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:33337) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lszQb-00087R-7k for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:52 -0400 Received: by mail-pg1-x52d.google.com with SMTP id e20so10313144pgg.0 for ; Mon, 14 Jun 2021 20:07:48 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id w71sm7554666pfc.164.2021.06.14.20.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 20:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t8wjCuyHEh6Y0B+SDsb16alVobYpy70dHGqNTIJsVXA=; b=E0SkBWBAbB0hQpke7xi4wTKrb0hTWtgKGnIC2qQn/xiX2LXwxfq+fWq5Aah/QurW1b h5q08+HDg68XukLPqbJtWqNOiHgSz/H1Ew533D1zztGLe/k0h/X1pav2/TWe0tx0B/9D mbrnAjN4ZoC5O0mo7QvH5wJgfege4PDVCXSUHHKwuJuFCzSEGOVZ+/lfRAIT0J8TWvuR aq8ctimylw9gCtm6zODj7okb5fHXhYEIk+fzFXMrC2nRuAKYppqTmqT9AoKG4sTt7orh 093NWJroVCsZh+AoJfa+62LSoE7K4HopJdAhNHcSWpuyKgwYm7K+xRSYlb2093sh7Fgo rH/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t8wjCuyHEh6Y0B+SDsb16alVobYpy70dHGqNTIJsVXA=; b=dWH1jRzrDPOhNPD5VwH/P3Frl/WBAa4CcmGUYXouzS0Eq5new6FF0Bwjqw+XJ0bNhF fErrWgyrbqSpeAGYX5D8B5adGl8Qd1+RSMNNuJw7OgIaGw9jZpYhoFkDlE4tNlkQFeoQ bXTRMO8N9ucgSUCMgJjGuMaggmUj1OZg7iJjJNJ8MkVLo7hLYYty+xY6PtxLSH6L4cgW rGl0z4kDAuXcS//PTOjzgEWbij4+ZYO1HdMQPE/nNI9Eh7yagDI+nrR7LytnWcjrXeqw O8wspvWqqlvlBySZWjWKce4rloIrZKfgGh/h5ROwGe9IeTSkb01fJd9sVTgNWL0Ko+cT 0kAA== X-Gm-Message-State: AOAM530WBKjsz+3X5kYIWwYRq93fpx+lBmhX19bOtamcdTwXA2BuHEZt NsjLZJbZWw/WFfP2+y7dEL4kMG6RrogbDg== X-Google-Smtp-Source: ABdhPJxxV5Bb9WlCUmwu6IxNfnewhbI/OVnuUyL1a/cRGpxqMyV9sUKvZeVTWEAiYqpmlGwlN+xdFw== X-Received: by 2002:aa7:8601:0:b029:2ec:d8a6:6b84 with SMTP id p1-20020aa786010000b02902ecd8a66b84mr2073015pfn.15.1623726467433; Mon, 14 Jun 2021 20:07:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/5] target/s390x: Expose load_psw and get_psw_mask to cpu.h Date: Mon, 14 Jun 2021 20:07:40 -0700 Message-Id: <20210615030744.1252385-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615030744.1252385-1-richard.henderson@linaro.org> References: <20210615030744.1252385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruixin.bao@ibm.com, jonathan.albrecht@linux.vnet.ibm.com, cohuck@redhat.com, qemu-s390x@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename to s390_cpu_set_psw and s390_cpu_get_psw_mask at the same time. Adjust so that they compile for user-only. Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: David Hildenbrand --- target/s390x/cpu.h | 3 ++ target/s390x/internal.h | 5 --- target/s390x/cc_helper.c | 2 +- target/s390x/excp_helper.c | 28 ++++++------ target/s390x/helper.c | 89 ++++++++++++++++++++------------------ target/s390x/sigp.c | 3 +- 6 files changed, 69 insertions(+), 61 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 2464d4076c..b26ae8fff2 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -845,6 +845,9 @@ int s390_cpu_pv_mem_rw(S390CPU *cpu, unsigned int offse= t, void *hostbuf, int s390_cpu_restart(S390CPU *cpu); void s390_init_sigp(void); =20 +/* helper.c */ +void s390_cpu_set_psw(CPUS390XState *env, uint64_t mask, uint64_t addr); +uint64_t s390_cpu_get_psw_mask(CPUS390XState *env); =20 /* outside of target/s390x/ */ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); diff --git a/target/s390x/internal.h b/target/s390x/internal.h index 11515bb617..4a18b74d10 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -235,10 +235,6 @@ int s390_cpu_write_elf64_note(WriteCoreDumpFunction f,= CPUState *cs, const char *cc_name(enum cc_op cc_op); uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_= t dst, uint64_t vr); -#ifndef CONFIG_USER_ONLY -void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr); -#endif /* CONFIG_USER_ONLY */ - =20 /* cpu.c */ #ifndef CONFIG_USER_ONLY @@ -303,7 +299,6 @@ void s390_cpu_gdb_init(CPUState *cs); void s390_cpu_dump_state(CPUState *cpu, FILE *f, int flags); void do_restart_interrupt(CPUS390XState *env); #ifndef CONFIG_USER_ONLY -uint64_t get_psw_mask(CPUS390XState *env); void s390_cpu_recompute_watchpoints(CPUState *cs); void s390x_tod_timer(void *opaque); void s390x_cpu_timer(void *opaque); diff --git a/target/s390x/cc_helper.c b/target/s390x/cc_helper.c index e7039d0d18..e7a74d66dd 100644 --- a/target/s390x/cc_helper.c +++ b/target/s390x/cc_helper.c @@ -509,7 +509,7 @@ uint32_t HELPER(calc_cc)(CPUS390XState *env, uint32_t c= c_op, uint64_t src, #ifndef CONFIG_USER_ONLY void HELPER(load_psw)(CPUS390XState *env, uint64_t mask, uint64_t addr) { - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); cpu_loop_exit(env_cpu(env)); } =20 diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 20625c2c8f..9c361428c8 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -252,7 +252,7 @@ static void do_program_interrupt(CPUS390XState *env) =20 lowcore->pgm_ilen =3D cpu_to_be16(ilen); lowcore->pgm_code =3D cpu_to_be16(env->int_pgm_code); - lowcore->program_old_psw.mask =3D cpu_to_be64(get_psw_mask(env)); + lowcore->program_old_psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(en= v)); lowcore->program_old_psw.addr =3D cpu_to_be64(env->psw.addr); mask =3D be64_to_cpu(lowcore->program_new_psw.mask); addr =3D be64_to_cpu(lowcore->program_new_psw.addr); @@ -260,7 +260,7 @@ static void do_program_interrupt(CPUS390XState *env) =20 cpu_unmap_lowcore(lowcore); =20 - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); } =20 static void do_svc_interrupt(CPUS390XState *env) @@ -272,14 +272,14 @@ static void do_svc_interrupt(CPUS390XState *env) =20 lowcore->svc_code =3D cpu_to_be16(env->int_svc_code); lowcore->svc_ilen =3D cpu_to_be16(env->int_svc_ilen); - lowcore->svc_old_psw.mask =3D cpu_to_be64(get_psw_mask(env)); + lowcore->svc_old_psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(env)); lowcore->svc_old_psw.addr =3D cpu_to_be64(env->psw.addr + env->int_svc= _ilen); mask =3D be64_to_cpu(lowcore->svc_new_psw.mask); addr =3D be64_to_cpu(lowcore->svc_new_psw.addr); =20 cpu_unmap_lowcore(lowcore); =20 - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); =20 /* When a PER event is pending, the PER exception has to happen immediately after the SERVICE CALL one. */ @@ -348,12 +348,12 @@ static void do_ext_interrupt(CPUS390XState *env) =20 mask =3D be64_to_cpu(lowcore->external_new_psw.mask); addr =3D be64_to_cpu(lowcore->external_new_psw.addr); - lowcore->external_old_psw.mask =3D cpu_to_be64(get_psw_mask(env)); + lowcore->external_old_psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(e= nv)); lowcore->external_old_psw.addr =3D cpu_to_be64(env->psw.addr); =20 cpu_unmap_lowcore(lowcore); =20 - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); } =20 static void do_io_interrupt(CPUS390XState *env) @@ -373,7 +373,7 @@ static void do_io_interrupt(CPUS390XState *env) lowcore->subchannel_nr =3D cpu_to_be16(io->nr); lowcore->io_int_parm =3D cpu_to_be32(io->parm); lowcore->io_int_word =3D cpu_to_be32(io->word); - lowcore->io_old_psw.mask =3D cpu_to_be64(get_psw_mask(env)); + lowcore->io_old_psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(env)); lowcore->io_old_psw.addr =3D cpu_to_be64(env->psw.addr); mask =3D be64_to_cpu(lowcore->io_new_psw.mask); addr =3D be64_to_cpu(lowcore->io_new_psw.addr); @@ -381,7 +381,7 @@ static void do_io_interrupt(CPUS390XState *env) cpu_unmap_lowcore(lowcore); g_free(io); =20 - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); } =20 typedef struct MchkExtSaveArea { @@ -457,14 +457,14 @@ static void do_mchk_interrupt(CPUS390XState *env) lowcore->clock_comp_save_area =3D cpu_to_be64(env->ckc >> 8); =20 lowcore->mcic =3D cpu_to_be64(mcic); - lowcore->mcck_old_psw.mask =3D cpu_to_be64(get_psw_mask(env)); + lowcore->mcck_old_psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(env)); lowcore->mcck_old_psw.addr =3D cpu_to_be64(env->psw.addr); mask =3D be64_to_cpu(lowcore->mcck_new_psw.mask); addr =3D be64_to_cpu(lowcore->mcck_new_psw.addr); =20 cpu_unmap_lowcore(lowcore); =20 - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); } =20 void s390_cpu_do_interrupt(CPUState *cs) @@ -592,9 +592,11 @@ void s390x_cpu_debug_excp_handler(CPUState *cs) and MVCS instrutions are not used. */ env->per_perc_atmid |=3D env->psw.mask & (PSW_MASK_ASC) >> 46; =20 - /* Remove all watchpoints to re-execute the code. A PER exception - will be triggered, it will call load_psw which will recompute - the watchpoints. */ + /* + * Remove all watchpoints to re-execute the code. A PER exception + * will be triggered, it will call s390_cpu_set_psw which will + * recompute the watchpoints. + */ cpu_watchpoint_remove_all(cs, BP_CPU); cpu_loop_exit_noexc(cs); } diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 7678994feb..d311903b94 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -104,44 +104,6 @@ void s390_handle_wait(S390CPU *cpu) } } =20 -void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) -{ - uint64_t old_mask =3D env->psw.mask; - - env->psw.addr =3D addr; - env->psw.mask =3D mask; - - /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait = */ - if (!tcg_enabled()) { - return; - } - env->cc_op =3D (mask >> 44) & 3; - - if ((old_mask ^ mask) & PSW_MASK_PER) { - s390_cpu_recompute_watchpoints(env_cpu(env)); - } - - if (mask & PSW_MASK_WAIT) { - s390_handle_wait(env_archcpu(env)); - } -} - -uint64_t get_psw_mask(CPUS390XState *env) -{ - uint64_t r =3D env->psw.mask; - - if (tcg_enabled()) { - env->cc_op =3D calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, - env->cc_vr); - - r &=3D ~PSW_MASK_CC; - assert(!(env->cc_op & ~3)); - r |=3D (uint64_t)env->cc_op << 44; - } - - return r; -} - LowCore *cpu_map_lowcore(CPUS390XState *env) { LowCore *lowcore; @@ -168,7 +130,7 @@ void do_restart_interrupt(CPUS390XState *env) =20 lowcore =3D cpu_map_lowcore(env); =20 - lowcore->restart_old_psw.mask =3D cpu_to_be64(get_psw_mask(env)); + lowcore->restart_old_psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(en= v)); lowcore->restart_old_psw.addr =3D cpu_to_be64(env->psw.addr); mask =3D be64_to_cpu(lowcore->restart_new_psw.mask); addr =3D be64_to_cpu(lowcore->restart_new_psw.addr); @@ -176,7 +138,7 @@ void do_restart_interrupt(CPUS390XState *env) cpu_unmap_lowcore(lowcore); env->pending_int &=3D ~INTERRUPT_RESTART; =20 - load_psw(env, mask, addr); + s390_cpu_set_psw(env, mask, addr); } =20 void s390_cpu_recompute_watchpoints(CPUState *cs) @@ -266,7 +228,7 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool s= tore_arch) sa->grs[i] =3D cpu_to_be64(cpu->env.regs[i]); } sa->psw.addr =3D cpu_to_be64(cpu->env.psw.addr); - sa->psw.mask =3D cpu_to_be64(get_psw_mask(&cpu->env)); + sa->psw.mask =3D cpu_to_be64(s390_cpu_get_psw_mask(&cpu->env)); sa->prefix =3D cpu_to_be32(cpu->env.psa); sa->fpc =3D cpu_to_be32(cpu->env.fpc); sa->todpr =3D cpu_to_be32(cpu->env.todpr); @@ -323,8 +285,53 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, = hwaddr len) cpu_physical_memory_unmap(sa, len, 1, len); return 0; } +#else +/* For user-only, tcg is always enabled. */ +#define tcg_enabled() true #endif /* CONFIG_USER_ONLY */ =20 +void s390_cpu_set_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) +{ +#ifndef CONFIG_USER_ONLY + uint64_t old_mask =3D env->psw.mask; +#endif + + env->psw.addr =3D addr; + env->psw.mask =3D mask; + + /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait = */ + if (!tcg_enabled()) { + return; + } + env->cc_op =3D (mask >> 44) & 3; + +#ifndef CONFIG_USER_ONLY + if ((old_mask ^ mask) & PSW_MASK_PER) { + s390_cpu_recompute_watchpoints(env_cpu(env)); + } + + if (mask & PSW_MASK_WAIT) { + s390_handle_wait(env_archcpu(env)); + } +#endif +} + +uint64_t s390_cpu_get_psw_mask(CPUS390XState *env) +{ + uint64_t r =3D env->psw.mask; + + if (tcg_enabled()) { + env->cc_op =3D calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, + env->cc_vr); + + r &=3D ~PSW_MASK_CC; + assert(!(env->cc_op & ~3)); + r |=3D (uint64_t)env->cc_op << 44; + } + + return r; +} + void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags) { S390CPU *cpu =3D S390_CPU(cs); diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index c604f17710..c2d5cdf061 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -235,7 +235,8 @@ static void sigp_restart(CPUState *cs, run_on_cpu_data = arg) cpu_synchronize_state(cs); /* * Set OPERATING (and unhalting) before loading the restart PSW. - * load_psw() will then properly halt the CPU again if necessary (= TCG). + * s390_cpu_set_psw() will then properly halt the CPU again if + * necessary (TCG). */ s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); do_restart_interrupt(&cpu->env); --=20 2.25.1 From nobody Thu May 2 16:02:59 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623726559032576.003346051775; Mon, 14 Jun 2021 20:09:19 -0700 (PDT) Received: from localhost ([::1]:47492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lszS2-0006lI-2X for importer2@patchew.org; Mon, 14 Jun 2021 23:09:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lszQe-0004bH-Dh for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:52 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:34406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lszQb-000898-M9 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:52 -0400 Received: by mail-pf1-x42a.google.com with SMTP id g6so12169459pfq.1 for ; Mon, 14 Jun 2021 20:07:49 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id w71sm7554666pfc.164.2021.06.14.20.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 20:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9glrwO//kduxlvzU2NaztkmtbUkYP+/zX6C9TwX8Wm0=; b=u6y/VHbBtttWaMbmktXjtbd5JgyFg28jO9+tqD6QiPP5h72jSjrIzYtgEDiaYIZNyf zUW1kDXFl4SsOx9qj2djtEG5+efyF2S+rbEHP8eAVCSJ1NBwSxT33gPqUeTrzeICG3Qf MVp2/TKTjic3l4dfJzmyxnO1Gj9nfuAY2FeEWq0r1WD0TQ3vSzdsUewbUmYVpIICWVLO K5b/CgKb+6hV7ygt/qLvY3tCrGi/WUsXx4RBI64a50HhrOjRB0V5e9Q3GTtZQoEFV7ql XIHYDXnfWNuG8ryhtMU3aTW5SOx44p7o4Z5Qfg2ZGg7nNTZh7+fhiwN+ViqTmiS4SCjs Blmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9glrwO//kduxlvzU2NaztkmtbUkYP+/zX6C9TwX8Wm0=; b=JoN2afL4PKBCB19QvzAgvJYOvzqDIha1kyezbgkfxUJ16Q9VVRiHrs+tXsKAn2BzrE CCGwZ1bZ0SHnGfnJ7mJ57hKb0TNNUh546jfRIAF737ACcjaAOpVV8wHZH6uSds4QGCIC xKijvhv+4P3vb0D/7GKbpiVS8k70A4lgJxc2fGSIGQucdXGkmoQ7ZNvh/YsT3CikNn9G jfvFrm8vwfdW9PAG6Q8AYx+m7oxezhKDH6f/HvFbyRAy1X8HZFsyL89p+nShX+07iAlB xre1jKmX6JB3lv4b+mJXfegq7Cmf2Wud2RypX5yrsUD4cQwoyqSJ6InDp8+VC/2D/OI4 pp7g== X-Gm-Message-State: AOAM532e5Oh8vj0YuHxWndHlaTwsob/f3MMVKa2ef2pKN9P4xKErJaK4 L+eufiMDsDursY6fgGOHw3WSO34+JDgSww== X-Google-Smtp-Source: ABdhPJxzXdv8TGgD+JzAxyFaGT46q7fjrbPXu2xb0Tre/FWwzq6Ukb5AnU2YbtrDH23Q/N3UjB/euQ== X-Received: by 2002:aa7:954c:0:b029:2f5:33fc:1073 with SMTP id w12-20020aa7954c0000b02902f533fc1073mr2100392pfq.79.1623726468449; Mon, 14 Jun 2021 20:07:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/5] target/s390x: Do not modify cpu state in s390_cpu_get_psw_mask Date: Mon, 14 Jun 2021 20:07:41 -0700 Message-Id: <20210615030744.1252385-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615030744.1252385-1-richard.henderson@linaro.org> References: <20210615030744.1252385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruixin.bao@ibm.com, jonathan.albrecht@linux.vnet.ibm.com, cohuck@redhat.com, qemu-s390x@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We want to use this function for debugging, and debug should not modify cpu state (even non-architectural cpu state) lest we introduce heisenbugs. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- target/s390x/helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index d311903b94..559fc3573f 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -321,12 +321,12 @@ uint64_t s390_cpu_get_psw_mask(CPUS390XState *env) uint64_t r =3D env->psw.mask; =20 if (tcg_enabled()) { - env->cc_op =3D calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, - env->cc_vr); + uint64_t cc =3D calc_cc(env, env->cc_op, env->cc_src, + env->cc_dst, env->cc_vr); =20 + assert(cc <=3D 3); r &=3D ~PSW_MASK_CC; - assert(!(env->cc_op & ~3)); - r |=3D (uint64_t)env->cc_op << 44; + r |=3D cc << 44; } =20 return r; --=20 2.25.1 From nobody Thu May 2 16:02:59 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623726687782935.577203176304; Mon, 14 Jun 2021 20:11:27 -0700 (PDT) Received: from localhost ([::1]:55964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lszU6-0003zY-PF for importer2@patchew.org; Mon, 14 Jun 2021 23:11:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lszQf-0004ck-0h for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:53 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:44022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lszQd-00089s-58 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:52 -0400 Received: by mail-pg1-x52a.google.com with SMTP id e22so10263070pgv.10 for ; Mon, 14 Jun 2021 20:07:50 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id w71sm7554666pfc.164.2021.06.14.20.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 20:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/6xkphnJBNo/K1DX+n+4XklxOsTRpwFklbH0yf7ANvo=; b=orK1N/okKba8HJImQ3grPtPAeeO7D8OVMYcvfD28O9EBEQrpfCtgBGr1e7y2jUutpO RHED7aNDb0yqQgs6TyLmxjkbEcs5aiuDEoMGKOOiwkCquu+agwgPdbQusRYhN+RFGc/H K+8cMyvBzae4lY7T3vgMhEzbFI+2KC2JpPCHCzjDTu2S+CmqGSP5xH1TLj4ovnpDKoW0 UzOkfS/tqqTSeJmKUCs42Iqf/FIJksCNFEzzO08UtH24nj5pmvile49WPGtlusl0majB iWCD4yFZKnuzQk8dvrNyZibGna0IU035S1Lqi0RVV1teT2/B41Oj5a0h2SMvr1/lsmAo 4t1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/6xkphnJBNo/K1DX+n+4XklxOsTRpwFklbH0yf7ANvo=; b=PQdCHdAxDS98wuSqf0gXnCLEEDDgNGjRzpBmia4Rkcz9A8ifgGKxIYhKcF0QZ2w7JL UUT+/NKbQYAoklSvXhp5eQFf71GrGvFE3NOjoTSf3lP9OewrU7o3VMr/t0MKo9m9C1Z1 +LYyCZUvfPTRMScqYySFrCkIYWiZ8TStNrafnWntgbANpIYFl4WWU/1CyUiSSfzuYrPl tOmOW0ybEQhaEKQ5LXcQ+XG01HhtR4R006j/ZwEU9Nusd3F4Bj5TX7VBzka/J3TSuMK5 9Byq/yrzqJfSxlCsg+TEtDQouLolu1emzAaobVMgoCwuF1Xl70qFVSq3fcmSKUQFXFZG pEvw== X-Gm-Message-State: AOAM5336nnEIprymswYYpOzQYYrOZHfkEQHP8BIRodtPU1fglTnMsUAg Rf6XpwNmI8X++GO9S2UDk0ls7L8fdQ+w9w== X-Google-Smtp-Source: ABdhPJzgbjO1keGwO3ZQBtDBooZy8KFZtdPYbwddgZsS2JW12d2YU4zwg0dBQ2M4b0X5j3P1Fu7vyw== X-Received: by 2002:aa7:99c9:0:b029:2e9:e084:e1de with SMTP id v9-20020aa799c90000b02902e9e084e1demr2167491pfi.80.1623726469922; Mon, 14 Jun 2021 20:07:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/5] target/s390x: Improve s390_cpu_dump_state vs cc_op Date: Mon, 14 Jun 2021 20:07:42 -0700 Message-Id: <20210615030744.1252385-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615030744.1252385-1-richard.henderson@linaro.org> References: <20210615030744.1252385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruixin.bao@ibm.com, jonathan.albrecht@linux.vnet.ibm.com, cohuck@redhat.com, qemu-s390x@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Use s390_cpu_get_psw_mask so that we print the correct architectural value of psw.mask. Do not print cc_op unless tcg_enabled. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- target/s390x/helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 559fc3573f..1445b74451 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -338,12 +338,14 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, int f= lags) CPUS390XState *env =3D &cpu->env; int i; =20 - if (env->cc_op > 3) { - qemu_fprintf(f, "PSW=3Dmask %016" PRIx64 " addr %016" PRIx64 " cc = %15s\n", - env->psw.mask, env->psw.addr, cc_name(env->cc_op)); + qemu_fprintf(f, "PSW=3Dmask %016" PRIx64 " addr %016" PRIx64, + s390_cpu_get_psw_mask(env), env->psw.addr); + if (!tcg_enabled()) { + qemu_fprintf(f, "\n"); + } else if (env->cc_op > 3) { + qemu_fprintf(f, " cc %15s\n", cc_name(env->cc_op)); } else { - qemu_fprintf(f, "PSW=3Dmask %016" PRIx64 " addr %016" PRIx64 " cc = %02x\n", - env->psw.mask, env->psw.addr, env->cc_op); + qemu_fprintf(f, " cc %02x\n", env->cc_op); } =20 for (i =3D 0; i < 16; i++) { --=20 2.25.1 From nobody Thu May 2 16:02:59 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162372666175589.46141447157959; Mon, 14 Jun 2021 20:11:01 -0700 (PDT) Received: from localhost ([::1]:53930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lszTg-0002fb-Nz for importer2@patchew.org; Mon, 14 Jun 2021 23:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lszQf-0004ew-Jw for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:54 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:45654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lszQd-0008A3-OP for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:53 -0400 Received: by mail-pj1-x1031.google.com with SMTP id z3-20020a17090a3983b029016bc232e40bso1317647pjb.4 for ; Mon, 14 Jun 2021 20:07:51 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id w71sm7554666pfc.164.2021.06.14.20.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 20:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rxs30+5uAa9OunefGQHMVoUkynnQ1zCC+uwySj1YTHA=; b=ph5NFs73tU0nzEs0hJ/7pO/9mjO6LIuUWtE1RCTv/zJCYwvpAhZZIxQSRNqB+48UZ2 rrZK2lyOP4LDJ4PYtElI03nDZ3fBPi8oi0PdbToreQ850PlrGq3JVuVM316SuM7zuKIR 2Qkaa+zakDiIvuPBwB8xe0taZYSavcHrb4dKYMsmH2fA/6hUUQvuoA9utFCENvIK9Wby 8ls08GqQrEysKm178TqUegnDAIPNmg8xgJ2m1dZ4aMF1giTYdMzko5HRyK2zFEB2MEgh hz8krDUpLx+ljY7hcXsstuw3iOYZOaTWFl0R+BWSvTiFTnCRdNCHzrcwO03CbADy9+jE pKjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rxs30+5uAa9OunefGQHMVoUkynnQ1zCC+uwySj1YTHA=; b=ZH1l14ubL3E+6C1M4SLFyoCPz8dn95LMehYjW64eCmbLiGTJ/HUOb8NsbwrJEm7iSR VoX3dZThGCcDAFTKm0+uhuxIa4bsBcqtkG/rK+75qa987iECeG4s0O6RJFOfymU5Z4HF dBLR2KMGviiucnqlDuU5kF4l2DYCgXZvHQ3B9isPtybjt2R3oquj9MXIfDRnnplxrDHI aEIpqxvjQPmZSaXdYOaARlRe3qkE3gnpvqM1TwrseBKxI3u+OfW7TUeC8TGqI3Aw/rbt SYkg7Yv/9CMKV653LGfEYTxV7eCH6VmtmvrvL3v9NY3gbdmyCgTaMh23ntjxHrnfQajI IRqw== X-Gm-Message-State: AOAM53128ndbJgLm5W2CG8IDgdaSliWBt7Cmf37o5LG3jZ6EPThGFvlA BKXlwUWJ4c6d2ynDkjPtK6Z704kYK6sXZA== X-Google-Smtp-Source: ABdhPJx1Hq1l9idtVeZCEJ6SwZstKx3iWCEI0QPugaOfQ3J7Jcz6I/Cjevz2v3rEXYgLAPpyoOKIrg== X-Received: by 2002:a17:902:d3c3:b029:101:af83:cb1f with SMTP id w3-20020a170902d3c3b0290101af83cb1fmr2207550plb.80.1623726470520; Mon, 14 Jun 2021 20:07:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/5] target/s390x: Use s390_cpu_{set_psw, get_psw_mask} in gdbstub Date: Mon, 14 Jun 2021 20:07:43 -0700 Message-Id: <20210615030744.1252385-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615030744.1252385-1-richard.henderson@linaro.org> References: <20210615030744.1252385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruixin.bao@ibm.com, jonathan.albrecht@linux.vnet.ibm.com, cohuck@redhat.com, qemu-s390x@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" No change in behaviour, as gdbstub was correctly written to install and extract the cc value. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- target/s390x/gdbstub.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c index d6fce5ff1e..5b4e38a13b 100644 --- a/target/s390x/gdbstub.c +++ b/target/s390x/gdbstub.c @@ -31,18 +31,10 @@ int s390_cpu_gdb_read_register(CPUState *cs, GByteArray= *mem_buf, int n) { S390CPU *cpu =3D S390_CPU(cs); CPUS390XState *env =3D &cpu->env; - uint64_t val; - int cc_op; =20 switch (n) { case S390_PSWM_REGNUM: - if (tcg_enabled()) { - cc_op =3D calc_cc(env, env->cc_op, env->cc_src, env->cc_dst, - env->cc_vr); - val =3D deposit64(env->psw.mask, 44, 2, cc_op); - return gdb_get_regl(mem_buf, val); - } - return gdb_get_regl(mem_buf, env->psw.mask); + return gdb_get_regl(mem_buf, s390_cpu_get_psw_mask(env)); case S390_PSWA_REGNUM: return gdb_get_regl(mem_buf, env->psw.addr); case S390_R0_REGNUM ... S390_R15_REGNUM: @@ -59,10 +51,7 @@ int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *m= em_buf, int n) =20 switch (n) { case S390_PSWM_REGNUM: - env->psw.mask =3D tmpl; - if (tcg_enabled()) { - env->cc_op =3D extract64(tmpl, 44, 2); - } + s390_cpu_set_psw(env, tmpl, env->psw.addr); break; case S390_PSWA_REGNUM: env->psw.addr =3D tmpl; --=20 2.25.1 From nobody Thu May 2 16:02:59 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162372666738786.93198908446595; Mon, 14 Jun 2021 20:11:07 -0700 (PDT) Received: from localhost ([::1]:54414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lszTm-0002ya-5b for importer2@patchew.org; Mon, 14 Jun 2021 23:11:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lszQi-0004j9-6P for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:57 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:36558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lszQe-0008Ae-G0 for qemu-devel@nongnu.org; Mon, 14 Jun 2021 23:07:55 -0400 Received: by mail-pf1-x42a.google.com with SMTP id c12so12174959pfl.3 for ; Mon, 14 Jun 2021 20:07:52 -0700 (PDT) Received: from localhost.localdomain (174-21-70-228.tukw.qwest.net. [174.21.70.228]) by smtp.gmail.com with ESMTPSA id w71sm7554666pfc.164.2021.06.14.20.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 20:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TQf3IjdFQae4tidY+aDNVPg91NNd8BgJC+OISDGWpvo=; b=RQ4TCrKNkNkBjR7TSkxoGfCpcWGpukR5UnCDcRxQDiRHJ6AfL37ld8HkjVwu9T9e2S rLhSbquzP+MT78WpVYQI6+14+7jvI6vJOlYnNopN8OyegXGtB1/AKOxN2MwsunXIFmVX XuLie1kqXC0YGteZW4TVOOXNAA92Eymcor7G+AfbnsG42kMNSqUbbRIbww/mJeG0WCpN u1dRb1EyR5p598KSGbVqnxGXqoyQgJ1ygUhtDX6FcLg+exXUe+rnFjvv23dVQK5yEQFN GxsjSMxSLAxG89kgMIRrim7Of7r0NOAAYRhEq6X/0M5RIErqKqNfF5FWEzScStLjDwRj tfug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TQf3IjdFQae4tidY+aDNVPg91NNd8BgJC+OISDGWpvo=; b=JT0lkRRKS+brci6QA0XVza/Mh6gOgGJxNHZShho2XAPfb6B/TDi2oCiliQiIPjCNYg nyKN7cNSn4b7CVa3jE1021IPgQzHCylgZvEjjWR7TpgLx/4Ro/FDYrGMeNkMEdklyazA 5vpP2cWnUHz4qL4kkkduPumDRLuRt/1xJ84Ji4wGrOPhpviNWUCQfTXfMXMuscZ6C6yQ TFI4nBD7ZghcnrbUAuxysihjchY0osJEUqmAp4lgJkGe9feIhmhoFpgWZ9ZPRxFRmZ7P 4AFnlzBt/qZ7MujXx+IYPVwEXxbDQ4ezYqbEzPyiBuHPa71dfGv5M96+vr4tPaJyopBO R8oA== X-Gm-Message-State: AOAM532RFTHtgwm+tk9/ONKtypOsPmnrAwzyY/ps+gGcClao8twLVifc DHIs4v/U87oN9bpDXXUJ4nCjAkbF/UWGWg== X-Google-Smtp-Source: ABdhPJwWPPPtQKMEWWkpfLsCb6FyPMLh5FAFw+tmuLnosPfBuaIBfDM+hyqurS0pahST0w0kjEayhQ== X-Received: by 2002:a62:dd8b:0:b029:2e9:731a:e22e with SMTP id w133-20020a62dd8b0000b02902e9731ae22emr2108516pff.69.1623726471125; Mon, 14 Jun 2021 20:07:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/5] linux-user/s390x: Save and restore psw.mask properly Date: Mon, 14 Jun 2021 20:07:44 -0700 Message-Id: <20210615030744.1252385-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615030744.1252385-1-richard.henderson@linaro.org> References: <20210615030744.1252385-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ruixin.bao@ibm.com, jonathan.albrecht@linux.vnet.ibm.com, cohuck@redhat.com, qemu-s390x@nongnu.org, david@redhat.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" At present, we're referencing env->psw.mask directly, which fails to ensure that env->cc_op is incorporated or updated. Use s390_cpu_{set_psw,get_psw_mask} to fix this. Mirror the kernel's cleaning of the psw.mask in save_sigregs and restore_sigregs. Ignore PSW_MASK_RI for now, as qemu does not support that. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- linux-user/s390x/signal.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index ef136dae33..bf8a8fbfe9 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -112,15 +112,23 @@ get_sigframe(struct target_sigaction *ka, CPUS390XSta= te *env, size_t frame_size) return (sp - frame_size) & -8ul; } =20 +#define PSW_USER_BITS (PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT | \ + PSW_MASK_MCHECK | PSW_MASK_PSTATE | PSW_ASC_PRIMA= RY) +#define PSW_MASK_USER (PSW_MASK_ASC | PSW_MASK_CC | PSW_MASK_PM | \ + PSW_MASK_64 | PSW_MASK_32) + static void save_sigregs(CPUS390XState *env, target_sigregs *sregs) { + uint64_t psw_mask =3D s390_cpu_get_psw_mask(env); int i; =20 /* * Copy a 'clean' PSW mask to the user to avoid leaking * information about whether PER is currently on. + * TODO: qemu does not support PSW_MASK_RI; it will never be set. */ - __put_user(env->psw.mask, &sregs->regs.psw.mask); + psw_mask =3D PSW_USER_BITS | (psw_mask & PSW_MASK_USER); + __put_user(psw_mask, &sregs->regs.psw.mask); __put_user(env->psw.addr, &sregs->regs.psw.addr); =20 for (i =3D 0; i < 16; i++) { @@ -289,7 +297,7 @@ void setup_rt_frame(int sig, struct target_sigaction *k= a, =20 static void restore_sigregs(CPUS390XState *env, target_sigregs *sc) { - target_ulong prev_addr; + uint64_t prev_addr, prev_mask, mask, addr; int i; =20 for (i =3D 0; i < 16; i++) { @@ -297,9 +305,28 @@ static void restore_sigregs(CPUS390XState *env, target= _sigregs *sc) } =20 prev_addr =3D env->psw.addr; - __get_user(env->psw.mask, &sc->regs.psw.mask); - __get_user(env->psw.addr, &sc->regs.psw.addr); - trace_user_s390x_restore_sigregs(env, env->psw.addr, prev_addr); + __get_user(mask, &sc->regs.psw.mask); + __get_user(addr, &sc->regs.psw.addr); + trace_user_s390x_restore_sigregs(env, addr, prev_addr); + + /* + * Use current psw.mask to preserve PER bit. + * TODO: + * if (!is_ri_task(current) && (user_sregs.regs.psw.mask & PSW_MASK_R= I)) + * return -EINVAL; + * Simply do not allow it to be set in mask. + */ + prev_mask =3D s390_cpu_get_psw_mask(env); + mask =3D (prev_mask & ~PSW_MASK_USER) | (mask & PSW_MASK_USER); + /* Check for invalid user address space control. */ + if ((mask & PSW_MASK_ASC) =3D=3D PSW_ASC_HOME) { + mask =3D (mask & ~PSW_MASK_ASC) | PSW_ASC_PRIMARY; + } + /* Check for invalid amode. */ + if (mask & PSW_MASK_64) { + mask |=3D PSW_MASK_32; + } + s390_cpu_set_psw(env, mask, addr); =20 for (i =3D 0; i < 16; i++) { __get_user(env->aregs[i], &sc->regs.acrs[i]); --=20 2.25.1