[PATCH 08/13] arm64: KVM: VHE: Preserve VHE config in world switch

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Marc Zyngier <marc.zyngier@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Christoffer Dall <christoffer.dall@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu
Subject: [PATCH 08/13] arm64: KVM: VHE: Preserve VHE config in world switch
Date: Wed,  8 Jul 2015 17:19:11 +0100	[thread overview]
Message-ID: <1436372356-30410-9-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1436372356-30410-1-git-send-email-marc.zyngier@arm.com>

Running the kernel in HYP mode requires the HCR_E2H bit to be set
at all times, and the HCR_TGE bit to be set when running as a host
(and cleared when running as a guest).

Also add some cryptic macros to deal with cpp macro expansion inside
asm macros...

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/include/asm/kvm_arm.h     | 1 +
 arch/arm64/include/asm/kvm_emulate.h | 2 ++
 arch/arm64/kvm/hyp.S                 | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index ac6fafb..c8998c0 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -23,6 +23,7 @@
 #include <asm/types.h>
 
 /* Hyp Configuration Register (HCR) bits */
+#define HCR_E2H		(UL(1) << 34)
 #define HCR_ID		(UL(1) << 33)
 #define HCR_CD		(UL(1) << 32)
 #define HCR_RW_SHIFT	31
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 17e92f0..c1f29fe 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -44,6 +44,8 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);
 static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
+	if (is_kernel_in_hyp_mode())
+		vcpu->arch.hcr_el2 |= HCR_E2H;
 	if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features))
 		vcpu->arch.hcr_el2 &= ~HCR_RW;
 }
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index a65e053..ad5821b 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -800,7 +800,8 @@
 .endm
 
 .macro deactivate_traps
-	mov	x2, #HCR_RW
+ifnvhe _S_(mov	x2, #HCR_RW),			_S_(mov	x2, #HCR_RW|HCR_TGE)
+ifnvhe 	nop,					_S_(orr	x2, x2, #HCR_E2H)
 	msr	hcr_el2, x2
 	msr	cptr_el2, xzr
 	msr	hstr_el2, xzr
-- 
2.1.4

WARNING: multiple messages have this Message-ID (diff)

From: Marc Zyngier <marc.zyngier@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Christoffer Dall <christoffer.dall@linaro.org>
Cc: kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org
Subject: [PATCH 08/13] arm64: KVM: VHE: Preserve VHE config in world switch
Date: Wed,  8 Jul 2015 17:19:11 +0100	[thread overview]
Message-ID: <1436372356-30410-9-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1436372356-30410-1-git-send-email-marc.zyngier@arm.com>

Running the kernel in HYP mode requires the HCR_E2H bit to be set
at all times, and the HCR_TGE bit to be set when running as a host
(and cleared when running as a guest).

Also add some cryptic macros to deal with cpp macro expansion inside
asm macros...

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/include/asm/kvm_arm.h     | 1 +
 arch/arm64/include/asm/kvm_emulate.h | 2 ++
 arch/arm64/kvm/hyp.S                 | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index ac6fafb..c8998c0 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -23,6 +23,7 @@
 #include <asm/types.h>
 
 /* Hyp Configuration Register (HCR) bits */
+#define HCR_E2H		(UL(1) << 34)
 #define HCR_ID		(UL(1) << 33)
 #define HCR_CD		(UL(1) << 32)
 #define HCR_RW_SHIFT	31
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 17e92f0..c1f29fe 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -44,6 +44,8 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);
 static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
+	if (is_kernel_in_hyp_mode())
+		vcpu->arch.hcr_el2 |= HCR_E2H;
 	if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features))
 		vcpu->arch.hcr_el2 &= ~HCR_RW;
 }
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index a65e053..ad5821b 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -800,7 +800,8 @@
 .endm
 
 .macro deactivate_traps
-	mov	x2, #HCR_RW
+ifnvhe _S_(mov	x2, #HCR_RW),			_S_(mov	x2, #HCR_RW|HCR_TGE)
+ifnvhe 	nop,					_S_(orr	x2, x2, #HCR_E2H)
 	msr	hcr_el2, x2
 	msr	cptr_el2, xzr
 	msr	hstr_el2, xzr
-- 
2.1.4

WARNING: multiple messages have this Message-ID (diff)

From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/13] arm64: KVM: VHE: Preserve VHE config in world switch
Date: Wed,  8 Jul 2015 17:19:11 +0100	[thread overview]
Message-ID: <1436372356-30410-9-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1436372356-30410-1-git-send-email-marc.zyngier@arm.com>

Running the kernel in HYP mode requires the HCR_E2H bit to be set
at all times, and the HCR_TGE bit to be set when running as a host
(and cleared when running as a guest).

Also add some cryptic macros to deal with cpp macro expansion inside
asm macros...

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/include/asm/kvm_arm.h     | 1 +
 arch/arm64/include/asm/kvm_emulate.h | 2 ++
 arch/arm64/kvm/hyp.S                 | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index ac6fafb..c8998c0 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -23,6 +23,7 @@
 #include <asm/types.h>
 
 /* Hyp Configuration Register (HCR) bits */
+#define HCR_E2H		(UL(1) << 34)
 #define HCR_ID		(UL(1) << 33)
 #define HCR_CD		(UL(1) << 32)
 #define HCR_RW_SHIFT	31
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 17e92f0..c1f29fe 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -44,6 +44,8 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);
 static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
 {
 	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
+	if (is_kernel_in_hyp_mode())
+		vcpu->arch.hcr_el2 |= HCR_E2H;
 	if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features))
 		vcpu->arch.hcr_el2 &= ~HCR_RW;
 }
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index a65e053..ad5821b 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -800,7 +800,8 @@
 .endm
 
 .macro deactivate_traps
-	mov	x2, #HCR_RW
+ifnvhe _S_(mov	x2, #HCR_RW),			_S_(mov	x2, #HCR_RW|HCR_TGE)
+ifnvhe 	nop,					_S_(orr	x2, x2, #HCR_E2H)
 	msr	hcr_el2, x2
 	msr	cptr_el2, xzr
 	msr	hstr_el2, xzr
-- 
2.1.4

next prev parent reply	other threads:[~2015-07-08 16:19 UTC|newest]

Thread overview: 118+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-08 16:19 [PATCH 00/13] arm64: Virtualization Host Extension support Marc Zyngier
2015-07-08 16:19 ` Marc Zyngier
2015-07-08 16:19 ` Marc Zyngier
2015-07-08 16:19 ` [PATCH 01/13] arm/arm64: Add new is_kernel_in_hyp_mode predicate Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-09  9:42   ` Mark Rutland
2015-07-09  9:42     ` Mark Rutland
2015-07-09  9:42     ` Mark Rutland
2015-07-09 10:05     ` Marc Zyngier
2015-07-09 10:05       ` Marc Zyngier
2015-07-09 10:05       ` Marc Zyngier
2015-07-09 10:12       ` Mark Rutland
2015-07-09 10:12         ` Mark Rutland
2015-07-09 10:12         ` Mark Rutland
2015-07-16 18:08   ` Will Deacon
2015-07-16 18:08     ` Will Deacon
2015-07-16 18:08     ` Will Deacon
2015-07-08 16:19 ` [PATCH 02/13] arm64: Allow the arch timer to use the HYP timer Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19 ` [PATCH 03/13] arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-09  9:48   ` Mark Rutland
2015-07-09  9:48     ` Mark Rutland
2015-07-09  9:48     ` Mark Rutland
2015-07-09  9:59     ` Marc Zyngier
2015-07-09  9:59       ` Marc Zyngier
2015-07-09  9:59       ` Marc Zyngier
2015-07-16 18:04   ` Will Deacon
2015-07-16 18:04     ` Will Deacon
2015-07-16 18:04     ` Will Deacon
2015-07-08 16:19 ` [PATCH 04/13] arm64: KVM: skip HYP setup when already running in HYP Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19 ` [PATCH 05/13] arm64: KVM: VHE: macroize VTCR_EL2 setup Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19 ` [PATCH 06/13] arm64: KVM: VHE: Patch out kern_hyp_va Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19 ` [PATCH 07/13] arm64: KVM: VHE: Patch out use of HVC Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 17:14   ` Paolo Bonzini
2015-07-08 17:14     ` Paolo Bonzini
2015-07-08 17:14     ` Paolo Bonzini
2015-07-08 17:54     ` Marc Zyngier
2015-07-08 17:54       ` Marc Zyngier
2015-07-08 17:54       ` Marc Zyngier
2015-07-10 11:02       ` Paolo Bonzini
2015-07-10 11:02         ` Paolo Bonzini
2015-07-10 11:02         ` Paolo Bonzini
2015-08-05 17:57   ` Catalin Marinas
2015-08-05 17:57     ` Catalin Marinas
2015-07-08 16:19 ` Marc Zyngier [this message]
2015-07-08 16:19   ` [PATCH 08/13] arm64: KVM: VHE: Preserve VHE config in world switch Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19 ` [PATCH 09/13] arm64: KVM: VHE: Add alternatives for VHE-enabled world-switch Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-09  1:29   ` Mario Smarduch
2015-07-09  1:29     ` Mario Smarduch
2015-07-09  8:06     ` Marc Zyngier
2015-07-09  8:06       ` Marc Zyngier
2015-07-09  8:06       ` Marc Zyngier
2015-07-09 20:58       ` Mario Smarduch
2015-07-09 20:58         ` Mario Smarduch
2015-07-09 20:58         ` Mario Smarduch
2015-08-31 18:46   ` Christoffer Dall
2015-08-31 18:46     ` Christoffer Dall
2015-07-08 16:19 ` [PATCH 10/13] arm64: Add support for running Linux in EL2 mode Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-16 17:48   ` Will Deacon
2015-07-16 17:48     ` Will Deacon
2015-07-16 17:48     ` Will Deacon
2015-07-08 16:19 ` [PATCH 11/13] arm64: Panic when VHE and non VHE CPUs coexist Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-16 18:03   ` Will Deacon
2015-07-16 18:03     ` Will Deacon
2015-07-16 18:03     ` Will Deacon
2015-08-06 14:08   ` Catalin Marinas
2015-08-06 14:08     ` Catalin Marinas
2015-08-06 14:08     ` Catalin Marinas
2015-07-08 16:19 ` [PATCH 12/13] arm64: KVM: Split sysreg save/restore Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-08-31 18:49   ` Christoffer Dall
2015-08-31 18:49     ` Christoffer Dall
2015-07-08 16:19 ` [PATCH 13/13] arm64: KVM: VHE: Early interrupt handling Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-07-08 16:19   ` Marc Zyngier
2015-08-31 18:52   ` Christoffer Dall
2015-08-31 18:52     ` Christoffer Dall
2015-08-06 17:43 ` [PATCH 00/13] arm64: Virtualization Host Extension support Catalin Marinas
2015-08-06 17:43   ` Catalin Marinas
2015-08-26  9:12 ` Antonios Motakis
2015-08-26  9:12   ` Antonios Motakis
2015-08-26  9:12   ` Antonios Motakis
2015-08-26  9:21   ` Jan Kiszka
2015-08-26  9:21     ` Jan Kiszka
2015-08-26  9:28     ` Antonios Motakis
2015-08-26  9:28       ` Antonios Motakis
2015-08-26  9:28       ` Antonios Motakis
2015-08-26  9:54       ` Jan Kiszka
2015-08-26  9:54         ` Jan Kiszka
2015-08-26  9:54         ` Jan Kiszka
2015-08-26  9:59     ` Marc Zyngier
2015-08-26  9:59       ` Marc Zyngier
2015-08-26  9:59       ` Marc Zyngier
2015-08-26 11:16       ` Antonios Motakis
2015-08-26 11:16         ` Antonios Motakis
2015-08-26 11:16         ` Antonios Motakis
2015-08-28  7:04         ` Marc Zyngier
2015-08-28  7:04           ` Marc Zyngier
2015-08-28  7:04           ` Marc Zyngier

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:ac6fafb dfblob:17e92f0 dfblob:a65e053 dfblob:ac6fafb
dfblob:17e92f0 dfblob:a65e053 dfblob:ac6fafb dfblob:17e92f0
dfblob:a65e053 dfblob:c8998c0 dfblob:c1f29fe dfblob:ad5821b
dfblob:c8998c0 dfblob:c1f29fe dfblob:ad5821b dfblob:c8998c0
dfblob:c1f29fe dfblob:ad5821b
	(help)

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=1436372356-30410-9-git-send-email-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=christoffer.dall@linaro.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=will.deacon@arm.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.