From patchwork Thu May 26 16:35:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alvise rigo X-Patchwork-Id: 9137269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2AF7D6075A for ; Thu, 26 May 2016 16:45:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16D4F2807E for ; Thu, 26 May 2016 16:45:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B22B282ED; Thu, 26 May 2016 16:45:11 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 722192807E for ; Thu, 26 May 2016 16:45:10 +0000 (UTC) Received: from localhost ([::1]:39522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5yPF-0006VB-4e for patchwork-qemu-devel@patchwork.kernel.org; Thu, 26 May 2016 12:45:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5yGl-0006b8-S8 for qemu-devel@nongnu.org; Thu, 26 May 2016 12:36:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5yGk-0003nv-QU for qemu-devel@nongnu.org; Thu, 26 May 2016 12:36:23 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5yGk-0003ne-G8 for qemu-devel@nongnu.org; Thu, 26 May 2016 12:36:22 -0400 Received: by mail-wm0-x243.google.com with SMTP id n129so6555192wmn.1 for ; Thu, 26 May 2016 09:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gv0+YQ4Lo7qTBkwDuY0G4yQh7oOIh63uvRoDreHzz/c=; b=MK0TqMsEcONGBFnf1XM4GY40cCAaD6r9B8Hk6NnnR25PwJ2U0A0GYbiaEpYpBIHfL7 QrHvnaZ3h9fvu97nO8b4h0EhKmZdJ6wzSOsFfiPaOPSAGV35tBYvq0AxFT7D/JmFe+31 tcCNFuPcOmZp3hrlVkVbBU1kn4OnFQjbQAkZscIVtCtCuPE/c7U+EAPkcrhTsveAu6Vn fZAbcdbiy3Rq+KkFTWTlliNjRt5aVhHUmm1xb9Ldz/WDjZxZ7Qnqw/z2yo4gQUBThdF/ d1vONOskRNkivZ4QgNkmaLtvYo6EOZaevAAdmlmB38V+ZVv+A1Iz+0XaXGaqCfewyZ9Y f7iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gv0+YQ4Lo7qTBkwDuY0G4yQh7oOIh63uvRoDreHzz/c=; b=eSW6nMaSrNw9M3NrEuaui2gS/YaiiF1vqwOwi3sF/LaxLMNm8+TIwNc6Hasc4Vv0uE LLEjpI6OppkId2LOzKiesZGvmsqH7iVKfOqM4x0nbdvflxhoXu2qTwP3QgpgJBmj3A6o LPnMNO0ThoelaEQhnDWX1tGcwd4tYuyQFE8j4mmqbt70NgSn68oWthxoCVzBTA5q9Pz6 GdlPbeQ9F6VJDOue3PQI613/69lmE1cjOXVdR55DcMPJZN/AJ1Vu9JeDdVQvSQiJyr/c QJJY6wP2jjy53BPWrqLGiPIh32ozkqYOpqOECiPS1FSbbrAn1P7yoeF7hbAbKFcf3vbm gSIw== X-Gm-Message-State: ALyK8tKma9yf8WXAb64S0uJa0eghDa41C3Ctmqknss0cIv0wjyMzgXKnabfy1NvV0RF2Ww== X-Received: by 10.194.110.137 with SMTP id ia9mr10361521wjb.107.1464280581857; Thu, 26 May 2016 09:36:21 -0700 (PDT) Received: from linarch.localdomain (LPuteaux-656-1-278-113.w80-15.abo.wanadoo.fr. [80.15.154.113]) by smtp.googlemail.com with ESMTPSA id lf9sm15133703wjc.44.2016.05.26.09.36.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 09:36:20 -0700 (PDT) From: Alvise Rigo To: mttcg@listserver.greensocs.com, alex.bennee@linaro.org Date: Thu, 26 May 2016 18:35:48 +0200 Message-Id: <20160526163549.3276-10-a.rigo@virtualopensystems.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160526163549.3276-1-a.rigo@virtualopensystems.com> References: <20160526163549.3276-1-a.rigo@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [RFC 09/10] cputlb: Query tlb_flush_page_all X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, rth@twiddle.net, claudio.fontana@huawei.com, qemu-devel@nongnu.org, Alvise Rigo , cota@braap.org, serge.fdrv@gmail.com, pbonzini@redhat.com, jani.kokkonen@huawei.com, tech@virtualopensystems.com, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Secure tlb_flush_page_all() by waiting the queried flushes to be actually completed using async_wait_run_on_cpu(); Signed-off-by: Alvise Rigo --- cputlb.c | 15 ++++++++++----- include/exec/exec-all.h | 4 ++-- target-arm/helper.c | 4 ++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cputlb.c b/cputlb.c index 77a1997..4ed0cc8 100644 --- a/cputlb.c +++ b/cputlb.c @@ -346,13 +346,18 @@ static void tlb_flush_page_async_work(CPUState *cpu, void *opaque) tlb_flush_page(cpu, GPOINTER_TO_UINT(opaque)); } -void tlb_flush_page_all(target_ulong addr) +void tlb_flush_page_all(CPUState *this_cpu, target_ulong addr) { - CPUState *cpu; + CPUState *other_cpu; - CPU_FOREACH(cpu) { - async_run_on_cpu(cpu, tlb_flush_page_async_work, - GUINT_TO_POINTER(addr)); + CPU_FOREACH(other_cpu) { + if (other_cpu != this_cpu) { + async_wait_run_on_cpu(other_cpu, this_cpu, + tlb_flush_page_async_work, + GUINT_TO_POINTER(addr)); + } else { + tlb_flush_page(current_cpu, addr); + } } } diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index cb891d2..36f1b81 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -191,7 +191,7 @@ void tlb_set_page(CPUState *cpu, target_ulong vaddr, void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr); void probe_write(CPUArchState *env, target_ulong addr, int mmu_idx, uintptr_t retaddr); -void tlb_flush_page_all(target_ulong addr); +void tlb_flush_page_all(CPUState *this_cpu, target_ulong addr); #else static inline void tlb_flush_page(CPUState *cpu, target_ulong addr) { @@ -209,7 +209,7 @@ static inline void tlb_flush_page_by_mmuidx(CPUState *cpu, CPUState *target, static inline void tlb_flush_by_mmuidx(CPUState *cpu, CPUState *target ...) { } -static inline void tlb_flush_page_all(target_ulong addr) +static inline void tlb_flush_page_all(CPUState *this_cpu, target_ulong addr) { } #endif diff --git a/target-arm/helper.c b/target-arm/helper.c index 0187c0a..8988c8b 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -554,13 +554,13 @@ static void tlbiasid_is_write(CPUARMState *env, const ARMCPRegInfo *ri, static void tlbimva_is_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - tlb_flush_page_all(value & TARGET_PAGE_MASK); + tlb_flush_page_all(ENV_GET_CPU(env), value & TARGET_PAGE_MASK); } static void tlbimvaa_is_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - tlb_flush_page_all(value & TARGET_PAGE_MASK); + tlb_flush_page_all(ENV_GET_CPU(env), value & TARGET_PAGE_MASK); } static const ARMCPRegInfo cp_reginfo[] = {