Skip to contentSkip to conversation

Patch "ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Jun 27, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm64-kvm-store-kvm_vcpu_fault_info-est_el2-as-word.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ba083d20d8cfa9e999043cd89c4ebc964ccf8927 Mon Sep 17 00:00:00 2001

From: Victor Kamensky <[email protected]>
Date: Thu, 12 Jun 2014 09:30:09 -0700
Subject: ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word

From: Victor Kamensky <[email protected]>

commit ba083d20d8cfa9e999043cd89c4ebc964ccf8927 upstream.

esr_el2 field of struct kvm_vcpu_fault_info has u32 type. It should be stored as word. Current code works in LE case because existing puts least significant word of x1 into esr_el2, and it puts most significant work of x1 into next field, which accidentally is OK because it is updated again by next instruction. But existing code breaks in BE case.

---
 arch/arm64/kvm/hyp.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/hyp.S +1 -1
@@ -830,7 +830,7 @@ el1_trap:
 	mrs	x2, far_el2
 
 2:	mrs	x0, tpidr_el2
-	str	x1, [x0, #VCPU_ESR_EL2]
+	str	w1, [x0, #VCPU_ESR_EL2]
 	str	x2, [x0, #VCPU_FAR_EL2]
 	str	x3, [x0, #VCPU_HPFAR_EL2]
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/arm64-kvm-store-kvm_vcpu_fault_info-est_el2-as-word.patch