diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 17:20:18 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 17:20:18 -0400 |
| commit | aa6330543bb039406260c578d17eb6d80916dba0 (patch) | |
| tree | 9dc58d676ad9154afcb1308961f0d5a6d2843081 | |
| parent | 123a2cb80707cceade3f68313dbb06f0e66532ee (diff) | |
| download | longterm-queue-4.12-aa6330543bb039406260c578d17eb6d80916dba0.tar.gz | |
arm64: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/arm64-KVM-Handle-guest-s-ARCH_WORKAROUND_2-requests.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/arm64-KVM-Handle-guest-s-ARCH_WORKAROUND_2-requests.patch b/queue/arm64-KVM-Handle-guest-s-ARCH_WORKAROUND_2-requests.patch index 05848a2..cabf002 100644 --- a/queue/arm64-KVM-Handle-guest-s-ARCH_WORKAROUND_2-requests.patch +++ b/queue/arm64-KVM-Handle-guest-s-ARCH_WORKAROUND_2-requests.patch @@ -1,4 +1,4 @@ -From b4f18c063a13dfb33e3a63fe1844823e19c2265e Mon Sep 17 00:00:00 2001 +From 8837c9aa91a8684847919799f396a798df1b680e Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Tue, 29 May 2018 13:11:17 +0100 Subject: [PATCH] arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests @@ -17,21 +17,22 @@ after the Spectre-v2 mitigation has been applied. Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c -index 5bdda651bd05..323aeb5f2fe6 100644 +index 2a1a04c87e9a..b5e43b01b396 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c -@@ -136,6 +136,7 @@ int main(void) +@@ -131,6 +131,7 @@ int main(void) + BLANK(); #ifdef CONFIG_KVM_ARM_HOST DEFINE(VCPU_CONTEXT, offsetof(struct kvm_vcpu, arch.ctxt)); - DEFINE(VCPU_FAULT_DISR, offsetof(struct kvm_vcpu, arch.fault.disr_el1)); + DEFINE(VCPU_WORKAROUND_FLAGS, offsetof(struct kvm_vcpu, arch.workaround_flags)); DEFINE(CPU_GP_REGS, offsetof(struct kvm_cpu_context, gp_regs)); DEFINE(CPU_USER_PT_REGS, offsetof(struct kvm_regs, regs)); DEFINE(CPU_FP_REGS, offsetof(struct kvm_regs, fp_regs)); diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S -index bffece27b5c1..05d836979032 100644 +index 82fbc368f738..3c283fd8c8f5 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -106,8 +106,44 @@ el1_hvc_guest: |