Commit 81554693 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:
 "s390:
   - SRCU fix

  PPC:
   - host crash fixes

  x86:
   - bugfixes, including making nested posted interrupts really work

  Generic:
   - tweaks to kvm_stat and to uevents"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: LAPIC: Fix reentrancy issues with preempt notifiers
  tools/kvm_stat: add '-f help' to get the available event list
  tools/kvm_stat: use variables instead of hard paths in help output
  KVM: nVMX: Fix loss of L2's NMI blocking state
  KVM: nVMX: Fix posted intr delivery when vcpu is in guest mode
  x86: irq: Define a global vector for nested posted interrupts
  KVM: x86: do mask out upper bits of PAE CR3
  KVM: make pid available for uevents without debugfs
  KVM: s390: take srcu lock when getting/setting storage keys
  KVM: VMX: remove unused field
  KVM: PPC: Book3S HV: Fix host crash on changing HPT size
  KVM: PPC: Book3S HV: Enable TM before accessing TM registers
parents 8562e89e 7b5e0a4e

arch/powerpc/kvm/book3s_64_mmu_hv.c

+3 −1
Original line number Diff line number Diff line
@@ -164,8 +164,10 @@ long kvmppc_alloc_reset_hpt(struct kvm *kvm, int order) 
		goto out;

	}



	if (kvm->arch.hpt.virt)

	if (kvm->arch.hpt.virt) {

		kvmppc_free_hpt(&kvm->arch.hpt);

		kvmppc_rmap_reset(kvm);

	}



	err = kvmppc_allocate_hpt(&info, order);

	if (err < 0)

arch/powerpc/kvm/book3s_hv.c

+2 −0
Original line number Diff line number Diff line
@@ -3211,6 +3211,8 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) 
			run->fail_entry.hardware_entry_failure_reason = 0;

			return -EINVAL;

		}

		/* Enable TM so we can read the TM SPRs */

		mtmsr(mfmsr() | MSR_TM);

		current->thread.tm_tfhar = mfspr(SPRN_TFHAR);

		current->thread.tm_tfiar = mfspr(SPRN_TFIAR);

		current->thread.tm_texasr = mfspr(SPRN_TEXASR);

arch/s390/kvm/kvm-s390.c

+6 −2
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ static long kvm_s390_get_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
{

	uint8_t *keys;

	uint64_t hva;

	int i, r = 0;

	int srcu_idx, i, r = 0;



	if (args->flags != 0)

		return -EINVAL;
@@ -1342,6 +1342,7 @@ static long kvm_s390_get_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
		return -ENOMEM;



	down_read(&current->mm->mmap_sem);

	srcu_idx = srcu_read_lock(&kvm->srcu);

	for (i = 0; i < args->count; i++) {

		hva = gfn_to_hva(kvm, args->start_gfn + i);

		if (kvm_is_error_hva(hva)) {
@@ -1353,6 +1354,7 @@ static long kvm_s390_get_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
		if (r)

			break;

	}

	srcu_read_unlock(&kvm->srcu, srcu_idx);

	up_read(&current->mm->mmap_sem);



	if (!r) {
@@ -1370,7 +1372,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
{

	uint8_t *keys;

	uint64_t hva;

	int i, r = 0;

	int srcu_idx, i, r = 0;



	if (args->flags != 0)

		return -EINVAL;
@@ -1396,6 +1398,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
		goto out;



	down_read(&current->mm->mmap_sem);

	srcu_idx = srcu_read_lock(&kvm->srcu);

	for (i = 0; i < args->count; i++) {

		hva = gfn_to_hva(kvm, args->start_gfn + i);

		if (kvm_is_error_hva(hva)) {
@@ -1413,6 +1416,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 
		if (r)

			break;

	}

	srcu_read_unlock(&kvm->srcu, srcu_idx);

	up_read(&current->mm->mmap_sem);

out:

	kvfree(keys);

arch/x86/entry/entry_64.S

+1 −0
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ apicinterrupt X86_PLATFORM_IPI_VECTOR x86_platform_ipi smp_x86_platform_ipi 
#ifdef CONFIG_HAVE_KVM

apicinterrupt3 POSTED_INTR_VECTOR		kvm_posted_intr_ipi		smp_kvm_posted_intr_ipi

apicinterrupt3 POSTED_INTR_WAKEUP_VECTOR	kvm_posted_intr_wakeup_ipi	smp_kvm_posted_intr_wakeup_ipi

apicinterrupt3 POSTED_INTR_NESTED_VECTOR	kvm_posted_intr_nested_ipi	smp_kvm_posted_intr_nested_ipi

#endif



#ifdef CONFIG_X86_MCE_THRESHOLD

arch/x86/include/asm/entry_arch.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ BUILD_INTERRUPT3(kvm_posted_intr_ipi, POSTED_INTR_VECTOR, 
		 smp_kvm_posted_intr_ipi)

BUILD_INTERRUPT3(kvm_posted_intr_wakeup_ipi, POSTED_INTR_WAKEUP_VECTOR,

		 smp_kvm_posted_intr_wakeup_ipi)

BUILD_INTERRUPT3(kvm_posted_intr_nested_ipi, POSTED_INTR_NESTED_VECTOR,

		 smp_kvm_posted_intr_nested_ipi)

#endif



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE