From patchwork Thu Jul 14 13:22:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 590381 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp1574719max; Thu, 14 Jul 2022 06:25:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sXI14s+algCgCcpmvfu14oCSe3fwTAmxpfiMZ/yp84hC1YAyjBgmnUxzYnGm8ypRb4qfIe X-Received: by 2002:a05:622a:1c3:b0:317:93d8:c041 with SMTP id t3-20020a05622a01c300b0031793d8c041mr8075680qtw.101.1657805141237; Thu, 14 Jul 2022 06:25:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657805141; cv=none; d=google.com; s=arc-20160816; b=h0eFTJnNUHX1zGW5agnR5AqA7KH5r2YjT7ZpE6+yRnujCEripiOGh6ZQ1etTEunjtF nE4Deko4vu/UfBXFoCrkdOrosKbrZhPqBdCJWFw8xuiYQJ3reW9hUKflPeG2kqIDRquk KO7bPnvyFDfaXcPo9so/FE02GSuJmYRSbTEYCkDDLwLNfzv23gqU/T5EOqDQOAihuvjs /G8bWW3CN5Fup0JMjEv6mKtCsTwQ+od5OuNZ4pD9vUB/a9CXMzbqTP+1/Q3Fh6BLJZRc PiHMAWMKRHPlxDP9qb5MrtTKd7vTgEaZ1OVHvah7b6r0/Z3GZVdXS/Ye3bMl35h6tKpt cHow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gSC4PvbkoAcYZyiRlv4heZM9qLY+Ka++bw/hOuy6a5U=; b=mbChBu3lREmJPaE1moNHkYjPDsxolTwTaQG6MEMPYDDlgu5Lmjbs5wh1533xELIy0f 8MHJ/mjt5IdP7a4V/p3Zzd8/e71OqcBH2m5yfXySB9yrob53A7qGJ9E4SG4FWi0nWzX2 lyNAI1MUUpMstXrlQYWXqNQHAQi92WAZw9fuQs9+3nKJgteQlSOkazI8OVQztBj4kHRW /fjulYxpzdg2ZnEnuMjEovYIGrTk1ryyGTtg+xSBfECRHp92P4hqFB7ZXf55qtQaJlzc AqUBr+PLSWXB7Ans6ZNc+g+FBYWd6kXa3psXY9vUWuJ6oki/Wqn/MFbri88YqViNgiId X+Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XEt+GqKS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bw18-20020a05622a099200b0031ed3da91d1si557393qtb.443.2022.07.14.06.25.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jul 2022 06:25:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XEt+GqKS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oByqa-0002HP-Qg for patch@linaro.org; Thu, 14 Jul 2022 09:25:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oByoA-0002Bx-Vi for qemu-devel@nongnu.org; Thu, 14 Jul 2022 09:23:11 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:43599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oByo8-0004o5-2I for qemu-devel@nongnu.org; Thu, 14 Jul 2022 09:23:10 -0400 Received: by mail-wr1-x429.google.com with SMTP id d16so2533436wrv.10 for ; Thu, 14 Jul 2022 06:23:07 -0700 (PDT) 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=gSC4PvbkoAcYZyiRlv4heZM9qLY+Ka++bw/hOuy6a5U=; b=XEt+GqKSrAVSLav/UkeFpZhjP6bfLISWGoj9HtNNKS3Msmi4zYcFXvy6R4Q6/2o2ta tRR29w77JWHTOHlSOxwS3ALmo8MEbJ7kVHMMUUpRQhX+gAy9p+8r8mQSfNPHUs/qKHV6 q8k9EJ1RVflq8suv0heHHGbkNrtLKIkV/LL9O/pVlmtAzpGVa0e/+ENMl6AZEvhMG7Cv DXj64zvRync7a5/3VRrNg3NYUI4t5QroMvdG7iMNi48ZNVc0AQTCLEZDhX+U1RPUurms NR2u76cP/wGx51Jm6HOGBmNQOV3HFq9IgIGYquudSAhj6HTOxFcaJMWoHvvuzUZ4uJie RuCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gSC4PvbkoAcYZyiRlv4heZM9qLY+Ka++bw/hOuy6a5U=; b=UBsGhC+vTOM7EcLIzFqRk0Ie6bQLC898DXaPmrfcYKAlt+S/WAjCZ72G5uRvAXQOVN RkUE2hxuKgDINUnFO/uRlgVGdO7nUs1plg5+NjF4vkVApmQRyJLPMbM/C5RAfn9IqiaB oFxA3ZE6asI5oDzVanBsvekE1eWqd53+VbcCUS3ADKFTjIrV0857DxEcv1xGqAhlYofV UnUIO9RP/FKlr7vGP+8p9yCwJG2sjEzgw7VgSy5cLIU+QpIUe9gpl7i74zasTJckY/lZ 4WOx+Sp2WU2WE9oISb6jfxydZIlCZT7RbqqZUbq75fZv34QexhUZL2ZAD/TBoQ8r6yip QY0A== X-Gm-Message-State: AJIora9088vXX4qt+MMT06AElFeNCDCufxN8ZY4CpkX1jFgBeFMWdp5o XaO2PjEa6rjW/A9oG2PMtK0FYg== X-Received: by 2002:a05:6000:887:b0:21d:4fca:44fc with SMTP id ca7-20020a056000088700b0021d4fca44fcmr8413446wrb.495.1657804986815; Thu, 14 Jul 2022 06:23:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k11-20020a7bc40b000000b0039c5cecf206sm1925079wmi.4.2022.07.14.06.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 06:23:06 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Idan Horowitz Subject: [PATCH 1/7] target/arm: Define and use new regime_tcr_value() function Date: Thu, 14 Jul 2022 14:22:57 +0100 Message-Id: <20220714132303.1287193-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714132303.1287193-1-peter.maydell@linaro.org> References: <20220714132303.1287193-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The regime_tcr() function returns a pointer to a struct TCR corresponding to the TCR controlling a translation regime. The struct TCR has the raw value of the register, plus two fields mask and base_mask which are used as a small optimization in the case of 32-bit short-descriptor lookups. Almost all callers of regime_tcr() only want the raw register value. Define and use a new regime_tcr_value() function which returns only the raw 64-bit register value. This is a preliminary to removing the 32-bit short descriptor optimization -- it only saves a handful of bit operations, which is tiny compared to the overhead of doing a page table walk at all, and the TCR struct is awkward and makes fixing https://gitlab.com/qemu-project/qemu/-/issues/1103 unnecessarily difficult. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/internals.h | 6 ++++++ target/arm/helper.c | 6 +++--- target/arm/ptw.c | 8 ++++---- target/arm/tlb_helper.c | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 00e2e710f6c..fa046124fa8 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -793,6 +793,12 @@ static inline TCR *regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx) return &env->cp15.tcr_el[regime_el(env, mmu_idx)]; } +/* Return the raw value of the TCR controlling this translation regime */ +static inline uint64_t regime_tcr_value(CPUARMState *env, ARMMMUIdx mmu_idx) +{ + return regime_tcr(env, mmu_idx)->raw_tcr; +} + /** * arm_num_brps: Return number of implemented breakpoints. * Note that the ID register BRPS field is "number of bps - 1", diff --git a/target/arm/helper.c b/target/arm/helper.c index cfcad97ce07..b45c81c714c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4216,7 +4216,7 @@ static int vae1_tlbmask(CPUARMState *env) static int tlbbits_for_regime(CPUARMState *env, ARMMMUIdx mmu_idx, uint64_t addr) { - uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; + uint64_t tcr = regime_tcr_value(env, mmu_idx); int tbi = aa64_va_parameter_tbi(tcr, mmu_idx); int select = extract64(addr, 55, 1); @@ -10158,7 +10158,7 @@ static int aa64_va_parameter_tcma(uint64_t tcr, ARMMMUIdx mmu_idx) ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, ARMMMUIdx mmu_idx, bool data) { - uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; + uint64_t tcr = regime_tcr_value(env, mmu_idx); bool epd, hpd, using16k, using64k, tsz_oob, ds; int select, tsz, tbi, max_tsz, min_tsz, ps, sh; ARMCPU *cpu = env_archcpu(env); @@ -10849,7 +10849,7 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, { CPUARMTBFlags flags = {}; ARMMMUIdx stage1 = stage_1_mmu_idx(mmu_idx); - uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; + uint64_t tcr = regime_tcr_value(env, mmu_idx); uint64_t sctlr; int tbii, tbid; diff --git a/target/arm/ptw.c b/target/arm/ptw.c index e71fc1f4293..0d7e8ffa41b 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -820,7 +820,7 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64, static ARMVAParameters aa32_va_parameters(CPUARMState *env, uint32_t va, ARMMMUIdx mmu_idx) { - uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; + uint64_t tcr = regime_tcr_value(env, mmu_idx); uint32_t el = regime_el(env, mmu_idx); int select, tsz; bool epd, hpd; @@ -994,7 +994,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address, uint32_t attrs; int32_t stride; int addrsize, inputsize, outputsize; - TCR *tcr = regime_tcr(env, mmu_idx); + uint64_t tcr = regime_tcr_value(env, mmu_idx); int ap, ns, xn, pxn; uint32_t el = regime_el(env, mmu_idx); uint64_t descaddrmask; @@ -1112,8 +1112,8 @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address, * For stage 2 translations the starting level is specified by the * VTCR_EL2.SL0 field (whose interpretation depends on the page size) */ - uint32_t sl0 = extract32(tcr->raw_tcr, 6, 2); - uint32_t sl2 = extract64(tcr->raw_tcr, 33, 1); + uint32_t sl0 = extract32(tcr, 6, 2); + uint32_t sl2 = extract64(tcr, 33, 1); uint32_t startlevel; bool ok; diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c index 7d8a86b3c45..a2f87a5042d 100644 --- a/target/arm/tlb_helper.c +++ b/target/arm/tlb_helper.c @@ -20,7 +20,7 @@ bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx) return true; } if (arm_feature(env, ARM_FEATURE_LPAE) - && (regime_tcr(env, mmu_idx)->raw_tcr & TTBCR_EAE)) { + && (regime_tcr_value(env, mmu_idx) & TTBCR_EAE)) { return true; } return false;