From mboxrd@z Thu Jan 1 00:00:00 1970 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 CC189C4345F for ; Fri, 3 May 2024 13:02:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 675076B009E; Fri, 3 May 2024 09:02:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D6296B009D; Fri, 3 May 2024 09:02:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F04A6B009E; Fri, 3 May 2024 09:02:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 034BE6B009C for ; Fri, 3 May 2024 09:02:26 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A63631A104A for ; Fri, 3 May 2024 13:02:26 +0000 (UTC) X-FDA: 82077098292.07.34AACE9 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf23.hostedemail.com (Postfix) with ESMTP id D2C62140079 for ; Fri, 3 May 2024 13:02:22 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf23.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=1714741342; 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=6BSTx1I1TiIaBVl43DDc7myhpFfSSqXVzGJv0kKeY+k=; b=1nmJ48ZGUI3sFPG2ApJ+nIeOgVK/V1/DdetThx76DnwwmtL4qRc4HGAGFE+UMxqW6mTmEK /GhQ6x5lG8X0ug4+irVXaqaGLlwFKnHlzOjuSd5Wp+k/pMBj59BhqHSh9KwRHs+3msvnNB osllfXe02rkvJWkK1PzuAgLZT90nkMc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf23.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=1714741342; a=rsa-sha256; cv=none; b=vpZ2YJNAUU21ocIG9NnoGlJkAm0mrTM0B1zbZH/P0NS12/Mrg5igpI8y7mrPH4LzOaYC5m cazAV6u1sOrJdFduWLXac7BzLm/cLCWAi5W3OYUWzzHEbkwk/XLlD13OUB30bioWQnkVYQ 7ZVIxDnQxtVsA/YgL+8q2aMoIE6ng5I= 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 46B66165C; Fri, 3 May 2024 06:02:47 -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 EA6483F73F; Fri, 3 May 2024 06:02:18 -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 08/29] KVM: arm64: make kvm_at() take an OP_AT_* Date: Fri, 3 May 2024 14:01:26 +0100 Message-Id: <20240503130147.1154804-9-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 Content-Transfer-Encoding: 8bit X-Stat-Signature: 4zzs65ojc7fgww95tjsmu7hiukco5gu5 X-Rspamd-Queue-Id: D2C62140079 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1714741342-156441 X-HE-Meta: U2FsdGVkX1+EdR+RddNvcIOQTKvIAa4tkrXRQNEcGUS8+2sDjBi/GU2aLSoWshd7MFqiIYbYF0t4xVwVMyuGuDmhfMHVKiZFvliCfR82V+dJmhk3VEvtaV4Ym95e4V8SRBlgdPgrA0Nq6JxzRoWOoGZDzAuEQ9S5ygGbn2W2j/qSc/JGxlHN/HdiriEYn7dA+bqlUnLz9QkSKOc6qGtxWLSRjax5PrRTScgq2pocFWiTYA3q9S+FFYMWZxO4SlATGfOeIQKk8HoD1z9Wdv6d4N10qVb8Efne6BxwnGu0CwngMG39F6uFRK/TvtsBdmC0//fezKUoWmlFXRADA/0jDoYpckRtc9j9Vl7CSn4V1wRf3Y2e8JgSQTdEbTOEY0wkdwH2Bm5fHBFH7eJwm4ooAvuT1rDv/4MOe4E3e6an1CpfEU8X3kmRVbGPcY995LuJ3ja5FhKvZuS4Wb1NurUYPwIHz5r5qJC35BEJ4x7Y2uQ07XfmoaFSkUcT1ou4j7EGaajcs+HIn6PE8a1N6XbxMLPP4aRioOTw/9xOqBmE9/3oBZ40AiP91/mGVDyUFi7i2xJr5oHkSiZSdHyQ925/bdGELUNsW7QeoHZQdyZ9ugHmaINOCfKFo5SbK1clL9zyflYtWqzcL4hQvUOwYfMNPdFIKYkkfYmJe6yDXhaOwj4wC/mRfWvU+kNI2CRRQsUBDFOkhh/hy9e1y/YqRUABv6FQxfBbML+9aLCmVEUX0TqfFYKBlj+a0d6mJB2rTjW666W49s/DDl9Ak4ul7yqv0Pmu0oAZG4Qr752ZNlIFlrbImc1fDlHT7er5iQMP0WS+zFiaE3AXN2+FzNCJxZe4t3LFHGuVuqpPHJ+0O5HUp3VjqSxSvskpOb4c6wSlMbayRpfU2NRHBWb9CO39tA7gUppGQTpL3Cjn2Pgwd9pjrBA2O3lwtZR7P3N1wtCnLQFBf6YHLDP4kS1c8k81T8R 5f6YFAzG XRM0qq+RiY5hab7RBD0NHBL5bYlbJlZWBxeEpNBX6rHvZJwwg9wMXNKJUH9t9oXmsUptdtmkXBLaPBXrtP2wocX4s16nQGJaL8bAQZt29aywOwaQi0rog/YQudtNM+F6EOEs2VID5wo0GM6tyhmrnSB9SiQN4memrgvNzy/asJtlIDwTkR6rsoXvya/fys1gDnC+TR5A/QMnlZWRH1xxgpd1bMTQ74WFf2gmVMMHTy6RMWHpyA7/4Z8KJDtxrZVVIDUH4t8DqypX7Leo= 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: To allow using newer instructions that current assemblers don't know about, replace the `at` instruction with the underlying SYS instruction. Signed-off-by: Joey Gouly Cc: Marc Zyngier Cc: Oliver Upton Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/kvm_asm.h | 3 ++- arch/arm64/kvm/hyp/include/hyp/fault.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 24b5e6b23417..ce65fd0f01b0 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -10,6 +10,7 @@ #include #include #include +#include #define ARM_EXIT_WITH_SERROR_BIT 31 #define ARM_EXCEPTION_CODE(x) ((x) & ~(1U << ARM_EXIT_WITH_SERROR_BIT)) @@ -261,7 +262,7 @@ extern u64 __kvm_get_mdcr_el2(void); asm volatile( \ " mrs %1, spsr_el2\n" \ " mrs %2, elr_el2\n" \ - "1: at "at_op", %3\n" \ + "1: " __msr_s(at_op, "%3") "\n" \ " isb\n" \ " b 9f\n" \ "2: msr spsr_el2, %1\n" \ diff --git a/arch/arm64/kvm/hyp/include/hyp/fault.h b/arch/arm64/kvm/hyp/include/hyp/fault.h index 9e13c1bc2ad5..487c06099d6f 100644 --- a/arch/arm64/kvm/hyp/include/hyp/fault.h +++ b/arch/arm64/kvm/hyp/include/hyp/fault.h @@ -27,7 +27,7 @@ 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("s1e1r", far)) + if (!__kvm_at(OP_AT_S1E1R, far)) tmp = read_sysreg_par(); else tmp = SYS_PAR_EL1_F; /* back to the guest */ -- 2.25.1