From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94D1CC55178 for ; Tue, 27 Oct 2020 17:50:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 484FF24181 for ; Tue, 27 Oct 2020 17:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603821057; bh=1diVp1sB2I4qUJjDbncH+lW9A6j4P6IQUwpl1HIzML8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SRJe9hdMG+iq1fWm9GgJNlWhN6emo2znso+eDOFwpyYZcS+UtAh/uUUqxqa+40Bis NDpPajnvOJIxi3aeBQHlStKKPe6wIrjYyEgj19/IMAb8bd7Rt7jeXilufqHJ7wjA4T Fs0YZrNo4pXD0Yora8wce70EEYAKfvzX5Xd4lGaA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2901571AbgJ0OY4 (ORCPT ); Tue, 27 Oct 2020 10:24:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:50162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S368262AbgJ0OYw (ORCPT ); Tue, 27 Oct 2020 10:24:52 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19CCF2072D; Tue, 27 Oct 2020 14:24:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808691; bh=1diVp1sB2I4qUJjDbncH+lW9A6j4P6IQUwpl1HIzML8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lv1b+QuF0stjdndm/cfx2Z6orS8SS5Z07UL1UtmQw2P0ojy1UxtxG02mRjFnb/zZ6 Y6AV+SoEeg2diMUNl5JR3Qmj05jowZndpQFWLv8CzmMPIYl1MhFoX97Q2lN35jAWwO HIQsc6r4nqpp0kb9cupXjbNIQkuc3ZRpSZoIIEu0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Hoo , Jim Mattson , Paolo Bonzini , Sasha Levin Subject: [PATCH 4.19 188/264] KVM: x86: emulating RDPID failure shall return #UD rather than #GP Date: Tue, 27 Oct 2020 14:54:06 +0100 Message-Id: <20201027135439.486615063@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Robert Hoo [ Upstream commit a9e2e0ae686094571378c72d8146b5a1a92d0652 ] 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: fb6d4d340e ("KVM: x86: emulate RDPID") Signed-off-by: Robert Hoo Message-Id: <1598581422-76264-1-git-send-email-robert.hu@linux.intel.com> Reviewed-by: Jim Mattson Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 210eabd71ab23..670c2aedcefab 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3561,7 +3561,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; } -- 2.25.1