From patchwork Fri Jan 26 22:51:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10187147 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 086EA60383 for ; Fri, 26 Jan 2018 22:52:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECBB02A8D7 for ; Fri, 26 Jan 2018 22:52:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0CBE2A8DA; Fri, 26 Jan 2018 22:52:33 +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_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 C8C022A8D7 for ; Fri, 26 Jan 2018 22:52:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752340AbeAZWwB (ORCPT ); Fri, 26 Jan 2018 17:52:01 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34440 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752151AbeAZWv7 (ORCPT ); Fri, 26 Jan 2018 17:51:59 -0500 Received: by mail-wm0-f65.google.com with SMTP id j21so28424386wmh.1; Fri, 26 Jan 2018 14:51:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jJw5HmCybwe8H8+Es0M6nBXOzB4f8OfITvWnJaN4nI8=; b=bPyvojagFFt3wCd+4oarVyYrOjd7P8NG0V+gLwO+5Sjltcz9Vm4b7s/nZeirbh6I4z Fps0adJqTPTkbXu9hMmqDboX5HNFuZD1KFePOCJu5HMnUToOko37ZCRtjoQrYpu4cQdO PmvDm+zPlj4Ebbzlp0vjr7rtHAWIm9jJHeJ40ureLiP8KpDlam4S0AGXjUIronqGfJyD 55idoxjY8H3rvE3LRblSycED+xWfwQ/UDIjj2B1+PmpfWjHjn73zAllwgYz2gxak9hqb Xbt/pzYGXXth2i2njh79Fi8RGO5hMrDbo8DJMeE5dB7S4D0Ax+x/TooEERKms3aWOxpL uEEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=jJw5HmCybwe8H8+Es0M6nBXOzB4f8OfITvWnJaN4nI8=; b=rFHGhNCOelmrXiTwlLBdMn/RTchcMbXd9eGOaGz/zjTo99xGBOhB3rP6RNyP0Hp65t B5d6+mHS+1CsxzlqYIG5iFk4cvezkljhTcg++hVh5oB1oULN2R6tDXKXwGULhM4nDIYn zuKPY8ITIBFgX7APJtBuhOuw8AF0bNp7IwRKxRNuQjpFiyGfy8twPQH+8D69rtRtUTub ypOfvlpmS/HPrfHQMXXo/2KsdvgUmPr1Z+HAXPnE1SxlMpKxXbsy/Oj7x4VWp4i66lAy ucGmVdfDy2vbTtmD9ezOtoflRlWEZO3GAMu/6uSdYV+oH4Ji6jMdDHRYot/1c4zo9MQn VCdQ== X-Gm-Message-State: AKwxytd1ohuNTiyPDRBxuzKd6lzQdwhU4iM7dKE5dQod+vMSbbtbDK04 DpvzBbK3q1JQmP+Wl/UquUD9j1TM X-Google-Smtp-Source: AH8x226OZsXpEZN+0oR+GQfvZU8v+xpfeMGiC3FTUSmutjaZAzqDE4eYASeW+V+ipuN9S/U9Vgv2gA== X-Received: by 10.28.182.86 with SMTP id g83mr11744324wmf.75.1517007117295; Fri, 26 Jan 2018 14:51:57 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-230-124.clienti.tiscali.it. [78.12.230.124]) by smtp.gmail.com with ESMTPSA id 63sm6695101wms.46.2018.01.26.14.51.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 14:51:56 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , David Woodhouse , KarimAllah Ahmed Subject: [PATCH 2/3] KVM: VMX: introduce alloc_loaded_vmcs Date: Fri, 26 Jan 2018 23:51:50 +0100 Message-Id: <1517007111-13659-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517007111-13659-1-git-send-email-pbonzini@redhat.com> References: <1517007111-13659-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Group together the calls to alloc_vmcs and loaded_vmcs_init. Soon we'll also allocate an MSR bitmap there. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index ad6a883b7a32..ab4b9bc99a52 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3829,11 +3829,6 @@ static struct vmcs *alloc_vmcs_cpu(int cpu) return vmcs; } -static struct vmcs *alloc_vmcs(void) -{ - return alloc_vmcs_cpu(raw_smp_processor_id()); -} - static void free_vmcs(struct vmcs *vmcs) { free_pages((unsigned long)vmcs, vmcs_config.order); @@ -3852,6 +3847,22 @@ static void free_loaded_vmcs(struct loaded_vmcs *loaded_vmcs) WARN_ON(loaded_vmcs->shadow_vmcs != NULL); } +static struct vmcs *alloc_vmcs(void) +{ + return alloc_vmcs_cpu(raw_smp_processor_id()); +} + +static int alloc_loaded_vmcs(struct loaded_vmcs *loaded_vmcs) +{ + loaded_vmcs->vmcs = alloc_vmcs(); + if (!loaded_vmcs->vmcs) + return -ENOMEM; + + loaded_vmcs->shadow_vmcs = NULL; + loaded_vmcs_init(loaded_vmcs); + return 0; +} + static void free_kvm_area(void) { int cpu; @@ -7145,12 +7156,11 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); struct vmcs *shadow_vmcs; + int r; - vmx->nested.vmcs02.vmcs = alloc_vmcs(); - vmx->nested.vmcs02.shadow_vmcs = NULL; - if (!vmx->nested.vmcs02.vmcs) + r = alloc_loaded_vmcs(&vmx->nested.vmcs02); + if (r < 0) goto out_vmcs02; - loaded_vmcs_init(&vmx->nested.vmcs02); if (cpu_has_vmx_msr_bitmap()) { vmx->nested.msr_bitmap = @@ -9545,13 +9555,11 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) if (!vmx->guest_msrs) goto free_pml; - vmx->loaded_vmcs = &vmx->vmcs01; - vmx->loaded_vmcs->vmcs = alloc_vmcs(); - vmx->loaded_vmcs->shadow_vmcs = NULL; - if (!vmx->loaded_vmcs->vmcs) + err = alloc_loaded_vmcs(&vmx->vmcs01); + if (err < 0) goto free_msrs; - loaded_vmcs_init(vmx->loaded_vmcs); + vmx->loaded_vmcs = &vmx->vmcs01; cpu = get_cpu(); vmx_vcpu_load(&vmx->vcpu, cpu); vmx->vcpu.cpu = cpu;