From patchwork Wed Nov 30 20:03:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9454789 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 5D04B60756 for ; Wed, 30 Nov 2016 20:04:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 505812849F for ; Wed, 30 Nov 2016 20:04:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4559B284A3; Wed, 30 Nov 2016 20:04:57 +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 1F835284A4 for ; Wed, 30 Nov 2016 20:04:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757934AbcK3UEs (ORCPT ); Wed, 30 Nov 2016 15:04:48 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:35837 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757996AbcK3UEk (ORCPT ); Wed, 30 Nov 2016 15:04:40 -0500 Received: by mail-pf0-f181.google.com with SMTP id i88so40682861pfk.2 for ; Wed, 30 Nov 2016 12:04:40 -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=sRifVLvhKSngIDzP3/6vd4GoJmVi6l7Zn52KwBynUlw=; b=NYV9a95T/MMbXZP+cciGo7atHYXVOGam6fM3RlB8/86LjErdMgtHMj4NyVzeKVNtHR JVJgO+uZBkLlnjAZQZV/mUU03QfTkI5vplj0qzADOR96jcgFksTTS8GRn5pDo/++/Ekr MOaND7NnSninkKDEdLRNqeilkDDX0/0zjhN116pbVhkUnO98EfNnGLslLY3lLAGVpUPD LCMvjrODuytPqmV+UdL/O0yJISkXh0YK3zdVQaxBzfr8GbqcJTzdj524z0Lz26xOQOXE H2IhXY1dO0AembcSQ9SsIztpcJep8Zif8NgLEUjicARoSlP+JUYKvfym9j8+8Y5DIHe9 62rg== 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=sRifVLvhKSngIDzP3/6vd4GoJmVi6l7Zn52KwBynUlw=; b=b91Ya9pE84WxqTWfMkdFaFxrwybqNeSV6cOseiDmij/ikQaMtTnBfiMsxofQ1IJ4pW i61g5OWLXh6zi4uIlwBUhmmZ53pfQAU5Om2KWTG8gsVm2zU4YIFafeqpWrxtV3XGcnbQ mPO2Ev0exN5rlTj8cRcBRILchKvuMsLCmIvDqZZfzu1JYmqFnI5PvN5Q77x/11PkudDK OHU2EPzyMgE9ovgUq8ubhvc/m5D3UEV+qoyQpulvwj0iJyoY+1ZVy+J0Rm70bV6p64Zs MwQHrOgknmIzBF7DlwjAiXdx1sVB4P256RhSMC0kVc5jzCZl+nhGWwH+vjWXj3JHxfnY 4XGQ== X-Gm-Message-State: AKaTC03WCrL6TQGOt3XGYy1na/97bKmlc66qUe13G/bQCy4/PhupG4+Vtia3nocBF1/GiQdN X-Received: by 10.99.160.1 with SMTP id r1mr61975469pge.107.1480536279705; Wed, 30 Nov 2016 12:04:39 -0800 (PST) Received: from jmattson.sea.corp.google.com ([100.100.206.154]) by smtp.gmail.com with ESMTPSA id w24sm104811079pfa.9.2016.11.30.12.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Nov 2016 12:04:38 -0800 (PST) From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson Subject: [PATCH 3/8] kvm: nVMX: Refactor handle_vmptrld() Date: Wed, 30 Nov 2016 12:03:44 -0800 Message-Id: <1480536229-11754-4-git-send-email-jmattson@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1480536229-11754-1-git-send-email-jmattson@google.com> References: <1480536229-11754-1-git-send-email-jmattson@google.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Handle_vmptrld is split into two parts: the part that handles the VMPTRLD instruction, and the part that establishes the current VMCS pointer. The latter will be used when restoring the checkpointed state of a vCPU that had a valid VMCS pointer when a snapshot was taken. Signed-off-by: Jim Mattson --- arch/x86/kvm/vmx.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 0169120..14c3529 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -7534,6 +7534,18 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu) return 1; } +static void set_current_vmptr(struct vcpu_vmx *vmx, gpa_t vmptr) +{ + vmx->nested.current_vmptr = vmptr; + if (enable_shadow_vmcs) { + vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL, + SECONDARY_EXEC_SHADOW_VMCS); + vmcs_write64(VMCS_LINK_POINTER, + __pa(vmx->vmcs01.shadow_vmcs)); + vmx->nested.sync_shadow_vmcs = true; + } +} + /* Emulate the VMPTRLD instruction */ static int handle_vmptrld(struct kvm_vcpu *vcpu) { @@ -7566,7 +7578,6 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) } nested_release_vmcs12(vmx); - vmx->nested.current_vmptr = vmptr; vmx->nested.current_vmcs12 = new_vmcs12; vmx->nested.current_vmcs12_page = page; /* @@ -7575,14 +7586,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) */ memcpy(vmx->nested.cached_vmcs12, vmx->nested.current_vmcs12, VMCS12_SIZE); - - if (enable_shadow_vmcs) { - vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL, - SECONDARY_EXEC_SHADOW_VMCS); - vmcs_write64(VMCS_LINK_POINTER, - __pa(vmx->vmcs01.shadow_vmcs)); - vmx->nested.sync_shadow_vmcs = true; - } + set_current_vmptr(vmx, vmptr); } nested_vmx_succeed(vcpu);