Commit 90bf8d98 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 fixes from Paolo Bonzini:

 - Static analysis fix

 - New SEV-ES protocol for communicating invalid VMGEXIT requests

 - Ensure APICv is considered inactive if there is no APIC

 - Fix reserved bits for AMD PerfEvtSeln register

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Do not terminate SEV-ES guests on GHCB validation failure
  KVM: SEV: Fall back to vmalloc for SEV-ES scratch area if necessary
  KVM: SEV: Return appropriate error codes if SEV-ES scratch setup fails
  KVM: x86/mmu: Retry page fault if root is invalidated by memslot update
  KVM: VMX: Set failure code in prepare_vmcs02()
  KVM: ensure APICv is considered inactive if there is no APIC
  KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register
parents 79a72162 ad5b3532

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,7 @@ struct kvm_x86_msr_filter { 
#define APICV_INHIBIT_REASON_PIT_REINJ  4

#define APICV_INHIBIT_REASON_X2APIC	5

#define APICV_INHIBIT_REASON_BLOCKIRQ	6

#define APICV_INHIBIT_REASON_ABSENT	7



struct kvm_arch {

	unsigned long n_used_mmu_pages;

arch/x86/include/asm/sev-common.h

+11 −0
Original line number Diff line number Diff line
@@ -73,4 +73,15 @@ 


#define GHCB_RESP_CODE(v)		((v) & GHCB_MSR_INFO_MASK)



/*

 * Error codes related to GHCB input that can be communicated back to the guest

 * by setting the lower 32-bits of the GHCB SW_EXITINFO1 field to 2.

 */

#define GHCB_ERR_NOT_REGISTERED		1

#define GHCB_ERR_INVALID_USAGE		2

#define GHCB_ERR_INVALID_SCRATCH_AREA	3

#define GHCB_ERR_MISSING_INPUT		4

#define GHCB_ERR_INVALID_INPUT		5

#define GHCB_ERR_INVALID_EVENT		6



#endif

arch/x86/kvm/mmu/mmu.c

+21 −2
Original line number Diff line number Diff line
@@ -1936,7 +1936,11 @@ static void mmu_audit_disable(void) { } 


static bool is_obsolete_sp(struct kvm *kvm, struct kvm_mmu_page *sp)

{

	return sp->role.invalid ||

	if (sp->role.invalid)

		return true;



	/* TDP MMU pages due not use the MMU generation. */

	return !sp->tdp_mmu_page &&

	       unlikely(sp->mmu_valid_gen != kvm->arch.mmu_valid_gen);

}
@@ -3976,6 +3980,20 @@ static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, 
	return true;

}



/*

 * Returns true if the page fault is stale and needs to be retried, i.e. if the

 * root was invalidated by a memslot update or a relevant mmu_notifier fired.

 */

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)))

		return true;



	return fault->slot &&

	       mmu_notifier_retry_hva(vcpu->kvm, mmu_seq, fault->hva);

}



static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault)

{

	bool is_tdp_mmu_fault = is_tdp_mmu(vcpu->arch.mmu);
@@ -4013,8 +4031,9 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault 
	else

		write_lock(&vcpu->kvm->mmu_lock);



	if (fault->slot && mmu_notifier_retry_hva(vcpu->kvm, mmu_seq, fault->hva))

	if (is_page_fault_stale(vcpu, fault, mmu_seq))

		goto out_unlock;



	r = make_mmu_pages_available(vcpu);

	if (r)

		goto out_unlock;

arch/x86/kvm/mmu/paging_tmpl.h

+2 −1
Original line number Diff line number Diff line
@@ -911,7 +911,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault 


	r = RET_PF_RETRY;

	write_lock(&vcpu->kvm->mmu_lock);

	if (fault->slot && mmu_notifier_retry_hva(vcpu->kvm, mmu_seq, fault->hva))



	if (is_page_fault_stale(vcpu, fault, mmu_seq))

		goto out_unlock;



	kvm_mmu_audit(vcpu, AUDIT_PRE_PAGE_FAULT);

arch/x86/kvm/svm/avic.c

+1 −0
Original line number Diff line number Diff line
@@ -900,6 +900,7 @@ int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq, 
bool svm_check_apicv_inhibit_reasons(ulong bit)

{

	ulong supported = BIT(APICV_INHIBIT_REASON_DISABLE) |

			  BIT(APICV_INHIBIT_REASON_ABSENT) |

			  BIT(APICV_INHIBIT_REASON_HYPERV) |

			  BIT(APICV_INHIBIT_REASON_NESTED) |

			  BIT(APICV_INHIBIT_REASON_IRQWIN) |