From patchwork Mon Sep 17 16:31:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10603019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A182C15A6 for ; Mon, 17 Sep 2018 16:31:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90B0B2A1C3 for ; Mon, 17 Sep 2018 16:31:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84B992A209; Mon, 17 Sep 2018 16:31:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A3732A1D7 for ; Mon, 17 Sep 2018 16:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728611AbeIQV7T (ORCPT ); Mon, 17 Sep 2018 17:59:19 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45765 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726979AbeIQV7T (ORCPT ); Mon, 17 Sep 2018 17:59:19 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1E43121C24; Mon, 17 Sep 2018 12:31:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 17 Sep 2018 12:31:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=Ut/+pHtOZtdCXd OQp4BVjkn7ndqIM1yGLNjjk5kK6wE=; b=V9xJKZ+KIRZ2qhbEe8Z35JXNwS70bf ihMynnnPvtNn4mMDE/WzldoLF1+si747gYnSNuWcrn3ulRVLLM5wk8H/D8og8CMc JNw98COFXRVWiaDYdmcAGHkSFozrH1BSdCaMzB2s/rcDzAnxJyyhf4lEgkf5YM/f tv4TpuZvqhaVI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=Ut/+pHtOZtdCXdOQp4BVjkn7ndqIM1yGLNjjk5kK6wE=; b=blCjPF1q pbW5cP9HSa1oAanCd19N/U3YRVSlGC3w8Nxoe5VaujABETrxwd9gw0zpgmJkq47M D0EW5cT4TJSANefVqsZFL/7yDp4sa/iGFAD6oX1GZIKt61Hcpf8P0dhxKfhkX7S2 6xCZDrLM0/2IRiSfRPmkwBsU/KiZsPibWv8kICa4ZswHXFv2DQ2PItXV6ZO5ruom HG5Hez/8/B5z/VF9bCFNvMN0x3Tw7uhMG/9vw0tGfM6qGJWghIZWTR8kDVdvzh2H A9+f/mbsNCTNm47a19uBGwXIOTtEnZdHehpUsouWt8fi2HqjHaXPHnUWIi3W4OA2 GZP184DyfDk01A== X-ME-Proxy: X-ME-Sender: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 84AC2E49C7; Mon, 17 Sep 2018 12:31:12 -0400 (EDT) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Aleksandar Markovic , Alexander Graf , Anthony Green , Artyom Tarasenko , Aurelien Jarno , Christian Borntraeger , Chris Wulff , Cornelia Huck , David Gibson , David Hildenbrand , "Edgar E. Iglesias" , Eduardo Habkost , Guan Xuetao , James Hogan , kvm@vger.kernel.org, Laurent Vivier , Marcelo Tosatti , Marek Vasut , Mark Cave-Ayland , Michael Walle , Peter Crosthwaite , Peter Maydell , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Richard Henderson , Stafford Horne Subject: [PATCH 34/35] exec: push BQL down to cpu->do_interrupt Date: Mon, 17 Sep 2018 12:31:02 -0400 Message-Id: <20180917163103.6113-35-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917163103.6113-1-cota@braap.org> References: <20180917163103.6113-1-cota@braap.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paolo Bonzini cpu->do_interrupt can now be called with BQL held (from cpu->cpu_exec_interrupt) or without (from cpu_handle_exception). Only a few targets rely on global device state in cc->do_interrupt; add checks to those targets to acquire the BQL if not already held. Cc: Aleksandar Markovic Cc: Alexander Graf Cc: Anthony Green Cc: Artyom Tarasenko Cc: Aurelien Jarno Cc: Christian Borntraeger Cc: Chris Wulff Cc: Cornelia Huck Cc: David Gibson Cc: David Hildenbrand Cc: "Edgar E. Iglesias" Cc: Eduardo Habkost Cc: Guan Xuetao Cc: James Hogan Cc: kvm@vger.kernel.org Cc: Laurent Vivier Cc: Marcelo Tosatti Cc: Marek Vasut Cc: Mark Cave-Ayland Cc: Michael Walle Cc: Peter Crosthwaite Cc: Peter Maydell Cc: qemu-arm@nongnu.org Cc: qemu-ppc@nongnu.org Cc: qemu-s390x@nongnu.org Cc: Richard Henderson Cc: Stafford Horne Signed-off-by: Paolo Bonzini Signed-off-by: Emilio G. Cota Acked-by: David Gibson Reviewed-by: David Hildenbrand Reviewed-by: Cornelia Huck --- accel/tcg/cpu-exec.c | 2 -- target/arm/helper.c | 28 ++++++++++++++++++++++++++-- target/ppc/excp_helper.c | 8 +++++++- target/s390x/excp_helper.c | 14 +++++++++++++- target/sh4/helper.c | 14 +++++++++++++- target/xtensa/helper.c | 16 ++++++++++++++-- 6 files changed, 73 insertions(+), 9 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 2383763f9b..b649e3d772 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -497,9 +497,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) #else if (replay_exception()) { CPUClass *cc = CPU_GET_CLASS(cpu); - qemu_mutex_lock_iothread(); cc->do_interrupt(cpu); - qemu_mutex_unlock_iothread(); cpu->exception_index = -1; } else if (!replay_has_interrupt()) { /* give a chance to iothread in replay mode */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 22dbc42305..548278da14 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7644,7 +7644,8 @@ gen_invep: return false; } -void arm_v7m_cpu_do_interrupt(CPUState *cs) +/* call with the BQL held */ +static void arm_v7m_cpu_do_interrupt_locked(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; @@ -7828,6 +7829,17 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) v7m_exception_taken(cpu, lr, false, ignore_stackfaults); } +void arm_v7m_cpu_do_interrupt(CPUState *cs) +{ + if (qemu_mutex_iothread_locked()) { + arm_v7m_cpu_do_interrupt_locked(cs); + } else { + qemu_mutex_lock_iothread(); + arm_v7m_cpu_do_interrupt_locked(cs); + qemu_mutex_unlock_iothread(); + } +} + /* Function used to synchronize QEMU's AArch64 register set with AArch32 * register set. This is necessary when switching between AArch32 and AArch64 * execution state. @@ -8482,8 +8494,9 @@ static inline bool check_for_semihosting(CPUState *cs) * Do any appropriate logging, handle PSCI calls, and then hand off * to the AArch64-entry or AArch32-entry function depending on the * target exception level's register width. + * Call with the BQL held. */ -void arm_cpu_do_interrupt(CPUState *cs) +static void arm_cpu_do_interrupt_locked(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; @@ -8534,6 +8547,17 @@ void arm_cpu_do_interrupt(CPUState *cs) } } +void arm_cpu_do_interrupt(CPUState *cs) +{ + if (qemu_mutex_iothread_locked()) { + arm_cpu_do_interrupt_locked(cs); + } else { + qemu_mutex_lock_iothread(); + arm_cpu_do_interrupt_locked(cs); + qemu_mutex_unlock_iothread(); + } +} + /* Return the exception level which controls this address translation regime */ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) { diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 70ac10e23b..8b2cc48cad 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -742,7 +742,13 @@ void ppc_cpu_do_interrupt(CPUState *cs) PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; - powerpc_excp(cpu, env->excp_model, cs->exception_index); + if (qemu_mutex_iothread_locked()) { + powerpc_excp(cpu, env->excp_model, cs->exception_index); + } else { + qemu_mutex_lock_iothread(); + powerpc_excp(cpu, env->excp_model, cs->exception_index); + qemu_mutex_unlock_iothread(); + } } static void ppc_hw_interrupt(CPUPPCState *env) diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index f2b92d7cbc..931c0103c8 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -378,7 +378,8 @@ static void do_mchk_interrupt(CPUS390XState *env) load_psw(env, mask, addr); } -void s390_cpu_do_interrupt(CPUState *cs) +/* call with the BQL held */ +static void s390_cpu_do_interrupt_locked(CPUState *cs) { QEMUS390FLICState *flic = QEMU_S390_FLIC(s390_get_flic()); S390CPU *cpu = S390_CPU(cs); @@ -457,6 +458,17 @@ try_deliver: } } +void s390_cpu_do_interrupt(CPUState *cs) +{ + if (qemu_mutex_iothread_locked()) { + s390_cpu_do_interrupt_locked(cs); + } else { + qemu_mutex_lock_iothread(); + s390_cpu_do_interrupt_locked(cs); + qemu_mutex_unlock_iothread(); + } +} + bool s390_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { if (interrupt_request & CPU_INTERRUPT_HARD) { diff --git a/target/sh4/helper.c b/target/sh4/helper.c index c699b8c0a1..6c508cd006 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -79,7 +79,8 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr) #define MMU_DADDR_ERROR_READ (-12) #define MMU_DADDR_ERROR_WRITE (-13) -void superh_cpu_do_interrupt(CPUState *cs) +/* call with the BQL held */ +static void superh_cpu_do_interrupt_locked(CPUState *cs) { SuperHCPU *cpu = SUPERH_CPU(cs); CPUSH4State *env = &cpu->env; @@ -211,6 +212,17 @@ void superh_cpu_do_interrupt(CPUState *cs) } } +void superh_cpu_do_interrupt(CPUState *cs) +{ + if (qemu_mutex_iothread_locked()) { + superh_cpu_do_interrupt_locked(cs); + } else { + qemu_mutex_lock_iothread(); + superh_cpu_do_interrupt_locked(cs); + qemu_mutex_unlock_iothread(); + } +} + static void update_itlb_use(CPUSH4State * env, int itlbnb) { uint8_t or_mask = 0, and_mask = (uint8_t) - 1; diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index c9a6132700..ecafecdd3f 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "qemu/units.h" #include "cpu.h" #include "exec/exec-all.h" @@ -251,8 +252,8 @@ static void handle_interrupt(CPUXtensaState *env) } } -/* Called from cpu_handle_interrupt with BQL held */ -void xtensa_cpu_do_interrupt(CPUState *cs) +/* Call with the BQL held */ +static void xtensa_cpu_do_interrupt_locked(CPUState *cs) { XtensaCPU *cpu = XTENSA_CPU(cs); CPUXtensaState *env = &cpu->env; @@ -305,6 +306,17 @@ void xtensa_cpu_do_interrupt(CPUState *cs) } check_interrupts(env); } + +void xtensa_cpu_do_interrupt(CPUState *cs) +{ + if (qemu_mutex_iothread_locked()) { + xtensa_cpu_do_interrupt_locked(cs); + } else { + qemu_mutex_lock_iothread(); + xtensa_cpu_do_interrupt_locked(cs); + qemu_mutex_unlock_iothread(); + } +} #else void xtensa_cpu_do_interrupt(CPUState *cs) {