From patchwork Mon Aug 7 14:15:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 711126 Delivered-To: patch@linaro.org Received: by 2002:a05:6359:d30:b0:129:c516:61db with SMTP id gp48csp1565782rwb; Mon, 7 Aug 2023 07:17:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcVf79hy5c8zm59tPguPvORx6mqJMgTIKzMbH5i9m/mRJMk/TIafXJo0rJKKxZrx6/gacc X-Received: by 2002:ac8:598d:0:b0:410:6b6:b9b3 with SMTP id e13-20020ac8598d000000b0041006b6b9b3mr7422492qte.55.1691417871406; Mon, 07 Aug 2023 07:17:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691417871; cv=none; d=google.com; s=arc-20160816; b=aLVTo/pF9ACKloF52ga71qYVq0GV7alXZJX0Vxp2yMvq8lL45eX6bNRvDhPcrHBXc+ NYhJtblz5BIcQIC6g5x0/L/iYcBKedp18xctRfMBJkcrhZW3t1zIypQrGA16rO3EJjy0 +SkzSRm44LtWIx/1lIhixHQqePHBAHGlLRW7mHnu6iS05/cHLCECUEnDE6Tgl17Rztx5 aD277UeAtmOzJm6UxMDre4020AZ7/TaUcoAqGGI8kJqQ/aNndCfQcNP0JznJn24pJITl ncn2AqniKutcrANZT7vhXa5Ih368lJpHNcoeKbITYjAigs5RadDfM4CQ4u/fDzR5sWqv CAKw== 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=cr23TIsFZ3PjCpnV8UZBDI6iYURVIWjSxhQhgKrusGQ=; fh=jvpdohKmRoZMO537s6xMKXXtj7EZws1LOMQI/oP4vXs=; b=q830MiE0uamrl3NpNUWOKxdK9qX6aMwQ9nTel/N/WSapmt8eO6QpmRxvV+4e+78NA5 UXHpZ1XsCh4U35w084pvz0F+CZlSNgwagIzXY1xDrH+EmPEqcfcgkJofrtMbbAMpSb6V apWTxD7lcpFZD6NZqke8NAEosdBpg76kRX1QQ6lKnSDKcGmcc+1fx4YrPcXlT0kzUhjo a9XWD9nczHWl8vnAkmiWB7Y0PnOJbsA2tzmCwA+H309z8uQVTdbAbTaaHhFt9LyVZGSS GyX7wVb9ltsgxqxnTK3u07fGUD1fvs75z54HRjFKRBrXKKQy6SOdUI5rjTbBfcOvOo+Z tBsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=giZh0fYh; 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 u1-20020a05622a198100b004042849cfb3si5056957qtc.262.2023.08.07.07.17.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Aug 2023 07:17:51 -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=giZh0fYh; 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 1qT12Z-0002QR-J8; Mon, 07 Aug 2023 10:16:59 -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 1qT118-0000Ax-UT for qemu-devel@nongnu.org; Mon, 07 Aug 2023 10:15:34 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qT114-0005V9-Dg for qemu-devel@nongnu.org; Mon, 07 Aug 2023 10:15:29 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fe426b86a8so37493745e9.3 for ; Mon, 07 Aug 2023 07:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691417724; x=1692022524; 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=cr23TIsFZ3PjCpnV8UZBDI6iYURVIWjSxhQhgKrusGQ=; b=giZh0fYhUvDjCGYQSXSlD0We98uOeWc4tt1dJ0qBDzDSupVTUrhUQL2YfxLJfAfCIM R0L4fzFykUtfElyEqEcyy4QDh2Te8HPOCVD5a5L8kiWruqC9eW4chsfcQiJsu4StL+39 fhX29I1ZfpQrOKDYqjaAclKUhI/gxkzqqf/4T5EceihvZrOGlFeFfbY1ETXfowmuDbcI bDL8fXyBWTzeOzTdwMU+K2M4kiejDLkvpf08fimFAHaFgqKf2tfYNpK7Ch14swTKDhx+ qm4lCpI7e5ouj4m0wedBRCs7qyPefcqCBS4ywIUmV+O11htddSEix4/R4+IlAEH0jn4C z0ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691417724; x=1692022524; 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=cr23TIsFZ3PjCpnV8UZBDI6iYURVIWjSxhQhgKrusGQ=; b=aMi6zkXX9LZK2uv0MhSVSP+VVbTr3SoPsfaysbl7We2GejygHWRGEB4XPV5326qKTk AcejAaoWA60O+7bC8NtTYPDMhhi8FekMWPK+IHLD83t79EG/6s7ZmtTY3/KMHkYYD1VD CyS5J3NyZJ4mPd/4jpCrEpILa59nSFDdJ929yi3YZGorrWjOmIFNzFA6ZnAJfOqNHM1I ddFzekbIHzr56GIolFJq2+4E36/9IA7ogzWcFgejQi+ynLZF9grBTI1VMedFz6S394M8 SPjLpKRjcymJgpoMsuyQ5/hvkhtVwVcBIkampQzFwDZ+yv65N63gaSvtjukkF1tkrwxE M6xQ== X-Gm-Message-State: AOJu0YxDeNBF6hfG1QXsvVUHwf/QxcefyLNiWIo8aO6/THEHHujX0wVu 0sDvpSyj1pknuFH15O2JtT82u/OH39iysoD7ESg= X-Received: by 2002:a7b:cbc7:0:b0:3fb:bc6d:41f1 with SMTP id n7-20020a7bcbc7000000b003fbbc6d41f1mr7496434wmi.17.1691417723922; Mon, 07 Aug 2023 07:15:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id h20-20020a05600c261400b003fe2ebf479fsm10835617wma.36.2023.08.07.07.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 07:15:23 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 14/15] target/arm/ptw: Report stage 2 fault level for stage 2 faults on stage 1 ptw Date: Mon, 7 Aug 2023 15:15:13 +0100 Message-Id: <20230807141514.19075-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230807141514.19075-1-peter.maydell@linaro.org> References: <20230807141514.19075-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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 When we report faults due to stage 2 faults during a stage 1 page table walk, the 'level' parameter should be the level of the walk in stage 2 that faulted, not the level of the walk in stage 1. Correct the reporting of these faults. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/ptw.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index fbb0f8a0bf2..07832eb8f76 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2048,9 +2048,13 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, do_translation_fault: fi->type = ARMFault_Translation; do_fault: - fi->level = level; - /* Tag the error as S2 for failed S1 PTW at S2 or ordinary S2. */ - fi->stage2 = fi->s1ptw || regime_is_stage2(mmu_idx); + if (fi->s1ptw) { + /* Retain the existing stage 2 fi->level */ + assert(fi->stage2); + } else { + fi->level = level; + fi->stage2 = regime_is_stage2(mmu_idx); + } fi->s1ns = fault_s1ns(ptw->in_space, mmu_idx); return true; }