Commit f0a32ee4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Paolo Bonzini:
 "Fixes for interrupt controller emulation in ARM/ARM64 and x86, plus a
  one-liner x86 KVM guest fix"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Update APICv on APIC reset
  KVM: VMX: Do not fully reset PI descriptor on vCPU reset
  kvm: Return -ENODEV from update_persistent_clock
  KVM: arm/arm64: vgic-its: Check GITS_BASER Valid bit before saving tables
  KVM: arm/arm64: vgic-its: Check CBASER/BASER validity before enabling the ITS
  KVM: arm/arm64: vgic-its: Fix vgic_its_restore_collection_table returned value
  KVM: arm/arm64: vgic-its: Fix return value for device table restore
  arm/arm64: kvm: Disable branch profiling in HYP code
  arm/arm64: kvm: Move initialization completion message
  arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort
  KVM: arm64: its: Fix missing dynamic allocation check in scan_its_table
parents b1878b85 b33c8732

arch/arm/kvm/emulate.c

+2 −4
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu) 
	u32 return_offset = (is_thumb) ? 2 : 4;



	kvm_update_psr(vcpu, UND_MODE);

	*vcpu_reg(vcpu, 14) = *vcpu_pc(vcpu) - return_offset;

	*vcpu_reg(vcpu, 14) = *vcpu_pc(vcpu) + return_offset;



	/* Branch to exception vector */

	*vcpu_pc(vcpu) = exc_vector_base(vcpu) + vect_offset;
@@ -239,10 +239,8 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu) 
 */

static void inject_abt(struct kvm_vcpu *vcpu, bool is_pabt, unsigned long addr)

{

	unsigned long cpsr = *vcpu_cpsr(vcpu);

	bool is_thumb = (cpsr & PSR_T_BIT);

	u32 vect_offset;

	u32 return_offset = (is_thumb) ? 4 : 0;

	u32 return_offset = (is_pabt) ? 4 : 8;

	bool is_lpae;



	kvm_update_psr(vcpu, ABT_MODE);

arch/arm/kvm/hyp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Makefile for Kernel-based Virtual Machine module, HYP part

#



ccflags-y += -fno-stack-protector

ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING



KVM=../../../../virt/kvm

arch/arm64/kvm/hyp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Makefile for Kernel-based Virtual Machine module, HYP part

#



ccflags-y += -fno-stack-protector

ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING



KVM=../../../../virt/kvm

arch/arm64/kvm/inject_fault.c

+15 −1
Original line number Diff line number Diff line
@@ -33,12 +33,26 @@ 
#define LOWER_EL_AArch64_VECTOR		0x400

#define LOWER_EL_AArch32_VECTOR		0x600



/*

 * Table taken from ARMv8 ARM DDI0487B-B, table G1-10.

 */

static const u8 return_offsets[8][2] = {

	[0] = { 0, 0 },		/* Reset, unused */

	[1] = { 4, 2 },		/* Undefined */

	[2] = { 0, 0 },		/* SVC, unused */

	[3] = { 4, 4 },		/* Prefetch abort */

	[4] = { 8, 8 },		/* Data abort */

	[5] = { 0, 0 },		/* HVC, unused */

	[6] = { 4, 4 },		/* IRQ, unused */

	[7] = { 4, 4 },		/* FIQ, unused */

};



static void prepare_fault32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset)

{

	unsigned long cpsr;

	unsigned long new_spsr_value = *vcpu_cpsr(vcpu);

	bool is_thumb = (new_spsr_value & COMPAT_PSR_T_BIT);

	u32 return_offset = (is_thumb) ? 4 : 0;

	u32 return_offset = return_offsets[vect_offset >> 2][is_thumb];

	u32 sctlr = vcpu_cp15(vcpu, c1_SCTLR);



	cpsr = mode | COMPAT_PSR_I_BIT;

arch/x86/kernel/kvmclock.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void kvm_get_wallclock(struct timespec *now) 


static int kvm_set_wallclock(const struct timespec *now)

{

	return -1;

	return -ENODEV;

}



static u64 kvm_clock_read(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE