From nobody Sat Apr 11 18:34:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775590487; cv=none; d=zohomail.com; s=zohoarc; b=nD5IwBhz9n4/q5GX4fuW86obepV/7KNblvyHx8bZ/fXBLoawjclhqQ+SGVlB8XwWXlf0fcCCO0lvaW0jXrR+khmOIv04LlKLwaBoei7FZeuOd51QaLDQdQymlzESKHSH7hDF/5boYk+wwwEuDUqgQrTi4sqVgFCk7DMbEHjL1fg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775590487; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=2KGHP5v2yNEOwagStXunWSxy9hrNInKYu2tbmJjWZg4=; b=DGavcrfIW51tqthL+7AeuecmeOQ350REH5RWtGXrNRzHrUHQrSBsK+mkyHsiVqq8N2CkA9kxiNSe2dcgh7CBFKAXHHw1tsArpp/4Vh3wsbnltW0STfeh7wo3SUF1bjjGlryAzX97gPuGcFSTelggI5mow217rduEtIw6D2vcc5M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775590486852852.51202413286; Tue, 7 Apr 2026 12:34:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wABQp-0002bT-Dv; Tue, 07 Apr 2026 14:45:47 -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 1wABQn-0002LR-NN for qemu-devel@nongnu.org; Tue, 07 Apr 2026 14:45:45 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAAdY-0000e8-Sg for qemu-devel@nongnu.org; Tue, 07 Apr 2026 13:54:54 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4887fd35e60so34918685e9.2 for ; Tue, 07 Apr 2026 10:54:52 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488c5308b3esm1615525e9.1.2026.04.07.10.54.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 10:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775584491; x=1776189291; darn=nongnu.org; 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=2KGHP5v2yNEOwagStXunWSxy9hrNInKYu2tbmJjWZg4=; b=SWcTLejU1BfbkUvEkmutNtJkDaRaSC6m4tyQyvXisljb1miYZzPgcGdZGQuVekbq8p qB/uQCkIbP/Rkuq/beTxcq4WJ2NqRsebIwzRErsxD53VuGdLVBxj1haIu08LzqiMM63W dX04Acb5yxZS12k96troTTKIUf7IenozikVZvMGxDqOiIUMZXolbvodEfa5aN1wCcJAP DgzmFUG1NVHSwzfuz/xRG/h1U7z/DsNNMT/P8OLvH+UJjX8FZrT/2LZ5cr/jPKsA6Fvo NvjbMAj1SMgH9u5nJv3AqpiwsVCqQU9ec34L+xDga9NizHAWS9AD6iIA6ZO+O0XnXrNy WIYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775584491; x=1776189291; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2KGHP5v2yNEOwagStXunWSxy9hrNInKYu2tbmJjWZg4=; b=asCkQ8hzW6BfygocEtQqc+hfSduW8SDts1bTfCQbOFMZctI3VzvM4+3xDl/VmVV2tz ysLJodHkwB6IcHjZE0kyr/mNti3BUsOElgSQw8+E++DOa+P6wcZy0MId/d47rpuUiCcF +pE3XUDM+l8xNaHZpy9pmcDLN2cWtlmG1S0ZqEv3BbuzSJSuh+kOKfz29AjFFKQw+qji HzxxGdK1Zo5EKYSZ3hcZe6qtS7EarLObX6/vUj/K6fHEdxnlSUEHdrSq5dJeWF4846BO OIG0RLA1QVC8HITk37G0PrXAPNR3FdOuRcoaUnzcF7BqyoHd/2mJIAdKGHxZD+EFDH39 p2vQ== X-Gm-Message-State: AOJu0YzpGGMkmh4XOSKvKJzqCldZ1F9DtXVG0z4nLTL2HkCzmvF8eImk UfQBpYJ/BQK3n+S7VZmF1e1qTa6DhLU0Qi6coKb0Rn7NypdTbsoQ0pMy0OMNlM8m9FCuxMXIQzL 5KUJjBy0= X-Gm-Gg: AeBDievg/9jymnoMGsWIGKSAzzwAz7sH07wYg4o23yKIXpJbFz6OnWENsWAbuieATZT 5ipDW4FkPBV2kTicp4doYbZ4uDXq0C7mP8PdPe6Nux9FS+TUqJvb2QlDOCjr55gDgGNv1Vj1i6S PpGk6B3Y0ABmoalnXzMRm2Fitgywgmib/EW70cg1x9uUa+4t5/KAwJxe9gmsi05D1bE0us9qYiv AydTaUcscY3MMUoRe6LW8Vn9aF9jH3rzote1EQbELPc6bfzmJToW5+KgZ7XA8nvZm77hBhWFCo3 NqxCbPgA8akeLoFkL437xx065Rp1QeJX/Csj0uFethb+IGxra+feds4odgc/oZ3Hs1n+V4Xahdp a+qDf5n1Yj+6pDpxgnHK3rqSeDLQgwU3+W3W6kXSAt5YBKCvyoif6QkLkws4sT0//b+uijjXa3X cG8H27bjhEP39rnHiT0cdjMMg4Cxp4y0Qvfq1BdKXYnlUTDujv3K3LOMUNjxFwb8MMtzWg41qW1 /DjinfXqeVqYt0yzGsg22EIWIEi9Fk= X-Received: by 2002:a05:600c:1508:b0:488:a977:8d6 with SMTP id 5b1f17b1804b1-488a9770d34mr91235375e9.19.1775584491080; Tue, 07 Apr 2026 10:54:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 1/3] target/arm: do_ats_write(): avoid assertion when ptw failed Date: Tue, 7 Apr 2026 18:54:46 +0100 Message-ID: <20260407175448.3329196-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260407175448.3329196-1-peter.maydell@linaro.org> References: <20260407175448.3329196-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1775590488569158500 In do_ats_write() we try to assert that the cacheattrs from get_phys_addr_for_at() are in the form we expect: /* * ATS operations only do S1 or S1+S2 translations, so we never * have to deal with the ARMCacheAttrs format for S2 only. */ assert(!res.cacheattrs.is_s2_format); However, the GetPhysAddrResult struct documents that its fields are only valid when the page table walk succeeded. For a two stage page table walk which fails during stage two, we will return early from get_phys_addr_twostage() and depending on the fault type the res.cacheattrs may have been initialized with the stage 2 cache attr information in stage 2 format. In this case we will incorrectly assert here. Fix the assertion to not look at the res fields if the lookup failed. Note for stable backports: the do_ats_write() function is in target/arm/helper.c in older QEMU versions, but the change to the assert line is the same. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3328 Fixes: 9f225e607f21 ("target/arm: Postpone interpretation of stage 2 descri= ptor attribute bits") Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20260331092305.2062580-1-peter.maydell@linaro.org --- target/arm/tcg/cpregs-at.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/tcg/cpregs-at.c b/target/arm/tcg/cpregs-at.c index 0e8f229aa7..53dd67375d 100644 --- a/target/arm/tcg/cpregs-at.c +++ b/target/arm/tcg/cpregs-at.c @@ -37,8 +37,9 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t v= alue, /* * ATS operations only do S1 or S1+S2 translations, so we never * have to deal with the ARMCacheAttrs format for S2 only. + * (Note that res fields are only valid on ptw success.) */ - assert(!res.cacheattrs.is_s2_format); + assert(ret || !res.cacheattrs.is_s2_format); =20 if (ret) { /* --=20 2.43.0 From nobody Sat Apr 11 18:34:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775589894; cv=none; d=zohomail.com; s=zohoarc; b=L2V3f6fLmn1I9S4hAJ0g6a8AZ9HbA3Wo5tL21Tph2L2B0hOdYl45ucr9FAEah4IP042P9g70KwDBrh8TMLbSs/oLpq2YkeAT+9qrE6xL6RVy8wEExyGwNh1jzphtUJ7ozp9lsguxExyYZsM4XhNCe8oLf5EL7spZc2ErjxsGQzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775589894; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=u0aK3f25z8NBglHeEqx+HS4Y9twf4O2z0745LTDOqts=; b=V9DE3etDB4KJv1N4lXbydEXQzTSB6T/uWY4ZhjEO5lAjSlPkfRTx2/CB0YwZk8LbE3QKu0Vp/AxEVXC/K4DSEm11xg9fG40ZKI3jvpt6JVYVtYLx2T/SfigK9OTiTTOoq/vRW/hXjFklKihdD0QJumiOo1Zst3+ZmPv2seRI6D8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775589894651556.4789278052478; Tue, 7 Apr 2026 12:24:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wABQo-0002ak-MS; Tue, 07 Apr 2026 14:45:46 -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 1wABQn-0002LR-82 for qemu-devel@nongnu.org; Tue, 07 Apr 2026 14:45:45 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAAdZ-0000eE-UX for qemu-devel@nongnu.org; Tue, 07 Apr 2026 13:54:55 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so32185145e9.0 for ; Tue, 07 Apr 2026 10:54:53 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488c5308b3esm1615525e9.1.2026.04.07.10.54.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 10:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775584492; x=1776189292; darn=nongnu.org; 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=u0aK3f25z8NBglHeEqx+HS4Y9twf4O2z0745LTDOqts=; b=NGPOO18xwBEGR10ppKtWl1gq74+RVh0p1eD1JgiKykjj4U/xOzbRMWnoVkE12llZKc tpgGfh2QuKAhGj/YhEJ+Qwla9COxaD+FCznlT/SqB/e5sQuErepZ5quMSGxS5AO9soUV rkAKmpJmmkzhtMGDey9k16L9O6ZWHJFSrxzeHBczaj1nuwEdLHfECD6P7iCJrrOrah9I 6Q3n+aehorLft3hJ1/nTBK7ZgWk6pQ478PzOLJBZKu+0DJBkyOIFJQwZCmhkQSynk84x MOSkWzST8ZNoj+Ygc+lrkWJBZIC22KE7TZ5KCAAc6SrkdeUyfZ0+jjL8wl+yt56iVc0L tSaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775584492; x=1776189292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=u0aK3f25z8NBglHeEqx+HS4Y9twf4O2z0745LTDOqts=; b=eiZhjUQRaefgIJJwcO4H/QdbKUe68Il4sMSkIjIpyBwyleia8Ffr9Dmubph51bQQHN tmsQ3bqbcnzpMXD1gp4Ft/XvtRWy9Cip366Uwh1n4GnwTf07nuzvOEWOHMf3YtZm4yTj OxYU1W4xn4laC9Ogb+eYuWd62mPtPLeMpQQ0Ao9WHGsJ82+NcyVdxHb/HJYZakfuJrjr dFcjj38NYZVWVKaZd/Q9LEbgnK2+yYx+vZ4/3rnW8sm2cEw//hoyDG5E2lugVHBaFKcH BoShSNPyzhKlyuGsGeP9FusDrFyGLbHfZyFBBqP0F8ohZU+FtebBBi1bYJ76nSjdPGpF WxPg== X-Gm-Message-State: AOJu0Yx4dnwa15k0550+siqnHfPjKSdBujba8cISXYnW4UjqH8SEtbki L0OX6joJiRSSWQJln7zepH6hMWjghUY3wTlNMuP1WSZVUQYcsJNqHfxVBkK7tBIO6dTX2cUzHVh I/oxLOL4= X-Gm-Gg: AeBDietQla3OzQ7WhkB02sxTHmlvq/6Uy7skXEr7K/4s38IVy4Mg2KC/HAqfsGMarNr vB6i84I+T3qSjN/p1xys6mR9rvX1HW/HS7x2mrGQpNX2IekPVQo4Y3wWfE13iDD8WCIQ9/mcjPD /L/FDtk0GpB8HB/A5V60ZElkley0+a/a/KOrPo91Tgb1dwGiEUwYL0pAp7+IaYhZo5Ch6oATaYC jX64AJhN0wyiBcBckvOwpIjPjoQQA70xpFKp6hZ5ns/qL60glmCjwro0D/4WqNH5YPVJvqLuJ7g Jw9Fg7T4BOKHJg1bGa0SYxtusSF91KoWsFW8/6zZgGPjW47CxUJ29pwunPa1cZ+BOi/eIPOPtzi ogD3RuS50XePtaphuvzjTEFWzeiAsBuocR0prxxugaF0/1q1kfbCiKNq8ea+Y3SdAledDG4IAO9 tkD+906mk+WwEdYMPiwibxBV5A58rQJWIrbIAPWplTcbic6Q76PUgRHs9wMsZhXYfd/16Q4UfLN MIl+AOMHpPqtDfrl2FQZkDc0na5hw4= X-Received: by 2002:a05:600c:2d8c:b0:488:a2ac:a34a with SMTP id 5b1f17b1804b1-488a2aca4ecmr115961285e9.10.1775584492379; Tue, 07 Apr 2026 10:54:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 2/3] target/arm: fix fault_s1ns for stage 2 faults Date: Tue, 7 Apr 2026 18:54:47 +0100 Message-ID: <20260407175448.3329196-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260407175448.3329196-1-peter.maydell@linaro.org> References: <20260407175448.3329196-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1775589895453158502 From: Alex Benn=C3=A9e The computation of s1ns was simply wrong. For Stage 2 faults, it should indicate whether the faulting IPA is in the Non-Secure IPA space. Correct the logic to check for ARMSS_NonSecure and drop the extraneous s2_mmu_idx test. This is effectively a change in the intended semantics of the ARMMMUFaultInfo::s1ns field, so that we no longer try to make it exactly match HPFAR_EL2.NS but instead set it for any stage 2 fault on an NS IPA, relying on users of the field to check whether the fault is to be taken to Secure EL2 before propagating the field to the HPFAR_EL2.NS bit. Since the actual writing of HPFAR_EL2.NS is already gated by arm_is_secure_below_el3(env), we only need to update the comments to document this change of semantics. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/2568 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-id: 20260405112410.603223-1-alex.bennee@linaro.org [PMM: also update comments about the s1ns field] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/internals.h | 5 ++++- target/arm/ptw.c | 12 +++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 8ec2750847..85980f0e69 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -740,7 +740,10 @@ typedef enum ARMGPCF { * @paddr_space: physical address space that caused a fault for gpc * @stage2: True if we faulted at stage 2 * @s1ptw: True if we faulted at stage 2 while doing a stage 1 page-table = walk - * @s1ns: True if we faulted on a non-secure IPA while in secure state + * @s1ns: True if we faulted on a non-secure IPA. Note that (unlike the + * HPFAR_EL2.NS bit) this is set for any stage 2 fault for an NS IPA, so + * code must check that this is for a fault taken to Secure EL2 before + * propagating s1ns to HPFAR_EL2.NS. * @ea: True if we should set the EA (external abort type) bit in syndrome */ typedef struct ARMMMUFaultInfo ARMMMUFaultInfo; diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 08a76bd3f1..7b993bb5b3 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -611,12 +611,14 @@ static ARMSecuritySpace S2_security_space(ARMSecurity= Space s1_space, static bool fault_s1ns(ARMSecuritySpace space, ARMMMUIdx s2_mmu_idx) { /* - * For stage 2 faults in Secure EL22, S1NS indicates - * whether the faulting IPA is in the Secure or NonSecure - * IPA space. For all other kinds of fault, it is false. + * For stage 2 faults, S1NS indicates whether the faulting IPA is + * in the Non-Secure (true) or Secure (false) IPA space. For all + * other kinds of fault, it is false. Note that we do not + * distinguish "s2 fault on NS IPA taken to Secure EL2" from + * "s2 fault on NS IPA taken to NS EL2 or Realm EL2" here, but + * instead do that when setting HPFAR_EL2.NS. */ - return space =3D=3D ARMSS_Secure && regime_is_stage2(s2_mmu_idx) - && s2_mmu_idx =3D=3D ARMMMUIdx_Stage2_S; + return space =3D=3D ARMSS_NonSecure && regime_is_stage2(s2_mmu_idx); } =20 /* Translate a S1 pagetable walk through S2 if needed. */ --=20 2.43.0 From nobody Sat Apr 11 18:34:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1775589549; cv=none; d=zohomail.com; s=zohoarc; b=Yi/flE+zhgd9Qhu/rzMf2RfOo9MTrWwo281bWnkxswnGIoiPNcHLDtqi/czNa6dU+u4XWkpb/Y+0JOXabMQY0tMRTHOoYdco2Y7MZj18QIGcxf/Bk/Lh3A2sh6u1ie5Gjw9AE+gZEq9QeL6SKjfjGJQwYPLEi6nA5MKr5ckA4AU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775589549; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=j+V5/wr6hJYCNRYt/6OeCVTMAVFIsehdIhZ+xeB+P7M=; b=b8xf5E/ey3txZGAUd4d7HEIEQPm95DA65tVeViHgEV6ooYg94mWtz+h1Jp0HA629oeh5b7TLQ7wR+Xux8TfGNZ/OlgQkrFjhIjk4mapjXWLroWjDS7x+GS+uxO9ubLhBTbSm4J2Ok3vtI/3X9etE/t0kSKdfSEQ8bJrHG7O4nKk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775589549190850.435211022226; Tue, 7 Apr 2026 12:19:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wABQo-0002b7-UE; Tue, 07 Apr 2026 14:45:46 -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 1wABQm-0002LR-U1 for qemu-devel@nongnu.org; Tue, 07 Apr 2026 14:45:45 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wAAda-0000eO-Py for qemu-devel@nongnu.org; Tue, 07 Apr 2026 13:54:55 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso1709215e9.1 for ; Tue, 07 Apr 2026 10:54:54 -0700 (PDT) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488c5308b3esm1615525e9.1.2026.04.07.10.54.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 10:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1775584493; x=1776189293; darn=nongnu.org; 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=j+V5/wr6hJYCNRYt/6OeCVTMAVFIsehdIhZ+xeB+P7M=; b=ai0jpHnNwE1D0Jv9fIHLmaxiG0Z4D2mMETrBhW5ogDThiXlWkOiCL7uoXBKpgWhujy 3w+UksqhWf99fqsXl3zJuyfTHhHxzni6CnwFGAabNbll8aDmniPERG9erUHjjwes0BIp qguqzxf5N9xXX2zbe9I0viwSAErJUzNsYhhuh+i69XMn48DQjAh5Uin/Xtiynxax7jkx XpLY0/tr+wYz0mHruDFKfaY74/9A2ylU6mBceg+2wse8cTxRuirrD+/QNnIl+CmOKJ5I W+7yMhUwYgcDFTqFgjeJGfoJxBVdMqDO2VxGfQ1aJ8x9DS3QDKCKvzmxFOUvmIsiuMyg q/Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775584493; x=1776189293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=j+V5/wr6hJYCNRYt/6OeCVTMAVFIsehdIhZ+xeB+P7M=; b=Rjhpc+3vbS054k6hDzk87xG0qzFbz3EQ2ANF+Z3R6gjHIemDzMcmz79fWotHxtOjHH ellWgVHnFvrV4/XW4q3FKb/zZ9OyjoL0xIgNCumKn8RRHAIEkgoevMzDzcjAvIu2v6E9 YTJvhPgnZ4AnDDEFghx/e0R7BrjOUDrp1Ny4gajh65G1AgawjM+Z05WPg9n/xnd11Eek EGwK+r0EGr3fV2IvGfyCQjrY5hDOtwdP1drO81lunpaf2shjJEcN66F56CPkFmDmGild 3z/EA7xFMhXauk2Uq8tPIOBIlsGeq+ncs8CD/SIQRz9yYxDjZTmZCkaQEZukQxOwy1lz QCeg== X-Gm-Message-State: AOJu0YxRwbJzP5wNOkjywZO3jnr0q/Oq0lnY0ggAUG9wgI1bLliHc7uW E2JqoBQXW23TvvcP0mSeXOOTf11rhKcB2AC7DGYNGXN2hWK1ouTBtd8irMu2YbqlI258yjHoFZI CcnRxbps= X-Gm-Gg: AeBDieuoxF7ykBrKUPRYpabW4QWgYRcer0dJ1ejv+ElAW8ksG7WrtKbZP3v0s3oesvn OQ2PRS9yr9kvDC2rKsvMBdHhf/NKcfs3ys9c1w4Zv3FyHCf2XKJzufnpzmvWcCHwdFc7zo1jIMD PlPv9Vl2DpRhPErBrlQgRxYzDlPpCxS0q8eIezWAS6L/R7/o2RR/Lk/SkdZhrczEKZ0NZU/TNFT WKktw0BEJENjxv2xo/lBso5YjdEwgmzNGZ52nIJKLUoJdCY9QKOGsyOvrVNNdzlveNW/qLWpw9C ckRKZDqtYSNim+/AAf6P3E54eBTxM39KOn1fyrC0TafGeqBcmO5Qlcmf66G53H1dqX4K2URbUnC qKm+FRmD+83c3IaYeBLGhUWlGSwDTTCavQz2GfQ4+BtyWKTAv0JoLqdbqlIDbfSw0FYaDbOEeMC GX1da/+XdEM3cnzdCkhz942ZnOFR7z+HiiVBD5J3kB/En1znspTkU28ei+fbeSGCDRqCGyoABHc jnSDSy+SQLxKLXbFIetMD1C/SpMTsw= X-Received: by 2002:a05:600c:3404:b0:488:9c3b:ff40 with SMTP id 5b1f17b1804b1-4889c3c0127mr118895975e9.15.1775584493149; Tue, 07 Apr 2026 10:54:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 3/3] docs/system: remove extraneous sentence Date: Tue, 7 Apr 2026 18:54:48 +0100 Message-ID: <20260407175448.3329196-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260407175448.3329196-1-peter.maydell@linaro.org> References: <20260407175448.3329196-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1775589551440158500 From: Alex Benn=C3=A9e Lest we confuse the reader about something we are no longer showing in the example. Fixes: 132f8ec799c (target/arm: change default pauth algorithm to impdef) Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Message-id: 20260406165648.997995-1-alex.bennee@linaro.org Signed-off-by: Peter Maydell --- docs/system/introduction.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst index be387a6645..bec7291e47 100644 --- a/docs/system/introduction.rst +++ b/docs/system/introduction.rst @@ -165,10 +165,8 @@ names so we can override the defaults later. -m 4096 \ =20 We then define the 4 vCPUs using the ``max`` option which gives us all -the Arm features QEMU is capable of emulating. We enable a more -emulation friendly implementation of Arm's pointer authentication -algorithm. We explicitly specify TCG acceleration even though QEMU -would default to it anyway. +the Arm features QEMU is capable of emulating. We explicitly specify +TCG acceleration even though QEMU would default to it anyway. =20 .. code:: =20 --=20 2.43.0