Commit 796c83c5 authored by Vipin Sharma's avatar Vipin Sharma Committed by Paolo Bonzini
Browse files

KVM: Move INVPCID type check from vmx and svm to the common kvm_handle_invpcid() 



Handle #GP on INVPCID due to an invalid type in the common switch
statement instead of relying on the callers (VMX and SVM) to manually
validate the type.

Unlike INVVPID and INVEPT, INVPCID is not explicitly documented to check
the type before reading the operand from memory, so deferring the
type validity check until after that point is architecturally allowed.

Signed-off-by: default avatarVipin Sharma <vipinsh@google.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20211109174426.2350547-3-vipinsh@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 329bd56c

arch/x86/kvm/svm/svm.c

+0 −5
Original line number Diff line number Diff line
@@ -3119,11 +3119,6 @@ static int invpcid_interception(struct kvm_vcpu *vcpu) 
	type = svm->vmcb->control.exit_info_2;

	gva = svm->vmcb->control.exit_info_1;



	if (type > 3) {

		kvm_inject_gp(vcpu, 0);

		return 1;

	}



	return kvm_handle_invpcid(vcpu, type, gva);

}

arch/x86/kvm/vmx/vmx.c

+0 −5
Original line number Diff line number Diff line
@@ -5454,11 +5454,6 @@ static int handle_invpcid(struct kvm_vcpu *vcpu) 
	gpr_index = vmx_get_instr_info_reg2(vmx_instruction_info);

	type = kvm_register_read(vcpu, gpr_index);



	if (type > 3) {

		kvm_inject_gp(vcpu, 0);

		return 1;

	}



	/* According to the Intel instruction reference, the memory operand

	 * is read even if it isn't needed (e.g., for type==all)

	 */

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -12510,7 +12510,8 @@ int kvm_handle_invpcid(struct kvm_vcpu *vcpu, unsigned long type, gva_t gva) 
		return kvm_skip_emulated_instruction(vcpu);



	default:

		BUG(); /* We have already checked above that type <= 3 */

		kvm_inject_gp(vcpu, 0);

		return 1;

	}

}

EXPORT_SYMBOL_GPL(kvm_handle_invpcid);