Commit 0aea22c7 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:
 "Generic:

   - Set .owner for various KVM file_operations so that files refcount
     the KVM module until KVM is done executing _all_ code, including
     the last few instructions of kvm_put_kvm(). And then revert the
     misguided attempt to rely on "struct kvm" refcounts to pin
     KVM-the-module.

  ARM:

   - Do not redo the mapping of vLPIs, if they have already been mapped

  s390:

   - Do not leave bits behind in PTEs

   - Properly catch page invalidations that affect the prefix of a
     nested guest

  x86:

   - When checking if a _running_ vCPU is "in-kernel", i.e. running at
     CPL0, get the CPL directly instead of relying on
     preempted_in_kernel (which is valid if and only if the vCPU was
     preempted, i.e. NOT running).

   - Fix a benign "return void" that was recently introduced.

  Selftests:

   - Makefile tweak for dependency generation

   - '-Wformat' fix"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Update EFER software model on CR0 trap for SEV-ES
  KVM: selftests: add -MP to CFLAGS
  KVM: selftests: Actually print out magic token in NX hugepages skip message
  KVM: x86: Remove 'return void' expression for 'void function'
  Revert "KVM: Prevent module exit until all VMs are freed"
  KVM: Set file_operations.owner appropriately for all such structures
  KVM: x86: Get CPL directly when checking if loaded vCPU is in kernel mode
  KVM: arm64: GICv4: Do not perform a map to a mapped vLPI
  KVM: s390/mm: Properly reset no-dat
  KVM: s390: vsie: fix wrong VIR 37 when MSO is used
parents c527f560 4cdf351d

arch/arm64/kvm/vgic/vgic-v4.c

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, 
	if (ret)

		goto out;



	/* Silently exit if the vLPI is already mapped */

	if (irq->hw)

		goto out;



	/*

	 * Emit the mapping request. If it fails, the ITS probably

	 * isn't v4 compatible, so let's silently bail out. Holding

arch/s390/kvm/vsie.c

+0 −4
Original line number Diff line number Diff line
@@ -587,10 +587,6 @@ void kvm_s390_vsie_gmap_notifier(struct gmap *gmap, unsigned long start, 


	if (!gmap_is_shadow(gmap))

		return;

	if (start >= 1UL << 31)

		/* We are only interested in prefix pages */

		return;



	/*

	 * Only new shadow blocks are added to the list during runtime,

	 * therefore we can safely reference them all the time.

arch/s390/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr, 
		pte_clear(mm, addr, ptep);

	}

	if (reset)

		pgste_val(pgste) &= ~_PGSTE_GPS_USAGE_MASK;

		pgste_val(pgste) &= ~(_PGSTE_GPS_USAGE_MASK | _PGSTE_GPS_NODAT);

	pgste_set_unlock(ptep, pgste);

	preempt_enable();

}

arch/x86/kvm/debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static int kvm_mmu_rmaps_stat_release(struct inode *inode, struct file *file) 
}



static const struct file_operations mmu_rmaps_stat_fops = {

	.owner		= THIS_MODULE,

	.open		= kvm_mmu_rmaps_stat_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

arch/x86/kvm/svm/svm.c

+5 −3
Original line number Diff line number Diff line
@@ -1855,14 +1855,16 @@ void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 
	bool old_paging = is_paging(vcpu);



#ifdef CONFIG_X86_64

	if (vcpu->arch.efer & EFER_LME && !vcpu->arch.guest_state_protected) {

	if (vcpu->arch.efer & EFER_LME) {

		if (!is_paging(vcpu) && (cr0 & X86_CR0_PG)) {

			vcpu->arch.efer |= EFER_LMA;

			if (!vcpu->arch.guest_state_protected)

				svm->vmcb->save.efer |= EFER_LMA | EFER_LME;

		}



		if (is_paging(vcpu) && !(cr0 & X86_CR0_PG)) {

			vcpu->arch.efer &= ~EFER_LMA;

			if (!vcpu->arch.guest_state_protected)

				svm->vmcb->save.efer &= ~(EFER_LMA | EFER_LME);

		}

	}