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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 ECF62ECE58C for ; Wed, 9 Oct 2019 17:31:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C44F6218AC for ; Wed, 9 Oct 2019 17:31:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570642292; bh=hwjiPPOo2K3sUN/XgOVRlgCmz1oVu8eixNpFgdwRK/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FUT+LhppG32UMjDA3zBSmhRJdrBm69tDUaVxCN6+Omv5l+Eqdualufoa3iGJFtjDg VrOcukSdMiPFF/LnaH6rlZH0xLN6clJ5nCQvu39hTKbM/6fltMM7K6p/KwrrKAljYd XgN3ln3VdQalMEALKvS/CXbPsNtsyKso0GHN02Yw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732544AbfJIRbV (ORCPT ); Wed, 9 Oct 2019 13:31:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:48018 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732078AbfJIRYB (ORCPT ); Wed, 9 Oct 2019 13:24:01 -0400 Received: from sasha-vm.mshome.net (unknown [167.220.2.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D938421D82; Wed, 9 Oct 2019 17:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570641841; bh=hwjiPPOo2K3sUN/XgOVRlgCmz1oVu8eixNpFgdwRK/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mn06O9Gk+QjOG7NGJfcK0LHb7VeqdHP69crpXn3utoOYNS/6Ipx/YnXlwFX+lMdPu y4gmqcMSnmm7dQoZoPhNNXJpdFUm1TymxmqD1EqiAVOuHXaTd5fEFKZ7dbMbOfpVxD KGYOsMpYkt5TT7cK0IQ0OStQDlRQBekmDNhaNlXU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jim Mattson , Marc Orr , Peter Shier , Jacob Xu , Sean Christopherson , Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 27/68] kvm: x86: Use AMD CPUID semantics for AMD vCPUs Date: Wed, 9 Oct 2019 13:05:06 -0400 Message-Id: <20191009170547.32204-27-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009170547.32204-1-sashal@kernel.org> References: <20191009170547.32204-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jim Mattson [ Upstream commit 5f41a37b151f6459e0b650a2f4d1d59b6c02d1ab ] When the guest CPUID information represents an AMD vCPU, return all zeroes for queries of undefined CPUID leaves, whether or not they are in range. Signed-off-by: Jim Mattson Fixes: bd22f5cfcfe8f6 ("KVM: move and fix substitue search for missing CPUID entries") Reviewed-by: Marc Orr Reviewed-by: Peter Shier Reviewed-by: Jacob Xu Cc: Sean Christopherson Cc: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/cpuid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index a8a46e0b3d13b..fd1b8db8bf242 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -987,9 +987,11 @@ bool kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, /* * Intel CPUID semantics treats any query for an out-of-range * leaf as if the highest basic leaf (i.e. CPUID.0H:EAX) were - * requested. + * requested. AMD CPUID semantics returns all zeroes for any + * undefined leaf, whether or not the leaf is in range. */ - if (!entry && check_limit && !cpuid_function_in_range(vcpu, function)) { + if (!entry && check_limit && !guest_cpuid_is_amd(vcpu) && + !cpuid_function_in_range(vcpu, function)) { max = kvm_find_cpuid_entry(vcpu, 0, 0); if (max) { function = max->eax; -- 2.20.1