From patchwork Thu Nov 16 19:15:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 10062005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE82760230 for ; Thu, 16 Nov 2017 19:18:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF30528971 for ; Thu, 16 Nov 2017 19:18:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3DE22A5EF; Thu, 16 Nov 2017 19:18:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD4D928971 for ; Thu, 16 Nov 2017 19:18:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eFPdT-0004tQ-FM; Thu, 16 Nov 2017 19:15:39 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eFPdS-0004tK-8K for xen-devel@lists.xen.org; Thu, 16 Nov 2017 19:15:38 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id 22/01-04165-9D3ED0A5; Thu, 16 Nov 2017 19:15:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsXitHSDve7Nx7x RBt+2slss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBn/N09hK7jDXdFxdgFzA+M/ji5GTg4JAX+J zRses4LYbAL6ErtffGICsUUE1CVOd1wEinNxMAscZZJ4NOclC0hCWCBE4svRD2wgNouAqsSxp ZuBGjg4eAU8JXo6gyBmykmcP/6TGcQWElCTuNZ/iR3E5hUQlDg58wnYGGYBCYmDL14wT2Dkno UkNQtJagEj0ypG9eLUorLUIl0zvaSizPSMktzEzBxdQwMzvdzU4uLE9NScxKRiveT83E2MwFB gAIIdjPNO+B9ilORgUhLljTjKGyXEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgvfiI6CcYFFqempF WmYOMChh0hIcPEoivPNB0rzFBYm5xZnpEKlTjMYcz2a+bmDmmHa1tYlZiCUvPy9VSpyXAxjuQ gIgpRmleXCDYNFyiVFWSpiXEeg0IZ6C1KLczBJU+VeM4hyMSsK8k0AW8mTmlcDtewV0ChPQKT Y3uEFOKUlESEk1MFrlJnR/aEm49+GWaIb96sK9Bx6mVImlSh9vypj2LEfabb9l3WZ+i6uVE3W ObVurnLkrpHb+2bqf6secDiod+l4kpLxcJqI+bqHntK3LpqxaXVeT0sA+Z03wFNk1eYGbww0c 53LpKoTlL9ixI+KdvpGYYKXzxrxWnYhEi6nbl7xRK5xU19Z2RYmlOCPRUIu5qDgRACqAEreRA gAA X-Env-Sender: prvs=486f94740=Andrew.Cooper3@citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1510859734!63992944!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44053 invoked from network); 16 Nov 2017 19:15:36 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 16 Nov 2017 19:15:36 -0000 X-IronPort-AV: E=Sophos;i="5.44,405,1505779200"; d="scan'208";a="459693038" From: Andrew Cooper To: Xen-devel Date: Thu, 16 Nov 2017 19:15:32 +0000 Message-ID: <1510859732-17588-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Kevin Tian , Wei Liu , Jan Beulich , Andrew Cooper , Julien Grall , Jun Nakajima , Boris Ostrovsky , Suravee Suthikulpanit Subject: [Xen-devel] [PATCH for-4.10] x86/hvm: Don't ignore unknown MSRs in the migration stream X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Doing so amounts to silent state corruption, and must be avoided. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu --- CC: Jan Beulich CC: Wei Liu CC: Jun Nakajima CC: Kevin Tian CC: Boris Ostrovsky CC: Suravee Suthikulpanit CC: Julien Grall This wants backporting to all stable trees, so should also be considered for inclusion into 4.10 at this point. --- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b9cf423..7b0e688 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -450,7 +450,7 @@ static int svm_load_msr(struct vcpu *v, struct hvm_msr *ctxt) break; default: - continue; + err = -ENXIO; } if ( err ) break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b18ccea..fdb65a5 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -954,8 +954,9 @@ static int vmx_load_msr(struct vcpu *v, struct hvm_msr *ctxt) else err = -ENXIO; break; + default: - continue; + err = -ENXIO; } if ( err ) break;