From patchwork Thu Aug 24 09:28:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 716523 Delivered-To: patch@linaro.org Received: by 2002:adf:f747:0:b0:317:ecd7:513f with SMTP id z7csp1236306wrp; Thu, 24 Aug 2023 02:30:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtzru4l5n4oEQrwVxN9G/mp92mUsmVXmx3dNNv0C8IM3iJ/489z47tEXOqndjTO6XtJnjx X-Received: by 2002:a05:620a:1727:b0:76d:b33b:59cd with SMTP id az39-20020a05620a172700b0076db33b59cdmr8057526qkb.20.1692869442981; Thu, 24 Aug 2023 02:30:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692869442; cv=none; d=google.com; s=arc-20160816; b=g9Skmd2nt9M1ZE5e4w4GOXvtoq+jhVl5zJeiiu8xJenKTKAohGLt6gdrjNs1TKqpvJ usPlEvw93Ox9Ze1lu2kFjbyP4UqPfef9Ja4Z32bWGBLpnv/PcnNVGYMq1OlrR5cIy7sn 1Fgx2UxJrKpBD5cc0sDlqS0l2mnKQWf48W1WwNPABitmWyTVW2ffiVSAxVYoKMc8A0Ly tp6SSiIFu4hLuq61gXiYuca5klSADt1i1e7EjN6ObWLdLh3ymYaMJUdGHPeXYZzbuWET bHHH42BVtFashgFbmU6PEk1r7eG7BspEPFD8FkokHBl8dOt6vg0teNQX3LB5qPRGbEtr G2sw== 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:to:from :dkim-signature; bh=UGCC5w0EUtVabhmBA26zktdGI7YbZzgKTjnOnP1lMsI=; fh=bFDrUYhlTVi/QyetgXx/byg2+yO/22Hp9SjwoefyKLk=; b=Dmj8R4jVKmgMhDMOlTvKu7lDUrtOH0rQPRSHjLX7b1OijTpuj/jDYYxORHaPKdIfI0 ihXd4dNvF17tappqw6OYAbTsDutYuWEfkIWJ0Ekd91N3zcLQ2E8mXYhPfligRDECnccz i++jsfes9WEhfS4Wf9Wk+NmkrnxtulAo3KRUNUF0j5Q3knXG7x5LAFmPMfdnQRmsql9t 0OZZpgIqFcR+6fd04BTSb7Jn+CogfPl6Wrsd/a+faqsXkxHDaxQnCyHV9FKUSTjDVDoE BZFJ+WntjxdMqRbs0ZSGJsnL1mxRd8tsGqHNwL9NiJ1TVIww+zLDT99I2RqMkXESc8Li CAsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AuKwooqU; 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 bp44-20020a05620a45ac00b0076dab931e93si4111828qkb.422.2023.08.24.02.30.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Aug 2023 02:30:42 -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=AuKwooqU; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ6eY-00070I-KT; Thu, 24 Aug 2023 05:29:24 -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 1qZ6eR-0006JC-BK for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:29:15 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ6eA-0004ym-K1 for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:29:06 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31c3df710bdso3639466f8f.1 for ; Thu, 24 Aug 2023 02:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692869325; x=1693474125; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UGCC5w0EUtVabhmBA26zktdGI7YbZzgKTjnOnP1lMsI=; b=AuKwooqUWZeXlvPuHzCyWTRLds7GokzH3yXdcn/3oWFsCviBHHAaJYm/GEf3Y5esvG vMJEUBcOaJG8BCUzx7gD5gW1ui+XHJI6VTTBAaC8eJ+XJdJ7Opqf+J2Eg9EiUGD+jbq5 O7aPFPec+2SZLTK/9HCqVU/jqi06kNGjrfkamLLtzYIUdoqRnmVkFflfMPFpSwXKuBqu DlBhZaurIQXYaZeXuYbX9WHPhf74o0wC1ve4PpQ7YfKRhjOgZMY+kuPC/i9RH3ToXSoc GUlNi+EKZ6wlFFlzn6KfR5HPeJYA9SdRsbGPMsE9NIzwskxbhEeggC7mb7WLTES3sSwP Yj+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692869325; x=1693474125; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UGCC5w0EUtVabhmBA26zktdGI7YbZzgKTjnOnP1lMsI=; b=Gy5exk4N2YhXs1PLFEgr6NiInRhd6XVuWbPhNh2OjJUn7TO7YMdf27MaL45gHuAsfB I1QbNcyBBZttLw06CvFsXFKe+TtNfHt2LReAA92RLp4vUme41SIEK9Lh8PBW98RT5nPz zUMvocpNbMK1wIkEDNCYKEvySM0owqW/Ad75AdpFNvZz116T4gKOcdV/11NbP4lQB/yV rV6so3KpB+2dXxIHylDKW+AktFWrCpXI96YjL4tx9BIUNpDzCrOp8q9kkQRjvHpf+S/i BY9CyH0xl26ejmfMOwM27yKdjW1l/JeBry/3kxjpkvab42RdyqxxYJ7o6auTSbe9h0qD d2EA== X-Gm-Message-State: AOJu0Yy4T0IPLRzrPUmJjMW1Gf9tiW9U56qsnjJtVW7XU2dI2ZezZCIP qeA4o8qCs+up7QDZW68U70pOpsJDJ6TLI6Gv0FA= X-Received: by 2002:a05:6000:1146:b0:314:152d:f8db with SMTP id d6-20020a056000114600b00314152df8dbmr12690263wrx.58.1692869324992; Thu, 24 Aug 2023 02:28:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id s12-20020adfeccc000000b00317b5c8a4f1sm21844004wro.60.2023.08.24.02.28.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 02:28:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/35] target/arm/ptw: Don't report GPC faults on stage 1 ptw as stage2 faults Date: Thu, 24 Aug 2023 10:28:15 +0100 Message-Id: <20230824092836.2239644-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824092836.2239644-1-peter.maydell@linaro.org> References: <20230824092836.2239644-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In S1_ptw_translate() we set up the ARMMMUFaultInfo if the attempt to translate the page descriptor address into a physical address fails. This used to only be possible if we are doing a stage 2 ptw for that descriptor address, and so the code always sets fi->stage2 and fi->s1ptw to true. However, with FEAT_RME it is also possible for the lookup of the page descriptor address to fail because of a Granule Protection Check fault. These should not be reported as stage 2, otherwise arm_deliver_fault() will incorrectly set HPFAR_EL2. Similarly the s1ptw bit should only be set for stage 2 faults on stage 1 translation table walks, i.e. not for GPC faults. Add a comment to the the other place where we might detect a stage2-fault-on-stage-1-ptw, in arm_casq_ptw(), noting why we know in that case that it must really be a stage 2 fault and not a GPC fault. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230807141514.19075-3-peter.maydell@linaro.org --- target/arm/ptw.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index bafeb876ad7..eb57ebd897b 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -600,8 +600,8 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw, fi->type = ARMFault_GPCFOnWalk; } fi->s2addr = addr; - fi->stage2 = true; - fi->s1ptw = true; + fi->stage2 = regime_is_stage2(s2_mmu_idx); + fi->s1ptw = fi->stage2; fi->s1ns = !is_secure; return false; } @@ -719,6 +719,12 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, env->tlb_fi = NULL; if (unlikely(flags & TLB_INVALID_MASK)) { + /* + * We know this must be a stage 2 fault because the granule + * protection table does not separately track read and write + * permission, so all GPC faults are caught in S1_ptw_translate(): + * we only get here for "readable but not writeable". + */ assert(fi->type != ARMFault_None); fi->s2addr = ptw->out_virt; fi->stage2 = true;