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

Commit a23b27ae 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:
   - avoid livelock when walking guest page tables
   - fix HYP mode static keys without CC_HAVE_ASM_GOTO

  MIPS:
   - fix a build error without TRACEPOINTS_ENABLED

  s390:
   - reject a malformed userspace configuration

  x86:
   - suppress a warning without CONFIG_CPU_FREQ
   - initialize whole irq_eoi array"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  arm/arm64: KVM: Map the BSS at HYP
  arm64: KVM: Take S1 walks into account when determining S2 write faults
  KVM: s390: reject invalid modes for runtime instrumentation
  kvm: x86: memset whole irq_eoi
  kvm/x86: Fix unused variable warning in kvm_timer_init()
  KVM: MIPS: Add missing uaccess.h include
parents 02593ac6 658f7c4b

arch/arm/kvm/arm.c

+7 −0
Original line number Diff line number Diff line
@@ -1312,6 +1312,13 @@ static int init_hyp_mode(void) 
		goto out_err;

	}



	err = create_hyp_mappings(kvm_ksym_ref(__bss_start),

				  kvm_ksym_ref(__bss_stop), PAGE_HYP_RO);

	if (err) {

		kvm_err("Cannot map bss section\n");

		goto out_err;

	}



	/*

	 * Map the Hyp stack pages

	 */

arch/arm64/include/asm/kvm_emulate.h

+6 −5
Original line number Diff line number Diff line
@@ -178,11 +178,6 @@ static inline bool kvm_vcpu_dabt_isvalid(const struct kvm_vcpu *vcpu) 
	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_ISV);

}



static inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR);

}



static inline bool kvm_vcpu_dabt_issext(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_SSE);
@@ -203,6 +198,12 @@ static inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu) 
	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_S1PTW);

}



static inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR) ||

		kvm_vcpu_dabt_iss1tw(vcpu); /* AF/DBM update */

}



static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_CM);

arch/mips/kvm/mips.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/err.h>

#include <linux/kdebug.h>

#include <linux/module.h>

#include <linux/uaccess.h>

#include <linux/vmalloc.h>

#include <linux/fs.h>

#include <linux/bootmem.h>

arch/s390/kvm/intercept.c

+7 −2
Original line number Diff line number Diff line
@@ -119,8 +119,13 @@ static int handle_validity(struct kvm_vcpu *vcpu) 


	vcpu->stat.exit_validity++;

	trace_kvm_s390_intercept_validity(vcpu, viwhy);

	WARN_ONCE(true, "kvm: unhandled validity intercept 0x%x\n", viwhy);

	return -EOPNOTSUPP;

	KVM_EVENT(3, "validity intercept 0x%x for pid %u (kvm 0x%pK)", viwhy,

		  current->pid, vcpu->kvm);



	/* do not warn on invalid runtime instrumentation mode */

	WARN_ONCE(viwhy != 0x44, "kvm: unhandled validity intercept 0x%x\n",

		  viwhy);

	return -EINVAL;

}



static int handle_instruction(struct kvm_vcpu *vcpu)

arch/x86/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static void kvm_ioapic_reset(struct kvm_ioapic *ioapic) 
	ioapic->irr = 0;

	ioapic->irr_delivered = 0;

	ioapic->id = 0;

	memset(ioapic->irq_eoi, 0x00, IOAPIC_NUM_PINS);

	memset(ioapic->irq_eoi, 0x00, sizeof(ioapic->irq_eoi));

	rtc_irq_eoi_tracking_reset(ioapic);

}