From patchwork Mon Nov 21 13:02:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 627257 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1740965pvb; Mon, 21 Nov 2022 05:08:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf5LMtjzVTqteWoegrxhBuRbO3S+tIOJHoH/DpB+N3Qx8NHC9hmsb5vmuPRk+pF+weHeJ0gr X-Received: by 2002:a37:de14:0:b0:6fa:189d:733b with SMTP id h20-20020a37de14000000b006fa189d733bmr580117qkj.20.1669036100203; Mon, 21 Nov 2022 05:08:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669036100; cv=none; d=google.com; s=arc-20160816; b=vsv61L1EErQdJ8k2vVSsu3vtADAzSYvrAfYsb+u6MqkRpKBWFLpmOoQEwmPEaWtLjH Xy+WJ4ZMkd/PR5h/NRzMLvJ/6G49twgArvKZBvFAjZWVmOKmTUs8kyeq4LtMy0QRKCKl NyYPHtU7T9Ninel+TA5cMieOpCRnmHYsD6b6EBSZ6plIr/HwIKUHlViJpTw1hdcNrMAi iR7p7eYGfLudUMVYcPc/4JUizBKmHjPBTXKU+5mUTlVc5GijLqnq0cblYgcpgAiw9jU9 I8pA0tiSqLPfChvmuScsYAxK8x9jBxVs7HzOpTdAd16ZDCSOKH7A8m9aE6mAbYDOPtVS xDeQ== 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=JBNmxcqLBxZag1unF7NOFteCv/IX3kebN57U4uPMAOo=; b=qh9+6Lbry6wDphfnimp1Ea3IqP78KgGtDb8XQGOAuthd2iZH6YxtzCmR+kkr9ZFCeE F+Tmmo5ivKs539KBKw91DxYvNuXhtJX/IFnw2exOArik0FSzAkR079j1MfBGDHTWsa0L /5yr631tfYh8IH4OTZgYfnB6hPynBR2LZTpVH1oNk0Y9G7qN+6CyrDhInIBAxozm/1jB TsN9JzlXzzKEZ3kt0/abfvZOkCh9MhXDEQoc31PCm9SOu0cjs4YjFSY0GwRvoY1rXFAZ wjHW5TPhDzESr8CfYCoo3kiI5CADqnjng3b4WQEDm/vbP5iq65S5Mx4bdM4uasSK/l4V BHKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iQXSb9MM; 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 x126-20020a37ae84000000b006faa598cacfsi5744471qke.147.2022.11.21.05.08.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Nov 2022 05:08:20 -0800 (PST) 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=iQXSb9MM; 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 1ox6S6-00053K-B3; Mon, 21 Nov 2022 08:03:10 -0500 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 1ox6Rl-0004ti-Bt for qemu-devel@nongnu.org; Mon, 21 Nov 2022 08:02:51 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ox6Ri-0007Rw-SZ for qemu-devel@nongnu.org; Mon, 21 Nov 2022 08:02:48 -0500 Received: by mail-wr1-x432.google.com with SMTP id d1so7635095wrs.12 for ; Mon, 21 Nov 2022 05:02:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=JBNmxcqLBxZag1unF7NOFteCv/IX3kebN57U4uPMAOo=; b=iQXSb9MMFfTFM6CRTSJWyLnL0FFXWmI1IBXm1aM31ib39XyRZOR4Qbl99ZlnjMyqyb Z/PpSy7kKbx6YyFa4dbVLBdM25lr0weNPtpmnhD533eR2ZfUK7rt5bwta52d9cxwSn5c exkV+q5a2gKug0k47/p9B50BxiMKa81c2ODPc3V/tZq+by4j9gRxKuIG0CTICZ1e58sm Ofhlx3heaH3J5iEzynSJDL/gXqVf+D7MGgycnLis8Js8L7h5Bba/BvyCD51N8jRC4o+e gmH3ChApaD9KYWuXzkh+hebMF1BorVFR1nxZS29cgI4qHjRtMHMRdpeA5o8r7DE4jGOt dy2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=JBNmxcqLBxZag1unF7NOFteCv/IX3kebN57U4uPMAOo=; b=u3cdohJ9GlvCkBAwTuxL+JS6CdfsQQpiJhDFN4wvkxKXsWeICe3mGLusk+Oj+4SKDQ FjogvDfqbaLcz6pbcLKHADB6Rlfd+kJ0vx9fPYUJ7EPBPnlOOgznitCIkYYl26+7fNVl joi8PSCiSebJ62DhUswK08xMULHQFAnF6IpajD/YCLqxHuFvyKy9o9Pka/bvxpEVIFGJ TpVbinUsy4mb5qNsR7/aFlkp2CBGg5Cz6gnqMGo+mtv2tpjNSkDDU3B+RXVlC5CPltbD g+E3WFaNCGidlzzQLGImCaCdnEA/cMn99aH+Bs7AuSzuF0n+n+NTDQBOB1945n5vpIUe jg8g== X-Gm-Message-State: ANoB5plvVvfpTzSDsSUKVe3Fs/pD3X31x8nyONAX1Mqm2r4KWi1PgWih agv1FQ5zwFWQNRXb21epZ1J2+OB7d10bCw== X-Received: by 2002:a05:6000:114b:b0:241:d199:1a04 with SMTP id d11-20020a056000114b00b00241d1991a04mr3782834wrx.227.1669035765534; Mon, 21 Nov 2022 05:02:45 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id t1-20020a1c7701000000b003cf4d99fd2asm13296725wmi.6.2022.11.21.05.02.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 05:02:44 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 5/5] target/arm: Limit LPA2 effective output address when TCR.DS == 0 Date: Mon, 21 Nov 2022 13:02:39 +0000 Message-Id: <20221121130239.1138631-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221121130239.1138631-1-peter.maydell@linaro.org> References: <20221121130239.1138631-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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 From: Ard Biesheuvel With LPA2, the effective output address size is at most 48 bits when TCR.DS == 0. This case is currently unhandled in the page table walker, where we happily assume LVA/64k granule when outputsize > 48 and param.ds == 0, resulting in the wrong conversion to be used from a page table descriptor to a physical address. if (outputsize > 48) { if (param.ds) { descaddr |= extract64(descriptor, 8, 2) << 50; } else { descaddr |= extract64(descriptor, 12, 4) << 48; } So cap the outputsize to 48 when TCR.DS is cleared, as per the architecture. Cc: Peter Maydell Cc: Philippe Mathieu-Daudé Cc: Richard Henderson Signed-off-by: Ard Biesheuvel Reviewed-by: Richard Henderson Message-id: 20221116170316.259695-1-ardb@kernel.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 3745ac97234..9a6277d862f 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1222,6 +1222,14 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, ps = MIN(ps, param.ps); assert(ps < ARRAY_SIZE(pamax_map)); outputsize = pamax_map[ps]; + + /* + * With LPA2, the effective output address (OA) size is at most 48 bits + * unless TCR.DS == 1 + */ + if (!param.ds && param.gran != Gran64K) { + outputsize = MIN(outputsize, 48); + } } else { param = aa32_va_parameters(env, address, mmu_idx); level = 1;