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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 6B0D0C282CE for ; Mon, 11 Feb 2019 15:10:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 311CC222B0 for ; Mon, 11 Feb 2019 15:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897805; bh=hX/RIscfDwmbz+sACVC6E6Xz5vIqRnHzyCWIf7AgjNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t0vX/Y8nMTOxRYB/4KUTBgfDNlSkv+adAFuxwfEIiKLQwHglo9/g+V1fsxX4yozMB lLjD+xCcgthvGAf2bJza3cIxMZfAbAowNAfaWYurL12YGdymbeAIMKKpYD8NRYZcxq KXab6Ws2XNANMAm9iSh0bq2yad1NxYWgNzV1W99Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403948AbfBKPKD (ORCPT ); Mon, 11 Feb 2019 10:10:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:60024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403805AbfBKPKB (ORCPT ); Mon, 11 Feb 2019 10:10:01 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 5C76F222A7; Mon, 11 Feb 2019 15:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897800; bh=hX/RIscfDwmbz+sACVC6E6Xz5vIqRnHzyCWIf7AgjNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IuM78x4bfQpuHIt3yWVrTla0ofvfZKbrb6rwAm9TdoRkDRmG806/HqhEJlvA2KBU3 4NIuhIo/axYu+6UmpLMTQVjW4qhnJLNlcV2nSwcSNV7TgDG8wrvv5DtfDTS9d2RF9y EC0tcL88IPXdeITDMNjFRVH+4sSupS2l38RSfg2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vitaly Kuznetsov , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Sasha Levin Subject: [PATCH 4.9 079/137] KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported Date: Mon, 11 Feb 2019 15:19:20 +0100 Message-Id: <20190211141819.324932607@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141811.964925535@linuxfoundation.org> References: <20190211141811.964925535@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit e87555e550cef4941579cd879759a7c0dee24e68 ] AMD doesn't seem to implement MSR_IA32_MCG_EXT_CTL and svm code in kvm knows nothing about it, however, this MSR is among emulated_msrs and thus returned with KVM_GET_MSR_INDEX_LIST. The consequent KVM_GET_MSRS, of course, fails. Report the MSR as unsupported to not confuse userspace. Signed-off-by: Vitaly Kuznetsov Signed-off-by: Radim Krčmář Signed-off-by: Sasha Levin --- arch/x86/kvm/svm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index fa1b0e3c8a06..c8efacf2e65f 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -5223,6 +5223,13 @@ static bool svm_cpu_has_accelerated_tpr(void) static bool svm_has_emulated_msr(int index) { + switch (index) { + case MSR_IA32_MCG_EXT_CTL: + return false; + default: + break; + } + return true; } -- 2.19.1