From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5V6V-0001w3-Nh for qemu-devel@nongnu.org; Mon, 09 Apr 2018 07:36:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5V6S-0004kC-LU for qemu-devel@nongnu.org; Mon, 09 Apr 2018 07:36:55 -0400 References: <20180409113019.14568-1-david@redhat.com> <20180409113019.14568-3-david@redhat.com> From: David Hildenbrand Message-ID: Date: Mon, 9 Apr 2018 13:36:43 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 for-2.12 2/2] s390x: load_psw() should only exchange the PSW for KVM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger , qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, Richard Henderson , Alexander Graf , Cornelia Huck , Thomas Huth On 09.04.2018 13:35, Christian Borntraeger wrote: > > > On 04/09/2018 01:30 PM, David Hildenbrand wrote: >> Let's simplify it a bit. On some weird circumstances we would have tried >> to recompute watchpoints when running under KVM. >> >> Signed-off-by: David Hildenbrand >> --- >> target/s390x/helper.c | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/target/s390x/helper.c b/target/s390x/helper.c >> index 615fa24ab9..e8548f340a 100644 >> --- a/target/s390x/helper.c >> +++ b/target/s390x/helper.c >> @@ -103,16 +103,18 @@ void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr) >> >> env->psw.addr = addr; >> env->psw.mask = mask; >> - if (tcg_enabled()) { >> - env->cc_op = (mask >> 44) & 3; >> + >> + /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait */ >> + if (!tcg_enabled()) { >> + return; >> } >> + env->cc_op = (mask >> 44) & 3; > > Do we have any call path were KVM could call load_psw? do_restart_interrupt() SIGP while the target CPU is stopped. > >> >> if ((old_mask ^ mask) & PSW_MASK_PER) { >> s390_cpu_recompute_watchpoints(CPU(s390_env_get_cpu(env))); >> } >> >> - /* KVM will handle all WAITs and trigger a WAIT exit on disabled_wait */ >> - if (tcg_enabled() && (mask & PSW_MASK_WAIT)) { >> + if (mask & PSW_MASK_WAIT) { >> s390_handle_wait(s390_env_get_cpu(env)); >> } >> } >> > -- Thanks, David / dhildenb