From patchwork Fri May 3 13:01:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13652788 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CB77C25B5C for ; Fri, 3 May 2024 13:02:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A06F6B008A; Fri, 3 May 2024 09:02:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B5716B009C; Fri, 3 May 2024 09:02:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E0156B009D; Fri, 3 May 2024 09:02:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EA20B6B008A for ; Fri, 3 May 2024 09:02:27 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9C09D1210E3 for ; Fri, 3 May 2024 13:02:27 +0000 (UTC) X-FDA: 82077098334.19.D9EE241 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id ED77914000B for ; Fri, 3 May 2024 13:02:25 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf26.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714741346; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3BBJ4QOdsv0Ue4NZqULidDC6xGwONndSxZgf7b76ofQ=; b=EauCLRxVWqd7gKSiKORNryAEMQxufOQfTIk2orzgpNuFrMn4KqOpHUAH7pqsexsDicEd7e 8RDo64UbZnFtcZ1DDhfILDbTB+pkep4nNDwZXFRNzzbuUOFUll2hBPMKZ/sQLmF3ObtSFX r0DT+J794/vKs7+zhLizz5IkYz7h010= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf26.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714741346; a=rsa-sha256; cv=none; b=8ZcUg57FSV+7ReaVticI5659OjO7A6ntHmgclqsT4InaDegGiXRqtUV/Ux8KX8J0Z0OXP7 p+WGYiaWVwyNCBQkEalWgoplobDJref3g2ZOLDDy3XY1m+Zgi7thcllgrj/5I2XRtl2JRs T27W+l5uIFV8d/aa/LPGnrvsBlFQujA= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9246B1682; Fri, 3 May 2024 06:02:50 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 412BC3F73F; Fri, 3 May 2024 06:02:22 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: [PATCH v4 09/29] KVM: arm64: use `at s1e1a` for POE Date: Fri, 3 May 2024 14:01:27 +0100 Message-Id: <20240503130147.1154804-10-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240503130147.1154804-1-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Stat-Signature: tgxap6m4xzqj6n1xpjuzy3h3sii5emst X-Rspamd-Queue-Id: ED77914000B X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714741345-274261 X-HE-Meta: U2FsdGVkX187zb0kH9DgpIEJ/UDF0QBN+p7ZJEkQePWup5itWMHoeUqpniamTAR7YOc9Y0vtntEBoJOxPri23tGRS8so/d9pbCUYckBnw4saFIY3tFp7+QuZF9Smbm7WixjoC0lPmVqRpWfjVKRO4jbqYjOusPkBMBH8yWsflUQjLzQeqO0rI5duffxTKacmxV2cbbNhmZ40OSo8XMxqXEvXDEvHVjagVRuiX0k8W4tR2qlE9QprJ3HVKDlQ/A6hsy8LZZb56EYgwjapmXZYGUH14nQvYOCh2QUkgNbTo4eC6Iqf15FBBnaL+GD6vVzlcxtav9zN81HiBuO5+C3ieXYzpVwlcthGgUNCBCdtIBZvcPCyEf86JZNbMWzosSlvPvioxWON9g40ymGXl5+gb9X5otYEbZv3lwDG0sRG8o/GRxRbEEiAp8pbWsicf0dQS0/Z5u5VxpIkpli42hWIGFxZt1ajvtNjm0zqXd1Vkdom/BR/bFPxpfRRN66wZ4ljNYS2vOnlrV2Y7jLlXMCHtldpFBHSwEZyKxS0VEF9Gpnz59MJf8vXih3YTSvwy5/oyW0I8zKq+h7cnCT7Y2kghRIFleG5rVw0j6OZlvJqQU3U0LIveefy0eqqalA+reh6IRnQhzpMZ6e56svlTW45VOeW2Rsrc5G6CNJdn6MN0bbrc8LF+fYc99LPQ2YzSDcYbxUBijnh4KTbvuDpzyGPYoFZBxV960NgmhkQqnuvK1M1Lkc8rqUBG/7FVQr2hqvW/6WJKXUoC1DHH2eQEpV0pdEWZVGYNOdzaKZWKLu7PduhyzSwBhBa9G6z9P96RRTy1rjtGZ8p4fOVXJ8bZ9ygzx7qxtuyO19VoFBjdLrHvxWIXav/Ztjsh9zub7S25rezuKTfaRIdz2rXi+ZUcgkxHwUQo/l2mLEZ0eBdrt8HPmAU2WGYZq9wbX4ZJfonw0BJwArnDvjZdPtd3h8IKCC 9jUeJBkt AXCCrfmlBvCrn/+BICWX/KeIvsG5NbRCJRXqehATbPm+I8rvwfW0MKmgDj8daE1fHcnmAQA6oWmJIPLygO6MzLCVH+a+Ve3G3k+++3ixCTEs72StQiBkLj5H/shJxvACxZWRF0it9Gzjy8EJ1VOTZw1sfo8Bk58XdzStEwES+X2SevMc5qERmyirKskC7sN3srXjYOgAVAVLOA6NVBMDqJWdK7A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: FEAT_ATS1E1A introduces a new instruction: `at s1e1a`. This is an address translation, without permission checks. POE allows read permissions to be removed from S1 by the guest. This means that an `at` instruction could fail, and not get the IPA. Switch to using `at s1e1a` so that KVM can get the IPA regardless of S1 permissions. Signed-off-by: Joey Gouly Cc: Marc Zyngier Cc: Oliver Upton Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: Marc Zyngier --- arch/arm64/kvm/hyp/include/hyp/fault.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/include/hyp/fault.h b/arch/arm64/kvm/hyp/include/hyp/fault.h index 487c06099d6f..17df94570f03 100644 --- a/arch/arm64/kvm/hyp/include/hyp/fault.h +++ b/arch/arm64/kvm/hyp/include/hyp/fault.h @@ -14,6 +14,7 @@ static inline bool __translate_far_to_hpfar(u64 far, u64 *hpfar) { + int ret; u64 par, tmp; /* @@ -27,7 +28,9 @@ static inline bool __translate_far_to_hpfar(u64 far, u64 *hpfar) * saved the guest context yet, and we may return early... */ par = read_sysreg_par(); - if (!__kvm_at(OP_AT_S1E1R, far)) + ret = system_supports_poe() ? __kvm_at(OP_AT_S1E1A, far) : + __kvm_at(OP_AT_S1E1R, far); + if (!ret) tmp = read_sysreg_par(); else tmp = SYS_PAR_EL1_F; /* back to the guest */