All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: kvmarm@lists.linux.dev, kvm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: James Morse <james.morse@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Oliver Upton <oliver.upton@linux.dev>,
	Zenghui Yu <yuzenghui@huawei.com>,
	Quentin Perret <qperret@google.com>,
	Will Deacon <will@kernel.org>, Fuad Tabba <tabba@google.com>
Subject: [PATCH v3 09/17] KVM: arm64: Key use of VHE instructions in nVHE code off ARM64_KVM_HVHE
Date: Fri,  9 Jun 2023 17:21:52 +0100	[thread overview]
Message-ID: <20230609162200.2024064-10-maz@kernel.org> (raw)
In-Reply-To: <20230609162200.2024064-1-maz@kernel.org>

We can now start with the fun stuff: if we enable VHE *only* for
the hypervisor, we need to generate the VHE instructions when
accessing the system registers.

For this, reporpose the alternative sequence to be keyed off
ARM64_KVM_HVHE in the nVHE hypervisor code, and only there.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/include/asm/kvm_hyp.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index fea04eb25cb4..b7238c72a04c 100644
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -33,12 +33,18 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
 
 #else // !__KVM_VHE_HYPERVISOR__
 
+#if defined(__KVM_NVHE_HYPERVISOR__)
+#define VHE_ALT_KEY	ARM64_KVM_HVHE
+#else
+#define VHE_ALT_KEY	ARM64_HAS_VIRT_HOST_EXTN
+#endif
+
 #define read_sysreg_elx(r,nvh,vh)					\
 	({								\
 		u64 reg;						\
-		asm volatile(ALTERNATIVE(__mrs_s("%0", r##nvh),	\
+		asm volatile(ALTERNATIVE(__mrs_s("%0", r##nvh),		\
 					 __mrs_s("%0", r##vh),		\
-					 ARM64_HAS_VIRT_HOST_EXTN)	\
+					 VHE_ALT_KEY)			\
 			     : "=r" (reg));				\
 		reg;							\
 	})
@@ -48,7 +54,7 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
 		u64 __val = (u64)(v);					\
 		asm volatile(ALTERNATIVE(__msr_s(r##nvh, "%x0"),	\
 					 __msr_s(r##vh, "%x0"),		\
-					 ARM64_HAS_VIRT_HOST_EXTN)	\
+					 VHE_ALT_KEY)			\
 					 : : "rZ" (__val));		\
 	} while (0)
 
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: kvmarm@lists.linux.dev, kvm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: James Morse <james.morse@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Oliver Upton <oliver.upton@linux.dev>,
	Zenghui Yu <yuzenghui@huawei.com>,
	Quentin Perret <qperret@google.com>,
	Will Deacon <will@kernel.org>, Fuad Tabba <tabba@google.com>
Subject: [PATCH v3 09/17] KVM: arm64: Key use of VHE instructions in nVHE code off ARM64_KVM_HVHE
Date: Fri,  9 Jun 2023 17:21:52 +0100	[thread overview]
Message-ID: <20230609162200.2024064-10-maz@kernel.org> (raw)
In-Reply-To: <20230609162200.2024064-1-maz@kernel.org>

We can now start with the fun stuff: if we enable VHE *only* for
the hypervisor, we need to generate the VHE instructions when
accessing the system registers.

For this, reporpose the alternative sequence to be keyed off
ARM64_KVM_HVHE in the nVHE hypervisor code, and only there.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/include/asm/kvm_hyp.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index fea04eb25cb4..b7238c72a04c 100644
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -33,12 +33,18 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
 
 #else // !__KVM_VHE_HYPERVISOR__
 
+#if defined(__KVM_NVHE_HYPERVISOR__)
+#define VHE_ALT_KEY	ARM64_KVM_HVHE
+#else
+#define VHE_ALT_KEY	ARM64_HAS_VIRT_HOST_EXTN
+#endif
+
 #define read_sysreg_elx(r,nvh,vh)					\
 	({								\
 		u64 reg;						\
-		asm volatile(ALTERNATIVE(__mrs_s("%0", r##nvh),	\
+		asm volatile(ALTERNATIVE(__mrs_s("%0", r##nvh),		\
 					 __mrs_s("%0", r##vh),		\
-					 ARM64_HAS_VIRT_HOST_EXTN)	\
+					 VHE_ALT_KEY)			\
 			     : "=r" (reg));				\
 		reg;							\
 	})
@@ -48,7 +54,7 @@ DECLARE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
 		u64 __val = (u64)(v);					\
 		asm volatile(ALTERNATIVE(__msr_s(r##nvh, "%x0"),	\
 					 __msr_s(r##vh, "%x0"),		\
-					 ARM64_HAS_VIRT_HOST_EXTN)	\
+					 VHE_ALT_KEY)			\
 					 : : "rZ" (__val));		\
 	} while (0)
 
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2023-06-09 16:22 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-09 16:21 [PATCH v3 00/17] KVM: arm64: Allow using VHE in the nVHE hypervisor Marc Zyngier
2023-06-09 16:21 ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 01/17] KVM: arm64: Drop is_kernel_in_hyp_mode() from __invalidate_icache_guest_page() Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-13  8:20   ` Shaoqin Huang
2023-06-09 16:21 ` [PATCH v3 02/17] arm64: Prevent the use of is_kernel_in_hyp_mode() in hypervisor code Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 16:59   ` Catalin Marinas
2023-06-12 16:59     ` Catalin Marinas
2023-06-13  8:25   ` Shaoqin Huang
2023-06-13  8:25     ` Shaoqin Huang
2023-06-09 16:21 ` [PATCH v3 03/17] arm64: Turn kaslr_feature_override into a generic SW feature override Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 17:16   ` Catalin Marinas
2023-06-12 17:16     ` Catalin Marinas
2023-06-14  7:26   ` Shaoqin Huang
2023-06-14  7:26     ` Shaoqin Huang
2023-06-09 16:21 ` [PATCH v3 04/17] arm64: Add KVM_HVHE capability and has_hvhe() predicate Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 17:24   ` Catalin Marinas
2023-06-12 17:24     ` Catalin Marinas
2023-06-14  7:32   ` Shaoqin Huang
2023-06-14  7:35   ` Shaoqin Huang
2023-06-14  7:35     ` Shaoqin Huang
2023-06-14 16:06     ` Marc Zyngier
2023-06-14 16:06       ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 05/17] arm64: Don't enable VHE for the kernel if OVERRIDE_HVHE is set Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 19:12   ` Catalin Marinas
2023-06-12 19:12     ` Catalin Marinas
2023-06-12 19:20     ` Oliver Upton
2023-06-12 19:20       ` Oliver Upton
2023-06-09 16:21 ` [PATCH v3 06/17] arm64: Allow EL1 physical timer access when running VHE Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 19:14   ` Catalin Marinas
2023-06-12 19:14     ` Catalin Marinas
2023-06-09 16:21 ` [PATCH v3 07/17] arm64: Use CPACR_EL1 format to set CPTR_EL2 when E2H is set Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 19:15   ` Catalin Marinas
2023-06-12 19:15     ` Catalin Marinas
2023-06-09 16:21 ` [PATCH v3 08/17] KVM: arm64: Remove alternatives from sysreg accessors in VHE hypervisor context Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` Marc Zyngier [this message]
2023-06-09 16:21   ` [PATCH v3 09/17] KVM: arm64: Key use of VHE instructions in nVHE code off ARM64_KVM_HVHE Marc Zyngier
2023-06-13  9:57   ` Shaoqin Huang
2023-06-13  9:57     ` Shaoqin Huang
2023-06-09 16:21 ` [PATCH v3 10/17] KVM: arm64: Force HCR_EL2.E2H when ARM64_KVM_HVHE is set Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 11/17] KVM: arm64: Disable TTBR1_EL2 when using ARM64_KVM_HVHE Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 12/17] KVM: arm64: Adjust EL2 stage-1 leaf AP bits when ARM64_KVM_HVHE is set Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 13/17] KVM: arm64: Rework CPTR_EL2 programming for HVHE configuration Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 14/17] KVM: arm64: Program the timer traps with VHE layout in hVHE mode Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 15/17] KVM: arm64: Force HCR_E2H in guest context when ARM64_KVM_HVHE is set Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-09 16:21 ` [PATCH v3 16/17] arm64: Allow arm64_sw.hvhe on command line Marc Zyngier
2023-06-09 16:21   ` Marc Zyngier
2023-06-12 19:16   ` Catalin Marinas
2023-06-12 19:16     ` Catalin Marinas
2023-06-09 16:22 ` [PATCH v3 17/17] KVM: arm64: Terrible timer hack for M1 with hVHE Marc Zyngier
2023-06-09 16:22   ` Marc Zyngier
2023-06-09 16:54 ` [PATCH v3 00/17] KVM: arm64: Allow using VHE in the nVHE hypervisor Marc Zyngier
2023-06-09 16:54   ` Marc Zyngier
2023-06-14 15:31 ` (subset) " Oliver Upton
2023-06-14 15:31   ` Oliver Upton
2023-06-14 16:16   ` Marc Zyngier
2023-06-14 16:16     ` Marc Zyngier
2024-07-10  6:45 ` Tangnianyao
2024-07-10  8:51   ` Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230609162200.2024064-10-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=james.morse@arm.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=oliver.upton@linux.dev \
    --cc=qperret@google.com \
    --cc=suzuki.poulose@arm.com \
    --cc=tabba@google.com \
    --cc=will@kernel.org \
    --cc=yuzenghui@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.