Commit b9172f9e 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:
 "More x86 fixes:

   - Logic bugs in CR0 writes and Hyper-V hypercalls

   - Don't use Enlightened MSR Bitmap for L3

   - Remove user-triggerable WARN

  Plus a few selftest fixes and a regression test for the
  user-triggerable WARN"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  selftests: KVM: Add test to verify KVM doesn't explode on "bad" I/O
  KVM: x86: Don't WARN if userspace mucks with RCX during string I/O exit
  KVM: X86: Raise #GP when clearing CR0_PG in 64 bit mode
  selftests: KVM: avoid failures due to reserved HyperTransport region
  KVM: x86: Ignore sparse banks size for an "all CPUs", non-sparse IPI req
  KVM: x86: Wait for IPIs to be delivered when handling Hyper-V TLB flush hypercall
  KVM: x86: selftests: svm_int_ctl_test: fix intercept calculation
  KVM: nVMX: Don't use Enlightened MSR Bitmap for L3
parents b8a98b6b 10e7a099

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
	KVM_ARCH_REQ_FLAGS(25, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_TLB_FLUSH_CURRENT	KVM_ARCH_REQ(26)

#define KVM_REQ_TLB_FLUSH_GUEST \

	KVM_ARCH_REQ_FLAGS(27, KVM_REQUEST_NO_WAKEUP)

	KVM_ARCH_REQ_FLAGS(27, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_APF_READY		KVM_ARCH_REQ(28)

#define KVM_REQ_MSR_FILTER_CHANGED	KVM_ARCH_REQ(29)

#define KVM_REQ_UPDATE_CPU_DIRTY_LOGGING \

arch/x86/kvm/hyperv.c

+5 −2
Original line number Diff line number Diff line
@@ -1922,11 +1922,13 @@ static u64 kvm_hv_send_ipi(struct kvm_vcpu *vcpu, struct kvm_hv_hcall *hc, bool 


		all_cpus = send_ipi_ex.vp_set.format == HV_GENERIC_SET_ALL;



		if (all_cpus)

			goto check_and_send_ipi;



		if (!sparse_banks_len)

			goto ret_success;



		if (!all_cpus &&

		    kvm_read_guest(kvm,

		if (kvm_read_guest(kvm,

				   hc->ingpa + offsetof(struct hv_send_ipi_ex,

							vp_set.bank_contents),

				   sparse_banks,
@@ -1934,6 +1936,7 @@ static u64 kvm_hv_send_ipi(struct kvm_vcpu *vcpu, struct kvm_hv_hcall *hc, bool 
			return HV_STATUS_INVALID_HYPERCALL_INPUT;

	}



check_and_send_ipi:

	if ((vector < HV_IPI_LOW_VECTOR) || (vector > HV_IPI_HIGH_VECTOR))

		return HV_STATUS_INVALID_HYPERCALL_INPUT;

arch/x86/kvm/vmx/vmx.c

+13 −9
Original line number Diff line number Diff line
@@ -2646,15 +2646,6 @@ int alloc_loaded_vmcs(struct loaded_vmcs *loaded_vmcs) 
		if (!loaded_vmcs->msr_bitmap)

			goto out_vmcs;

		memset(loaded_vmcs->msr_bitmap, 0xff, PAGE_SIZE);



		if (IS_ENABLED(CONFIG_HYPERV) &&

		    static_branch_unlikely(&enable_evmcs) &&

		    (ms_hyperv.nested_features & HV_X64_NESTED_MSR_BITMAP)) {

			struct hv_enlightened_vmcs *evmcs =

				(struct hv_enlightened_vmcs *)loaded_vmcs->vmcs;



			evmcs->hv_enlightenments_control.msr_bitmap = 1;

		}

	}



	memset(&loaded_vmcs->host_state, 0, sizeof(struct vmcs_host_state));
@@ -6842,6 +6833,19 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) 
	if (err < 0)

		goto free_pml;



	/*

	 * Use Hyper-V 'Enlightened MSR Bitmap' feature when KVM runs as a

	 * nested (L1) hypervisor and Hyper-V in L0 supports it. Enable the

	 * feature only for vmcs01, KVM currently isn't equipped to realize any

	 * performance benefits from enabling it for vmcs02.

	 */

	if (IS_ENABLED(CONFIG_HYPERV) && static_branch_unlikely(&enable_evmcs) &&

	    (ms_hyperv.nested_features & HV_X64_NESTED_MSR_BITMAP)) {

		struct hv_enlightened_vmcs *evmcs = (void *)vmx->vmcs01.vmcs;



		evmcs->hv_enlightenments_control.msr_bitmap = 1;

	}



	/* The MSR bitmap starts with all ones */

	bitmap_fill(vmx->shadow_msr_intercept.read, MAX_POSSIBLE_PASSTHROUGH_MSRS);

	bitmap_fill(vmx->shadow_msr_intercept.write, MAX_POSSIBLE_PASSTHROUGH_MSRS);

arch/x86/kvm/x86.c

+9 −3
Original line number Diff line number Diff line
@@ -890,7 +890,8 @@ int kvm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 
	    !load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu)))

		return 1;



	if (!(cr0 & X86_CR0_PG) && kvm_read_cr4_bits(vcpu, X86_CR4_PCIDE))

	if (!(cr0 & X86_CR0_PG) &&

	    (is_64_bit_mode(vcpu) || kvm_read_cr4_bits(vcpu, X86_CR4_PCIDE)))

		return 1;



	static_call(kvm_x86_set_cr0)(vcpu, cr0);
@@ -7121,7 +7122,13 @@ static int emulator_pio_in(struct kvm_vcpu *vcpu, int size, 
			   unsigned short port, void *val, unsigned int count)

{

	if (vcpu->arch.pio.count) {

		/* Complete previous iteration.  */

		/*

		 * Complete a previous iteration that required userspace I/O.

		 * Note, @count isn't guaranteed to match pio.count as userspace

		 * can modify ECX before rerunning the vCPU.  Ignore any such

		 * shenanigans as KVM doesn't support modifying the rep count,

		 * and the emulator ensures @count doesn't overflow the buffer.

		 */

	} else {

		int r = __emulator_pio_in(vcpu, size, port, count);

		if (!r)
@@ -7130,7 +7137,6 @@ static int emulator_pio_in(struct kvm_vcpu *vcpu, int size, 
		/* Results already available, fall through.  */

	}



	WARN_ON(count != vcpu->arch.pio.count);

	complete_emulator_pio_in(vcpu, val);

	return 1;

}

tools/testing/selftests/kvm/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
/x86_64/svm_int_ctl_test

/x86_64/sync_regs_test

/x86_64/tsc_msrs_test

/x86_64/userspace_io_test

/x86_64/userspace_msr_exit_test

/x86_64/vmx_apic_access_test

/x86_64/vmx_close_while_nested_test