From mboxrd@z Thu Jan 1 00:00:00 1970 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 E7F62C83F1B for ; Fri, 11 Jul 2025 22:52:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uaMb7-0001Be-0t; Fri, 11 Jul 2025 18:52:05 -0400 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 1uaMYa-0007Pl-W3 for qemu-devel@nongnu.org; Fri, 11 Jul 2025 18:49:40 -0400 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uaMYW-0008NC-FB for qemu-devel@nongnu.org; Fri, 11 Jul 2025 18:49:27 -0400 Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-40ba3d91c35so1473558b6e.3 for ; Fri, 11 Jul 2025 15:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1752274159; x=1752878959; darn=nongnu.org; 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=QoVt34T1baW12rVn5dQP7UZyDzzjRTAvBEJWDUabYc8=; b=n9NaGnPLsvzJs+dCKkeZ6pAhsiDx4djkvkCVePO/q5kto9gZO4Bg23GkBNBVdEwZ03 F66YhzS+fZ2LNn4oQMkwkUiPA8c7jTe/kda1HhmA7zazsEh0An442W2dKX1Yn5vvdCaN tSELltLffrweNA2OmMrzCaJPgggcWJskMJPBz0kuE4GHOX6wYNlPpG/QREleqpEu1MYX w8j+GsL6g0/8sDoXBLdHYrnkpLL3juUpoS7gvDmkQ0XCkbSxqkIu4d2ZVT9crvVZ02SI naOmN2bGi3mKQ1R7gtqD7k4AkBigRnJ8/RcEaKn81MNzvRYv+wgkp1tD9CyogFmyu3/r DkxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752274159; x=1752878959; 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=QoVt34T1baW12rVn5dQP7UZyDzzjRTAvBEJWDUabYc8=; b=CmbZkxC6SXvgnr9kTQcSXl+gbxMK1SDGx2vhRK266AWLclv6gF6QzC+D2MAt3RyU+6 6KAaOttwyOiRg144Q7YdEsbAEXurBQ+V52toCI6wqlVbXZY+nPuXBajgmBaKljUz9oq3 HpKXPDjtpjwvslBO3I3otTn5sBtf1Ub/QhpNHTpMCOWT0QesY7MEnZ5ekrr8/DUuWVBY oiMx41n6rYKwpwYSceQ7pfM+Wv11ZDBWyWuX705tMzALQ69Sn1Rz67LknFCdK974Ue+F kTib1t6k+LrF/Z1ah1wpjNj7lzpCaAA9kcIQ8xCNDrHHxx7e4sn4rj5p0PlEoR4iKHdr apww== X-Gm-Message-State: AOJu0Ywvq7EymvXi8qAvQm+7IYU9pGsUjDVnmkcxegutvLGsSA2x0nyW EoN5JV+w0kf9iK+beqmIMUHdHc8rcp+GrS37FU18Pwce4LhntZVuDQ7QdYzFxsKO8ZHM4PVFF9t o623WXrQ= X-Gm-Gg: ASbGncvJrlp6rVLXi8BE0oX5dX63Ym5vfspKaA0pPOnj9RI8tTWDZAEAFCCf4zdPWcG lI/AAlkvsZ7E0Wa+SQD/W2xxwemjkJUp0UWxYWv7756c1xw3f3X20h1tfB3y+vXPvEE1/0oN2y4 TeSNte33mlApXcyU2IhDcQuUyByb+Nmq9yAKDPnZGhAI45ro8oVQnPoxRMSme07mSnAcFv5w12h N5326ucLO/AoukeMzrqRss3L1F0VHpSnYAhf3355MQ6Y5L6aC/+R7BpBxIaCDajQMr1sayHJS45 GLZRgOAladRRl24F0bA6cFPwcoQYGZDMm9f9cpd1bsS4t+QlKSkNV9f+E/5U22aS9yIHaRHzjWp pr7+CvjvMLNX6StAWPCHHml+vsnWvXaIbMj0GbLCR07UI2eyla+k0pKud6jEUA1UFGMaFK9zC4n AolkNRRfvS X-Google-Smtp-Source: AGHT+IHSaMXCLhJsYxE72egofJvuoL3B7jCSbh+M675b/V+Nvl80TQx28723SE4aU5enP6/eM/nt8A== X-Received: by 2002:a05:6808:16aa:b0:40b:1222:8fd8 with SMTP id 5614622812f47-41539f925c2mr3663531b6e.35.1752274158939; Fri, 11 Jul 2025 15:49:18 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-143.totalplay.net. [187.189.51.143]) by smtp.gmail.com with ESMTPSA id 5614622812f47-414197c6064sm696638b6e.20.2025.07.11.15.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 15:49:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH v2 1/9] target/arm: Add prot_check parameter to pmsav8_mpu_lookup Date: Fri, 11 Jul 2025 16:49:07 -0600 Message-ID: <20250711224915.62369-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250711224915.62369-1-richard.henderson@linaro.org> References: <20250711224915.62369-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x232.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 Separate the access_type from the protection check. Signed-off-by: Richard Henderson --- target/arm/internals.h | 5 +++-- target/arm/ptw.c | 11 ++++++----- target/arm/tcg/m_helper.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 6c1112e641..a02439df63 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1626,8 +1626,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, __attribute__((nonnull)); bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address, - MMUAccessType access_type, ARMMMUIdx mmu_idx, - bool is_secure, GetPhysAddrResult *result, + MMUAccessType access_type, unsigned prot_check, + ARMMMUIdx mmu_idx, bool is_secure, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi, uint32_t *mregion); void arm_log_exception(CPUState *cs); diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 561bf2678e..a914e7e23c 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2561,8 +2561,9 @@ static uint32_t *regime_rlar(CPUARMState *env, ARMMMUIdx mmu_idx, } bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address, - MMUAccessType access_type, ARMMMUIdx mmu_idx, - bool secure, GetPhysAddrResult *result, + MMUAccessType access_type, unsigned prot_check, + ARMMMUIdx mmu_idx, bool secure, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi, uint32_t *mregion) { /* @@ -2750,7 +2751,7 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address, if (arm_feature(env, ARM_FEATURE_M)) { fi->level = 1; } - return !(result->f.prot & (1 << access_type)); + return (prot_check & ~result->f.prot) != 0; } static bool v8m_is_sau_exempt(CPUARMState *env, @@ -2952,8 +2953,8 @@ static bool get_phys_addr_pmsav8(CPUARMState *env, } } - ret = pmsav8_mpu_lookup(env, address, access_type, mmu_idx, secure, - result, fi, NULL); + ret = pmsav8_mpu_lookup(env, address, access_type, 1 << access_type, + mmu_idx, secure, result, fi, NULL); if (sattrs.subpage) { result->f.lg_page_size = 0; } diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 28307b5615..d856e3bc8e 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -2829,8 +2829,8 @@ uint32_t HELPER(v7m_tt)(CPUARMState *env, uint32_t addr, uint32_t op) ARMMMUFaultInfo fi = {}; /* We can ignore the return value as prot is always set */ - pmsav8_mpu_lookup(env, addr, MMU_DATA_LOAD, mmu_idx, targetsec, - &res, &fi, &mregion); + pmsav8_mpu_lookup(env, addr, MMU_DATA_LOAD, PAGE_READ, mmu_idx, + targetsec, &res, &fi, &mregion); if (mregion == -1) { mrvalid = false; mregion = 0; -- 2.43.0