Commit 6693075e 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:
 "Bugfixes for x86 and s390"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: nVMX: avoid NULL pointer dereference with incorrect EVMCS GPAs
  KVM: x86: Initializing all kvm_lapic_irq fields in ioapic_write_indirect
  KVM: VMX: Condition ENCLS-exiting enabling on CPU support for SGX1
  KVM: s390: Also reset registers in sync regs for initial cpu reset
  KVM: fix Kconfig menu text for -Werror
  KVM: x86: remove stale comment from struct x86_emulate_ctxt
  KVM: x86: clear stale x86_emulate_ctxt->intercept value
  KVM: SVM: Fix the svm vmexit code for WRMSR
  KVM: X86: Fix dereference null cpufreq policy
parents 69a4d0ba 018cabb6

arch/s390/kvm/kvm-s390.c

+17 −1
Original line number Diff line number Diff line
@@ -3268,7 +3268,10 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 
	/* Initial reset is a superset of the normal reset */

	kvm_arch_vcpu_ioctl_normal_reset(vcpu);



	/* this equals initial cpu reset in pop, but we don't switch to ESA */

	/*

	 * This equals initial cpu reset in pop, but we don't switch to ESA.

	 * We do not only reset the internal data, but also ...

	 */

	vcpu->arch.sie_block->gpsw.mask = 0;

	vcpu->arch.sie_block->gpsw.addr = 0;

	kvm_s390_set_prefix(vcpu, 0);
@@ -3278,6 +3281,19 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 
	memset(vcpu->arch.sie_block->gcr, 0, sizeof(vcpu->arch.sie_block->gcr));

	vcpu->arch.sie_block->gcr[0] = CR0_INITIAL_MASK;

	vcpu->arch.sie_block->gcr[14] = CR14_INITIAL_MASK;



	/* ... the data in sync regs */

	memset(vcpu->run->s.regs.crs, 0, sizeof(vcpu->run->s.regs.crs));

	vcpu->run->s.regs.ckc = 0;

	vcpu->run->s.regs.crs[0] = CR0_INITIAL_MASK;

	vcpu->run->s.regs.crs[14] = CR14_INITIAL_MASK;

	vcpu->run->psw_addr = 0;

	vcpu->run->psw_mask = 0;

	vcpu->run->s.regs.todpr = 0;

	vcpu->run->s.regs.cputm = 0;

	vcpu->run->s.regs.ckc = 0;

	vcpu->run->s.regs.pp = 0;

	vcpu->run->s.regs.gbea = 1;

	vcpu->run->s.regs.fpc = 0;

	vcpu->arch.sie_block->gbea = 1;

	vcpu->arch.sie_block->pp = 0;

arch/x86/include/asm/kvm_emulate.h

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ struct x86_emulate_ctxt { 
	u64 d;

	unsigned long _eip;

	struct operand memop;

	/* Fields above regs are cleared together. */

	unsigned long _regs[NR_VCPU_REGS];

	struct operand *memopp;

	struct fetch_cache fetch;

arch/x86/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ config KVM_WERROR 
	depends on (X86_64 && !KASAN) || !COMPILE_TEST

	depends on EXPERT

	help

	  Add -Werror to the build flags for (and only for) i915.ko.

	  Add -Werror to the build flags for KVM.



	  If in doubt, say "N".

arch/x86/kvm/emulate.c

+1 −0
Original line number Diff line number Diff line
@@ -5173,6 +5173,7 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) 
	ctxt->fetch.ptr = ctxt->fetch.data;

	ctxt->fetch.end = ctxt->fetch.data + insn_len;

	ctxt->opcode_len = 1;

	ctxt->intercept = x86_intercept_none;

	if (insn_len > 0)

		memcpy(ctxt->fetch.data, insn, insn_len);

	else {

arch/x86/kvm/ioapic.c

+5 −2
Original line number Diff line number Diff line
@@ -378,12 +378,15 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) 
		if (e->fields.delivery_mode == APIC_DM_FIXED) {

			struct kvm_lapic_irq irq;



			irq.shorthand = APIC_DEST_NOSHORT;

			irq.vector = e->fields.vector;

			irq.delivery_mode = e->fields.delivery_mode << 8;

			irq.dest_id = e->fields.dest_id;

			irq.dest_mode =

			    kvm_lapic_irq_dest_mode(!!e->fields.dest_mode);

			irq.level = false;

			irq.trig_mode = e->fields.trig_mode;

			irq.shorthand = APIC_DEST_NOSHORT;

			irq.dest_id = e->fields.dest_id;

			irq.msi_redir_hint = false;

			bitmap_zero(&vcpu_bitmap, 16);

			kvm_bitmap_or_dest_vcpus(ioapic->kvm, &irq,

						 &vcpu_bitmap);

CRA Git | Maintained and supported by SUSTech CRA and CCSE