Commit 0339eb95 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 more kvm updates from Paolo Bonzini:
 "s390:
   - nested virtualization fixes

  x86:
   - split svm.c

   - miscellaneous fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: fix crash cleanup when KVM wasn't used
  KVM: X86: Filter out the broadcast dest for IPI fastpath
  KVM: s390: vsie: Fix possible race when shadowing region 3 tables
  KVM: s390: vsie: Fix delivery of addressing exceptions
  KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks
  KVM: nVMX: don't clear mtf_pending when nested events are blocked
  KVM: VMX: Remove unnecessary exception trampoline in vmx_vmenter
  KVM: SVM: Split svm_vcpu_run inline assembly to separate file
  KVM: SVM: Move SEV code to separate file
  KVM: SVM: Move AVIC code to separate file
  KVM: SVM: Move Nested SVM Implementation to nested.c
  kVM SVM: Move SVM related files to own sub-directory
parents 9bb71526 dbef2808

arch/s390/kvm/vsie.c

+1 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
		scb_s->iprcc = PGM_ADDRESSING;

		scb_s->pgmilc = 4;

		scb_s->gpsw.addr = __rewind_psw(scb_s->gpsw, 4);

		rc = 1;

	}

	return rc;

}

arch/s390/mm/gmap.c

+6 −1
Original line number Diff line number Diff line
@@ -787,14 +787,18 @@ static void gmap_call_notifier(struct gmap *gmap, unsigned long start, 
static inline unsigned long *gmap_table_walk(struct gmap *gmap,

					     unsigned long gaddr, int level)

{

	const int asce_type = gmap->asce & _ASCE_TYPE_MASK;

	unsigned long *table;



	if ((gmap->asce & _ASCE_TYPE_MASK) + 4 < (level * 4))

		return NULL;

	if (gmap_is_shadow(gmap) && gmap->removed)

		return NULL;

	if (gaddr & (-1UL << (31 + ((gmap->asce & _ASCE_TYPE_MASK) >> 2)*11)))



	if (asce_type != _ASCE_TYPE_REGION1 &&

	    gaddr & (-1UL << (31 + (asce_type >> 2) * 11)))

		return NULL;



	table = gmap->table;

	switch (gmap->asce & _ASCE_TYPE_MASK) {

	case _ASCE_TYPE_REGION1:
@@ -1840,6 +1844,7 @@ int gmap_shadow_r3t(struct gmap *sg, unsigned long saddr, unsigned long r3t, 
		goto out_free;

	} else if (*table & _REGION_ENTRY_ORIGIN) {

		rc = -EAGAIN;		/* Race with shadow */

		goto out_free;

	}

	crst_table_init(s_r3t, _REGION3_ENTRY_EMPTY);

	/* mark as invalid as long as the parent table is not protected */

arch/x86/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \ 
			   hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o



kvm-intel-y		+= vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o vmx/evmcs.o vmx/nested.o

kvm-amd-y		+= svm.o pmu_amd.o

kvm-amd-y		+= svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o



obj-$(CONFIG_KVM)	+= kvm.o

obj-$(CONFIG_KVM_INTEL)	+= kvm-intel.o

arch/x86/kvm/lapic.c

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ 
#define MAX_APIC_VECTOR			256

#define APIC_VECTORS_PER_REG		32



#define APIC_BROADCAST			0xFF

#define X2APIC_BROADCAST		0xFFFFFFFFul



static bool lapic_timer_advance_dynamic __read_mostly;

#define LAPIC_TIMER_ADVANCE_ADJUST_MIN	100	/* clock cycles */

#define LAPIC_TIMER_ADVANCE_ADJUST_MAX	10000	/* clock cycles */

arch/x86/kvm/lapic.h

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
#define APIC_BUS_CYCLE_NS       1

#define APIC_BUS_FREQUENCY      (1000000000ULL / APIC_BUS_CYCLE_NS)



#define APIC_BROADCAST			0xFF

#define X2APIC_BROADCAST		0xFFFFFFFFul



enum lapic_mode {

	LAPIC_MODE_DISABLED = 0,

	LAPIC_MODE_INVALID = X2APIC_ENABLE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE