Commit a9e2e0ae authored Aug 28, 2020 by Robert Hoo Committed by Paolo Bonzini Sep 28, 2020

KVM: x86: emulating RDPID failure shall return #UD rather than #GP



Per Intel's SDM, RDPID takes a #UD if it is unsupported, which is more or
less what KVM is emulating when MSR_TSC_AUX is not available.  In fact,
there are no scenarios in which RDPID is supposed to #GP.

Fixes: fb6d4d34 ("KVM: x86: emulate RDPID")
Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
Message-Id: <1598581422-76264-1-git-send-email-robert.hu@linux.intel.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 25bb2cf9

arch/x86/kvm/emulate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3606,7 +3606,7 @@ static int em_rdpid(struct x86_emulate_ctxt *ctxt)
		u64 tsc_aux = 0;

		if (ctxt->ops->get_msr(ctxt, MSR_TSC_AUX, &tsc_aux))
		return emulate_gp(ctxt, 0);
		return emulate_ud(ctxt);
		ctxt->dst.val = tsc_aux;
		return X86EMUL_CONTINUE;
		}

Admin message