Commit 855fb038 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge remote-tracking branch 'kvm/master' into HEAD 



Pick commit fdba608f ("KVM: VMX: Wake vCPU when delivering posted
IRQ even if vCPU == this vCPU").  In addition to fixing a bug, it
also aligns the non-nested and nested usage of triggering posted
interrupts, allowing for additional cleanups.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parents 5a213b92 fdba608f

Documentation/admin-guide/kernel-parameters.txt

+6 −2
Original line number Diff line number Diff line
@@ -2413,8 +2413,12 @@ 
			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)

			[KVM,Intel] Disable emulation of invalid guest state.

			Ignored if kvm-intel.enable_unrestricted_guest=1, as

			guest state is never invalid for unrestricted guests.

			This param doesn't apply to nested guests (L2), as KVM

			never emulates invalid L2 guest state.

			Default is 1 (enabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

arch/x86/include/asm/kvm-x86-ops.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ KVM_X86_OP(set_dr7) 
KVM_X86_OP(cache_reg)

KVM_X86_OP(get_rflags)

KVM_X86_OP(set_rflags)

KVM_X86_OP(get_if_flag)

KVM_X86_OP(tlb_flush_all)

KVM_X86_OP(tlb_flush_current)

KVM_X86_OP_NULL(tlb_remote_flush)

arch/x86/include/asm/kvm_host.h

+2 −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 \
@@ -1354,6 +1354,7 @@ struct kvm_x86_ops { 
	void (*cache_reg)(struct kvm_vcpu *vcpu, enum kvm_reg reg);

	unsigned long (*get_rflags)(struct kvm_vcpu *vcpu);

	void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);

	bool (*get_if_flag)(struct kvm_vcpu *vcpu);



	void (*tlb_flush_all)(struct kvm_vcpu *vcpu);

	void (*tlb_flush_current)(struct kvm_vcpu *vcpu);

arch/x86/kvm/hyperv.c

+5 −2
Original line number Diff line number Diff line
@@ -1923,11 +1923,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,
@@ -1935,6 +1937,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/mmu/mmu.c

+15 −1
Original line number Diff line number Diff line
@@ -3971,7 +3971,21 @@ static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, 
static bool is_page_fault_stale(struct kvm_vcpu *vcpu,

				struct kvm_page_fault *fault, int mmu_seq)

{

	if (is_obsolete_sp(vcpu->kvm, to_shadow_page(vcpu->arch.mmu->root_hpa)))

	struct kvm_mmu_page *sp = to_shadow_page(vcpu->arch.mmu->root_hpa);



	/* Special roots, e.g. pae_root, are not backed by shadow pages. */

	if (sp && is_obsolete_sp(vcpu->kvm, sp))

		return true;



	/*

	 * Roots without an associated shadow page are considered invalid if

	 * there is a pending request to free obsolete roots.  The request is

	 * only a hint that the current root _may_ be obsolete and needs to be

	 * reloaded, e.g. if the guest frees a PGD that KVM is tracking as a

	 * previous root, then __kvm_mmu_prepare_zap_page() signals all vCPUs

	 * to reload even if no vCPU is actively using the root.

	 */

	if (!sp && kvm_test_request(KVM_REQ_MMU_RELOAD, vcpu))

		return true;



	return fault->slot &&