From patchwork Thu Aug 22 15:10:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13773679 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 04DF8C52D7C for ; Thu, 22 Aug 2024 15:12:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63C2780037; Thu, 22 Aug 2024 11:12:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EBB48001E; Thu, 22 Aug 2024 11:12:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4655E80037; Thu, 22 Aug 2024 11:12:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1711A8001E for ; Thu, 22 Aug 2024 11:12:06 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B0B22C1730 for ; Thu, 22 Aug 2024 15:12:05 +0000 (UTC) X-FDA: 82480221810.02.4143CCD Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id F41D1100027 for ; Thu, 22 Aug 2024 15:12:03 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1724339464; a=rsa-sha256; cv=none; b=nW09kYfm8k+ssY7ijdDi4Ahy6G5qSZRH68Y3pcARwvQt2kSu9m8yNO9HAPVqWDsBRhQ/jq cJ61E6kAjdX5EH9XSEt6iTcWvHBaBBzFoRF4jJuR2jc9Kdfx19elNaNTBSnlp1DTDGKtfM kdgIF3Y4d6Xc4AocOKHURF8Lsc1bGQE= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1724339464; 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=tGPcTPPfKkSGaPcxenC1uehrGC+VQwOEc7ex5Jc/eTc=; b=iMt4goT1av6NNap8PqW05C4m4Zw45mV0Pv5VGMG2SuizfKBpnxGF9jrNLrSsJJrB4S7j3H m35E6FbrWXeI2+JzHBaIAKaFLL4QDN9KyqQ+Ekjg+0pAshBJzKv3mc7UPzL6Urfvv27Hro N0C4DPeLyrw9Yt/0X3BbXov8SJkUCSk= 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 5A265DA7; Thu, 22 Aug 2024 08:12:29 -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 1F69E3F58B; Thu, 22 Aug 2024 08:11:59 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: nd@arm.com, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, anshuman.khandual@arm.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, skhan@linuxfoundation.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev, linux-kselftest@vger.kernel.org Subject: [PATCH v5 09/30] KVM: arm64: use `at s1e1a` for POE Date: Thu, 22 Aug 2024 16:10:52 +0100 Message-Id: <20240822151113.1479789-10-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240822151113.1479789-1-joey.gouly@arm.com> References: <20240822151113.1479789-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: F41D1100027 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ksjpb7nphidipmyi3g53m97mua661ycs X-HE-Tag: 1724339523-162882 X-HE-Meta: U2FsdGVkX188p3ubN8aeUXYXoPWhtB8orswhw6FZcB59GZ4kVW1fkfjRNxqtuZFz5zQD3zPywqVs2p6HEPhSco2vJYROPk+CK5mc052SmvqWTN4aPJA9vkEdDBDUHMBVhCwCi3Kq+Z4kZSGKH2rDC52wzKQAYD0hkOuTmP0A9kyXfApnhFuECiehK+ydljaGZYn775Pp24Rzh1OyRaCmGdawZYJER1/JjRxoBbgNhYZHGey9rNjD4NeDJZwOcfCpzvuqp6rnkG7XHjSgTBbYW1/AyqWFc1Rm5LgxbP+M3rJRBH42pWVR0g+E07gOGncgylpYDZIAWq7z0PSS6n9k8A5L2oAQK3HTa6kGi23KV8YzYgHiVihSP27IV4sJfXgDfQ+Y5tYS2408gLmcA5nA+8GJ9+yAC7iS9Pbmh9KqpmLHW+FIu0qlqF5NoNOmxMz8fZdD2wWqIiySTkNGreoJ4l+y3tpiWV8tnA07zfGvuxEYLFnzWqeBXFw0jUk4f9bgul9rvMAsfmQszwHhlA9kYw20GN+e8vdy45PVu1/7+8nJUzDdkQpvSuGua+wKv9Yc/nAGt3XYQfaRrV9Kgj0cbScAPckc0vBsWwJf9gEkVhDfUvynEkmw2m6i7Py0QZOXOnYwF/p6ZU+tIXn2ea6u/er6QUMTWEKJd5UqLp2AMi3DnDLtDw4hz77hI0X3jf4tuA0x/RPhplC98SggFPJ34y3OfAvdZhEi7ET4I7AebpIsrUX2eEoS6Xe0JvKJ8UiB/crHh4yzXVJyKjlpXM/xdgufcz/+i8VUzm78CYFkHUmbfKB/S8oWTZN9SGa+rQ+F434ZKIAKNZQ153JuLFmhbuRRODAwOfzi2DjZS/6jfYJEWRNVYbDf5YGymQPXOfU1gmHO7SGCPLQOidNdvV3Q8ZtUOWcsy9wLPm3ckoNjUjUvBDiP5XGI8vzPpa4xFSG5/fNKhqH3EVhR3TzpA4+ peeD/lEs E5/ffeOPGUktfh5fpca5TRnrDfH4BMBlGp/J1gkByLduPV4gXPv9tbJ3S4jxtEiCxFW+4xV0RncdjLWnMpYy1LGJrIxuBXaY1AD96Izv3HvOTUQ9wCksmi7q65XC7oJbgbvwBQ49+at87wUaeqSlVwKqDMe6mMvxynn1TX0slf0yrdglRg/rv9YJD6EggnaPnd5ahAZdO9Qzi/VMtBUD4uO8zoA== 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 arch/arm64/kvm/hyp/include/hyp/fault.h arch/arm64/kvm/hyp/include/hyp/fault.h index 487c06099d6f..17df94570f03 100644 --- arch/arm64/kvm/hyp/include/hyp/fault.h +++ 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 */