From patchwork Thu Feb 2 07:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 13125468 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 10BA3C05027 for ; Thu, 2 Feb 2023 07:53:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNUOt-0001Oo-NP; Thu, 02 Feb 2023 02:52:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNUOq-0001NN-MZ for qemu-devel@nongnu.org; Thu, 02 Feb 2023 02:52:52 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNUOo-0007jb-NZ for qemu-devel@nongnu.org; Thu, 02 Feb 2023 02:52:52 -0500 Received: by mail-pj1-x102a.google.com with SMTP id cq16-20020a17090af99000b0022c9791ac39so4771611pjb.4 for ; Wed, 01 Feb 2023 23:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3SFomLrmZIRv5rQjAeMZtXdriC7DG7safnUA2txOf0s=; b=qfL1hh3S+PvaWPN5684F2TExkbOEU/+O83ITMr0qbA1nKRqWFx0QV87IRpOQW+CXBH Pr4Kh8vKLGz8Rs6/sKKtQ+Sjz6aRLnTa1FqKs3zYu7H8aU4j6GVzf3M/XbLwP25mrQLl YE26sji/PGvj2XEoFMuLjiCIF4OaO8dmgqQs01+o/sw0I4xyVasccuGnXICggCd+tOa0 ySxLUIz5iKFR6gaWNo6aKUee3HjF8SE8VGFjeeT9uix7OZPcP/TBwsemnYb2zGM8FrQw u/uqDrlTRjNcJHB5FUxmo0AkAzYPt7zC81PqCM/SfaOqGEfLnP02JotQ3sNrhzWsaISr htBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3SFomLrmZIRv5rQjAeMZtXdriC7DG7safnUA2txOf0s=; b=e0A24BEA+b6D3Fqsg0AHoUWbckPE1BAeSCFon0qwMCeH41GQGsELJ6mulVe5LLFh6q 8wrqni4Awe/wmzDD7J+JD6LET41oNlmjAgY4XUB1GhY70yznDlYDPvDim4LLsid/SSmo zxI/jAT4UrQyiSaxg+9CEVOYnT/db6wHjQnzM8o67krH8uJjRQTKDKrcp509PzDst80n EN6TbFWk8b1XZKzhf3eo/zmjYrALd1lBEQT40F2l+Iz4olcHVK69SN0n6LTMIihtGuRa 8xnSGEcSmsT/w1Pqte/INuKYNK6mJh36BXS/eeupAYkd+i0a7/W6EA7bqmH2op96a36q 6APg== X-Gm-Message-State: AO0yUKVFwGKZlaStfL/1NmfsX5dWCA4hJ/AgRZxMiSzkvYfODKfkGvDw gPyUj9szocY45sskkx+OAHmDLeU0aUTZIfZI X-Google-Smtp-Source: AK7set97XbZb6kP4K93H6SNtwEz38FEALbnQ3vW/sQ4VzQmlbE3Itu0Pc/97YVUcOMQlwDoBZ+yfyA== X-Received: by 2002:a17:90b:1d05:b0:22c:6c0c:3e3b with SMTP id on5-20020a17090b1d0500b0022c6c0c3e3bmr5573231pjb.7.1675324369324; Wed, 01 Feb 2023 23:52:49 -0800 (PST) Received: from stoup.. (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id b4-20020a17090a7ac400b0022c35afad5bsm2496763pjl.16.2023.02.01.23.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 23:52:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: anders.roxell@linaro.org, qemu-arm@nongnu.org Subject: [PATCH 1/4] target/arm: Flush only required tlbs for TCR_EL[12] Date: Wed, 1 Feb 2023 21:52:39 -1000 Message-Id: <20230202075242.260793-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202075242.260793-1-richard.henderson@linaro.org> References: <20230202075242.260793-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The ASID only affects stage1 of the relevant regime. Signed-off-by: Richard Henderson --- target/arm/helper.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 72b37b7cf1..8ad9a667f1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4054,13 +4054,30 @@ static void vmsa_ttbcr_write(CPUARMState *env, const ARMCPRegInfo *ri, raw_write(env, ri, value); } -static void vmsa_tcr_el12_write(CPUARMState *env, const ARMCPRegInfo *ri, +static void vmsa_tcr_el1_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { - ARMCPU *cpu = env_archcpu(env); + CPUState *cs = env_cpu(env); - /* For AArch64 the A1 bit could result in a change of ASID, so TLB flush. */ - tlb_flush(CPU(cpu)); + /* For AA64, the A1 or AS bits could result in a change of ASID. */ + tlb_flush_by_mmuidx(cs, (ARMMMUIdxBit_E10_1 | + ARMMMUIdxBit_E10_1_PAN | + ARMMMUIdxBit_E10_0)); + raw_write(env, ri, value); +} + +static void vmsa_tcr_el2_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + CPUState *cs = env_cpu(env); + + /* + * For AA64, the A1 or AS bits could result in a change of ASID. + * This only affects the EL2&0 regime, not the EL2 regime. + */ + tlb_flush_by_mmuidx(cs, (ARMMMUIdxBit_E20_2 | + ARMMMUIdxBit_E20_2_PAN | + ARMMMUIdxBit_E20_0)); raw_write(env, ri, value); } @@ -4151,7 +4168,7 @@ static const ARMCPRegInfo vmsa_cp_reginfo[] = { { .name = "TCR_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .crn = 2, .crm = 0, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .accessfn = access_tvm_trvm, - .writefn = vmsa_tcr_el12_write, + .writefn = vmsa_tcr_el1_write, .raw_writefn = raw_write, .resetvalue = 0, .fieldoffset = offsetof(CPUARMState, cp15.tcr_el[1]) }, @@ -5894,7 +5911,7 @@ static const ARMCPRegInfo el2_cp_reginfo[] = { .resetvalue = 0 }, { .name = "TCR_EL2", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .opc1 = 4, .crn = 2, .crm = 0, .opc2 = 2, - .access = PL2_RW, .writefn = vmsa_tcr_el12_write, + .access = PL2_RW, .writefn = vmsa_tcr_el2_write, .fieldoffset = offsetof(CPUARMState, cp15.tcr_el[2]) }, { .name = "VTCR", .state = ARM_CP_STATE_AA32, .cp = 15, .opc1 = 4, .crn = 2, .crm = 1, .opc2 = 2,