From patchwork Sat Feb 1 19:28:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1232286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=UGAx3YFq; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4894963LbWz9sRR for ; Sun, 2 Feb 2020 06:36:58 +1100 (AEDT) Received: from localhost ([::1]:49380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixyZc-0000Xi-86 for incoming@patchwork.ozlabs.org; Sat, 01 Feb 2020 14:36:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58599) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixySP-00079L-PK for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixySO-0006Uu-I6 for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:29 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:33392) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixySO-0006UT-CA for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:28 -0500 Received: by mail-pj1-x1044.google.com with SMTP id m7so3936034pjs.0 for ; Sat, 01 Feb 2020 11:29:28 -0800 (PST) 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=A62BKHsum52XJEWLW3Xhs8oGxaRzaiLid6BDgVa6hV8=; b=UGAx3YFqcbomPyR3FBmDMEKWkKdofPgypnE4thTQQVzOWGCpA1NuCStnGjVut8g/LF JzUWMA0iHGYx893to02G0PPTxd28m4PXkiPzoz7Z8OjyZ3OK+bbcjsJr+hi30Q8+Rmf1 2lvfZlZxLNsMrRux67Ka+1t3ezLxVcEAZfvhy83ksYLDUaV21hPcUzCH3tVzJWzMC/vq koYQnh2calhMRjufEW77f5ExKYtF2pAJ6T5H+7CDqORsX7I85nZljqahnrYC7RT1Hpjd KTXedRjbln0983/7E+mwj3FbyEzCpC3Phg08YyDHNVF30+t+28/6sz2FKLaKvWgTzviA 0NnA== 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=A62BKHsum52XJEWLW3Xhs8oGxaRzaiLid6BDgVa6hV8=; b=d4aj16zqe8GlSZL56rJfqAR8uWHh/59lKN75TCRuVFZcWfjNmF43wXm44n5VkrCq5h IX8tYk9pvCGGMaT0tCvNkOUvSG28haQJAH4wgOo7gwW4C4xosreUqq32pGlK/yeKY9Ru 3LpcQGQfbERV2+yDccvL1FanGdN/NpknB+B9CqJzrnxdMs9pRKZ47E7azZeZyBEZLF8W H+P/vjmP3q57P+IZ6UwI9u2FJxwKex/gm8jktDti2+h7nQFZTu39V6eM8HswFgQurVh8 7QS8Dp+EgecOL7bJ0W20m1UD7rRcloqFdxS6Pamf+eoivcJxNYSZnCArcRw7sGS7r0lw wb5g== X-Gm-Message-State: APjAAAXR3lQeX3dIU1kHRi6C7goII9t1c8AMq518YdEK6v/8FVOdW/UQ JQuNN2qX6nOVW84TKcMzHYpgbhmwNxw= X-Google-Smtp-Source: APXvYqx45AqtRDRs49lCKAnHLYE+7mwbrweIHwKBxFRY+NGHI4xFKCzCEvzIeXQXXwz6NH8ngAeeYA== X-Received: by 2002:a17:90a:5d85:: with SMTP id t5mr19892507pji.126.1580585367087; Sat, 01 Feb 2020 11:29:27 -0800 (PST) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id l7sm3668509pga.27.2020.02.01.11.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 11:29:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 08/41] target/arm: Simplify tlb_force_broadcast alternatives Date: Sat, 1 Feb 2020 11:28:43 -0800 Message-Id: <20200201192916.31796-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200201192916.31796-1-richard.henderson@linaro.org> References: <20200201192916.31796-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1044 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: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Rather than call to a separate function and re-compute any parameters for the flush, simply use the correct flush function directly. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/helper.c | 52 +++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 49da685b29..bf69935550 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -614,56 +614,54 @@ static void tlbiall_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { /* Invalidate all (TLBIALL) */ - ARMCPU *cpu = env_archcpu(env); + CPUState *cs = env_cpu(env); if (tlb_force_broadcast(env)) { - tlbiall_is_write(env, NULL, value); - return; + tlb_flush_all_cpus_synced(cs); + } else { + tlb_flush(cs); } - - tlb_flush(CPU(cpu)); } static void tlbimva_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { /* Invalidate single TLB entry by MVA and ASID (TLBIMVA) */ - ARMCPU *cpu = env_archcpu(env); + CPUState *cs = env_cpu(env); + value &= TARGET_PAGE_MASK; if (tlb_force_broadcast(env)) { - tlbimva_is_write(env, NULL, value); - return; + tlb_flush_page_all_cpus_synced(cs, value); + } else { + tlb_flush_page(cs, value); } - - tlb_flush_page(CPU(cpu), value & TARGET_PAGE_MASK); } static void tlbiasid_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { /* Invalidate by ASID (TLBIASID) */ - ARMCPU *cpu = env_archcpu(env); + CPUState *cs = env_cpu(env); if (tlb_force_broadcast(env)) { - tlbiasid_is_write(env, NULL, value); - return; + tlb_flush_all_cpus_synced(cs); + } else { + tlb_flush(cs); } - - tlb_flush(CPU(cpu)); } static void tlbimvaa_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { /* Invalidate single entry by MVA, all ASIDs (TLBIMVAA) */ - ARMCPU *cpu = env_archcpu(env); + CPUState *cs = env_cpu(env); + value &= TARGET_PAGE_MASK; if (tlb_force_broadcast(env)) { - tlbimvaa_is_write(env, NULL, value); - return; + tlb_flush_page_all_cpus_synced(cs, value); + } else { + tlb_flush_page(cs, value); } - - tlb_flush_page(CPU(cpu), value & TARGET_PAGE_MASK); } static void tlbiall_nsnh_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -3965,11 +3963,10 @@ static void tlbi_aa64_vmalle1_write(CPUARMState *env, const ARMCPRegInfo *ri, int mask = vae1_tlbmask(env); if (tlb_force_broadcast(env)) { - tlbi_aa64_vmalle1is_write(env, NULL, value); - return; + tlb_flush_by_mmuidx_all_cpus_synced(cs, mask); + } else { + tlb_flush_by_mmuidx(cs, mask); } - - tlb_flush_by_mmuidx(cs, mask); } static int alle1_tlbmask(CPUARMState *env) @@ -4091,11 +4088,10 @@ static void tlbi_aa64_vae1_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t pageaddr = sextract64(value << 12, 0, 56); if (tlb_force_broadcast(env)) { - tlbi_aa64_vae1is_write(env, NULL, value); - return; + tlb_flush_page_by_mmuidx_all_cpus_synced(cs, pageaddr, mask); + } else { + tlb_flush_page_by_mmuidx(cs, pageaddr, mask); } - - tlb_flush_page_by_mmuidx(cs, pageaddr, mask); } static void tlbi_aa64_vae2is_write(CPUARMState *env, const ARMCPRegInfo *ri,