Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c9eff7a 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 Radim Krčmář:
 "ARM:
   - Fix for timer setup on VHE machines
   - Drop spurious warning when the timer races against the vcpu running
     again
   - Prevent a vgic deadlock when the initialization fails (for stable)

  s390:
   - Fix a kernel memory exposure (for stable)

  x86:
   - Fix exception injection when hypercall instruction cannot be
     patched"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: s390: do not expose random data via facility bitmap
  KVM: x86: fix fixing of hypercalls
  KVM: arm/arm64: vgic: Fix deadlock on error handling
  KVM: arm64: Access CNTHCTL_EL2 bit fields correctly on VHE systems
  KVM: arm/arm64: Fix occasional warning from the timer work function
parents 51162264 fec96901

arch/arm/include/asm/virt.h

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ static inline bool is_kernel_in_hyp_mode(void) 
	return false;

}



static inline bool has_vhe(void)

{

	return false;

}



/* The section containing the hypervisor idmap text */

extern char __hyp_idmap_text_start[];

extern char __hyp_idmap_text_end[];

arch/arm/kvm/arm.c

+3 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,9 @@ static void cpu_init_hyp_mode(void *dummy) 
	__cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr);

	__cpu_init_stage2();



	if (is_kernel_in_hyp_mode())

		kvm_timer_init_vhe();



	kvm_arm_init_debug();

}

arch/arm64/include/asm/virt.h

+9 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <asm/ptrace.h>

#include <asm/sections.h>

#include <asm/sysreg.h>

#include <asm/cpufeature.h>



/*

 * __boot_cpu_mode records what mode CPUs were booted in.
@@ -80,6 +81,14 @@ static inline bool is_kernel_in_hyp_mode(void) 
	return read_sysreg(CurrentEL) == CurrentEL_EL2;

}



static inline bool has_vhe(void)

{

	if (cpus_have_const_cap(ARM64_HAS_VIRT_HOST_EXTN))

		return true;



	return false;

}



#ifdef CONFIG_ARM64_VHE

extern void verify_cpu_run_el(void);

#else

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ static int kvm_s390_get_machine(struct kvm *kvm, struct kvm_device_attr *attr) 
	memcpy(&mach->fac_mask, kvm->arch.model.fac_mask,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);

	memcpy((unsigned long *)&mach->fac_list, S390_lowcore.stfle_fac_list,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);

	       sizeof(S390_lowcore.stfle_fac_list));

	if (copy_to_user((void __user *)attr->addr, mach, sizeof(*mach)))

		ret = -EFAULT;

	kfree(mach);
@@ -1437,7 +1437,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


	/* Populate the facility mask initially. */

	memcpy(kvm->arch.model.fac_mask, S390_lowcore.stfle_fac_list,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);

	       sizeof(S390_lowcore.stfle_fac_list));

	for (i = 0; i < S390_ARCH_FAC_LIST_SIZE_U64; i++) {

		if (i < kvm_s390_fac_list_mask_size())

			kvm->arch.model.fac_mask[i] &= kvm_s390_fac_list_mask[i];

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -6171,7 +6171,8 @@ static int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt) 


	kvm_x86_ops->patch_hypercall(vcpu, instruction);



	return emulator_write_emulated(ctxt, rip, instruction, 3, NULL);

	return emulator_write_emulated(ctxt, rip, instruction, 3,

		&ctxt->exception);

}



static int dm_request_for_irq_injection(struct kvm_vcpu *vcpu)