From patchwork Wed Nov 30 18:28:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9454703 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 E79E560235 for ; Wed, 30 Nov 2016 18:29:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A832846E for ; Wed, 30 Nov 2016 18:29:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D54E028493; Wed, 30 Nov 2016 18:29:06 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E52C2846E for ; Wed, 30 Nov 2016 18:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755513AbcK3S25 (ORCPT ); Wed, 30 Nov 2016 13:28:57 -0500 Received: from mail-pf0-f172.google.com ([209.85.192.172]:36533 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757409AbcK3S2u (ORCPT ); Wed, 30 Nov 2016 13:28:50 -0500 Received: by mail-pf0-f172.google.com with SMTP id 189so40448137pfz.3 for ; Wed, 30 Nov 2016 10:28:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NLR0kChOCMClnU3S2jskQ2A4eUdHzbaH/w2kFi05h8U=; b=Qnv2meLV3gqP7UJEjMtYu6oVM5aeEGAvPzFMDh+2RtAnIeWqM+Fuy6gAaYGq1qBjGk e5JiI0Zxt4yStDruL9yjrlxEzka8C3VzEyseAoM24kOC387BQur0cGB7Cz+fBxzRTwP0 xLOVPuPVj/mphnlnQGUC2H82zh2RacSxKqRjRQtdKfNYO6Z0IzDUrRYsuh4WQWqxr6Gp VHIKaleMHUFD/7CXXEPRSYgHAciPRP/n9Ov42Yzgev6liM+29HknTSNWi0WOBIhTAwhN C082VEZMJRTxJ+BE3EWEGIxhYX5jq0RVxGCLcIheSmQvFwI+n+dqMjHk4dNRPCAOLtal rYrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NLR0kChOCMClnU3S2jskQ2A4eUdHzbaH/w2kFi05h8U=; b=EiBlzHQ5DJUuO0kA1THthQFGVlJHxTCPLfojCC0ZViSxjFwBcxC1ndf+N5Bt8zKTyK jVGwl5Fi/cUeO5ZycFJT5KH18B01zV6RFsbLoCkxbSqoRClXVms1w2NA9/C2LYgm6uxd mgbZYI20UqC1IZ3RbC+DD4qC2JB8Bn2H+ukjAW6oFSr0p5alVB9WN3IMNa9Xqy1dHA0u kbECIZO9nM9UGp6o1MhGkA85fk5mC++sluCzEp5NWOmH6ELprdEQbR4WYO/nnYVWAfKc ra0t4Rp+pEymWO3TnCpWU5JWoXWabiB/a9DTm6K/BEUwMbIxYVQlwzAjfSeWXrZ5xWXn 49Hg== X-Gm-Message-State: AKaTC011fo3W1TeAe+/JC1UpCtEhN0BMZPHWwh4t1RZz7MwNlg9ygCZbWmrr3QpU+j9sgElo X-Received: by 10.99.222.85 with SMTP id y21mr61876130pgi.119.1480530529850; Wed, 30 Nov 2016 10:28:49 -0800 (PST) Received: from jmattson.sea.corp.google.com ([100.100.206.154]) by smtp.gmail.com with ESMTPSA id 74sm86838284pge.2.2016.11.30.10.28.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Nov 2016 10:28:49 -0800 (PST) From: Jim Mattson To: kvm@vger.kernel.org Cc: GanShun , Jim Mattson Subject: [PATCH v2] kvm: nVMX: Correct a VMX instruction error code for VMPTRLD Date: Wed, 30 Nov 2016 10:28:19 -0800 Message-Id: <1480530499-19098-1-git-send-email-jmattson@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: GanShun When the operand passed to VMPTRLD matches the address of the VMXON region, the VMX instruction error code should be VMXERR_VMPTRLD_VMXON_POINTER rather than VMXERR_VMCLEAR_VMXON_POINTER. Signed-off-by: Jim Mattson Reviewed-by: David Hildenbrand Signed-off-by: GanShun --- arch/x86/kvm/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 0c4cde8..a1c7a43 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6960,7 +6960,7 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, if (vmptr == vmx->nested.vmxon_ptr) { nested_vmx_failValid(vcpu, - VMXERR_VMCLEAR_VMXON_POINTER); + VMXERR_VMPTRLD_VMXON_POINTER); skip_emulated_instruction(vcpu); return 1; }