From patchwork Fri Oct 26 07:59:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Orr X-Patchwork-Id: 10657051 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2077214BD for ; Fri, 26 Oct 2018 07:59:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1485D2BD78 for ; Fri, 26 Oct 2018 07:59:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08E5D2BDBB; Fri, 26 Oct 2018 07:59:19 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C2612BD78 for ; Fri, 26 Oct 2018 07:59:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 249D96B02D6; Fri, 26 Oct 2018 03:59:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1FAEA6B02D8; Fri, 26 Oct 2018 03:59:17 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 112F76B02D9; Fri, 26 Oct 2018 03:59:17 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id C89196B02D6 for ; Fri, 26 Oct 2018 03:59:16 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id k25-v6so171097pff.15 for ; Fri, 26 Oct 2018 00:59:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=37hMVlXqW6DIbVYja1xxGFc0YV3pHTaQ3q8Kf+MbFeM=; b=f4bd/JBjPGfnEY99Tt3cK0qmGN8WYlpTKiRHU/K4p+GiDYaKji348N1gqzVTnwsBs+ V9Ny4abeaU2kO/duMPXVex6ZPdc+RzHSRNZPPHNQOLG/On2gWrc50m0w9x1UgB4fpXsx ijN9T6LK0b+fFKJzf+Vab6hEeMlkstkwga8twVClnWGSuu0khl0Co8xfv4cr/NFs93oK 4Q8ne4cTDo7kAUcbkoGp/KLa3gWEClFfLTSX5vxApyrYLkgdMu8f2wfHqH1iHcdVupvd Qgnd54y4hX8B9spnkToXM+BljUkZ3dRl7HA3hY60+6YEMTvcst9ZeEmBbErikl7Edkn8 97Fw== X-Gm-Message-State: AGRZ1gIvNUFp0AZTLwShP218wy4vceglyjEQP7kQPZz4rMzt/5Jo043/ 8/AhrF1YV91JXM6ha/EBsGb1V4zoXRgwXKkSbC+9qmaFDhChqxJ++8ffqqwIOrIbNVez0mXuEAh WkZxsGGJILkSTkRWme3uy9jofEwfayjBpfM96LzjhoGaIPkEK1grlUU9OT75waEaKcR+kP5WOy4 wKRkYVas/hEcE9eiH3L0ClcyRQgYEK/0ALMI16Y/sonUwmEFVWFxjauCv2IDJSRQxnmLNtXUHuj hS+0Kjs2WclJRXInTqLlccbfzvjnQYDu1/ryrPPnZDndJvmErQiuFh8otUJbuPSkVsSN4IFaxnU UFjZeqMNkuT0uLEmiaVT8NWDzEE+7rNJauVuv+2IqjSyYU1CIcQaIdGD1H79KBAObkgTaYY4RQ8 a X-Received: by 2002:a63:31d0:: with SMTP id x199mr2486071pgx.10.1540540756477; Fri, 26 Oct 2018 00:59:16 -0700 (PDT) X-Received: by 2002:a63:31d0:: with SMTP id x199mr2486026pgx.10.1540540755411; Fri, 26 Oct 2018 00:59:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540540755; cv=none; d=google.com; s=arc-20160816; b=PmB+m5YhIzHQMMVkSQnmYAuAqutyKc7/3mj/3nQs/BX3jpl1lSD+SafAU+1fxKRhkR cYEuytojNP0jcvIWgLoXFbEnki/QqFLa+tzB56xp8ktWy/SuTVqpni5Dv7VUIpgtyCPs pMJKRHyCUnLLEXjX04SYhYQYxoqnP8IiKlAYLdQqNC6aaWCxo9SVZ7870Ju5fXN4tm9/ XB5xMSs+YW3nrFJmxe5SUt/pzeVm3w0wOy+R9O/OSpU5cGv7v9k/XkDYiBjagAmhP3WE 2P/lD17l9EsGZ3ExWZV41JigdR7CQV9apLsomFpxvY/NOCJHOoFU0nh1QaQCDKs9dh1v M+RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=37hMVlXqW6DIbVYja1xxGFc0YV3pHTaQ3q8Kf+MbFeM=; b=XwVujIkq/E7HogPZsSD3T5Vv4Ot6Am8zTAicWHjvV+UtlT3Hoir+E7YkYOC/3pzvqJ LEThFGZiCPlJvsywDeUkoSCLkAzMoH4vgQCEu9OLM7FYL7uw0kbQkhP9+L4dfl7Sa7iZ cd6rJx7YWZgwkVbeMxuOpbt7ufFM9t5C+6KznKQJQwsUyRiTGtAuhzVUIrbw6FqNwjtY ASDepzQ30kuPRbqJr2Wfr7IcL0KvYM1Be/Nqk1LkVZSlRxLfScLqnRcQRkTUHfh4Etjj qxDn1VFfUdj8NSUxrr2ujOe58tnz88oYV/lLT76bNwNTuSBqVj9fUdUUBewk/C1CBabL AH/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Kg1mM6jq; spf=pass (google.com: domain of 3usnswwckcbu7vcx9cc19916z.x97638fi-775gvx5.9c1@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3UsnSWwcKCBU7vCx9CC19916z.x97638FI-775Gvx5.9C1@flex--marcorr.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id x8-v6sor10034570pgp.61.2018.10.26.00.59.15 for (Google Transport Security); Fri, 26 Oct 2018 00:59:15 -0700 (PDT) Received-SPF: pass (google.com: domain of 3usnswwckcbu7vcx9cc19916z.x97638fi-775gvx5.9c1@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Kg1mM6jq; spf=pass (google.com: domain of 3usnswwckcbu7vcx9cc19916z.x97638fi-775gvx5.9c1@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3UsnSWwcKCBU7vCx9CC19916z.x97638FI-775Gvx5.9C1@flex--marcorr.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=37hMVlXqW6DIbVYja1xxGFc0YV3pHTaQ3q8Kf+MbFeM=; b=Kg1mM6jqDfF6ElHilPnWbAyXD9bC2H3Jea5p39scqd4zjw0/a123tuHbYLJoIhSCe0 NumBeTRVBlVxTIhv1EJqmwiXeJKlXaPJmlNHsrl+vwXTr3LYUMrXLEV6hityGRs8LLF3 EqH7dyFqzCDrpAy27tqIWRw8qPVWEccyciJZiL3bfFkpVNtz95ZIuG6fZF9X8p0R4pLi lCMkDW0gLCaNVwTGt+rRRKmbUROHChqifNGAVu+eM8Gt+NEK/1GahTSxhJ1dOcT5edkv Pt8mUGjFVOY66bU3uL9QLdwuVTiwyYEdbR7V6AUfENDNCTWe8fldgq8oG9SbIZFurtL+ uusg== X-Google-Smtp-Source: AJdET5c4V1uisTHbPbBisk1jNojGJzukYUXU377FQqmUUgOYdAsJl3hVDzRw8+E9Peju5sSIG8lvwbqMNH4F X-Received: by 2002:a63:c40e:: with SMTP id h14-v6mr1295377pgd.53.1540540754989; Fri, 26 Oct 2018 00:59:14 -0700 (PDT) Date: Fri, 26 Oct 2018 00:59:00 -0700 In-Reply-To: <20181026075900.111462-1-marcorr@google.com> Message-Id: <20181026075900.111462-3-marcorr@google.com> Mime-Version: 1.0 References: <20181026075900.111462-1-marcorr@google.com> X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [kvm PATCH v4 2/2] kvm: vmx: use vmalloc() to allocate vcpus From: Marc Orr To: kvm@vger.kernel.org, jmattson@google.com, rientjes@google.com, konrad.wilk@oracle.com, linux-mm@kvack.org, akpm@linux-foundation.org, pbonzini@redhat.com, rkrcmar@redhat.com, willy@infradead.org, sean.j.christopherson@intel.com Cc: Marc Orr X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Previously, vcpus were allocated through the kmem_cache_zalloc() API, which requires the underlying physical memory to be contiguous. Because the x86 vcpu struct, struct vcpu_vmx, is relatively large (e.g., currently 47680 bytes on my setup), it can become hard to find contiguous memory. At the same time, the comments in the code indicate that the primary reason for using the kmem_cache_zalloc() API is to align the memory rather than to provide physical contiguity. Thus, this patch updates the vcpu allocation logic for vmx to use the vmalloc() API. Signed-off-by: Marc Orr --- arch/x86/kvm/vmx.c | 37 ++++++++++++++++++++++++++++++------- virt/kvm/kvm_main.c | 28 ++++++++++++++++------------ 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 3c0303cc101d..8eef21656f60 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -898,7 +898,14 @@ struct nested_vmx { #define POSTED_INTR_ON 0 #define POSTED_INTR_SN 1 -/* Posted-Interrupt Descriptor */ +/* + * Posted-Interrupt Descriptor + * + * Note, the physical address of this structure is used by VMX. Furthermore, the + * translation code assumes that the entire pi_desc struct resides within a + * single page, which will be true because the struct is 64 bytes and 64-byte + * aligned. + */ struct pi_desc { u32 pir[8]; /* Posted interrupt requested */ union { @@ -6633,6 +6640,14 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx) } if (kvm_vcpu_apicv_active(&vmx->vcpu)) { + /* + * Note, pi_desc is contained within a single + * page because the struct is 64 bytes and 64-byte aligned. + */ + phys_addr_t pi_desc_phys = + page_to_phys(vmalloc_to_page(&vmx->pi_desc)) + + (u64)&vmx->pi_desc % PAGE_SIZE; + vmcs_write64(EOI_EXIT_BITMAP0, 0); vmcs_write64(EOI_EXIT_BITMAP1, 0); vmcs_write64(EOI_EXIT_BITMAP2, 0); @@ -6641,7 +6656,7 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx) vmcs_write16(GUEST_INTR_STATUS, 0); vmcs_write16(POSTED_INTR_NV, POSTED_INTR_VECTOR); - vmcs_write64(POSTED_INTR_DESC_ADDR, __pa((&vmx->pi_desc))); + vmcs_write64(POSTED_INTR_DESC_ADDR, pi_desc_phys); } if (!kvm_pause_in_guest(vmx->vcpu.kvm)) { @@ -11493,13 +11508,18 @@ static void vmx_free_vcpu(struct kvm_vcpu *vcpu) free_loaded_vmcs(vmx->loaded_vmcs); kfree(vmx->guest_msrs); kvm_vcpu_uninit(vcpu); - kmem_cache_free(kvm_vcpu_cache, vmx); + kmem_cache_free(vmx_msr_entry_cache, vmx->msr_autoload.guest.val); + kmem_cache_free(vmx_msr_entry_cache, vmx->msr_autoload.host.val); + vfree(vmx); } static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) { int err; - struct vcpu_vmx *vmx = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); + struct vcpu_vmx *vmx = + __vmalloc(sizeof(struct vcpu_vmx), + GFP_KERNEL | __GFP_ZERO | __GFP_ACCOUNT, + PAGE_KERNEL); unsigned long *msr_bitmap; int cpu; @@ -11610,7 +11630,7 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) free_msr_autoload_guest: kmem_cache_free(vmx_msr_entry_cache, vmx->msr_autoload.guest.val); free_vmx: - kmem_cache_free(kvm_vcpu_cache, vmx); + vfree(vmx); return ERR_PTR(err); } @@ -15221,8 +15241,11 @@ static int __init vmx_init(void) } #endif - r = kvm_init(&vmx_x86_ops, sizeof(struct vcpu_vmx), - __alignof__(struct vcpu_vmx), THIS_MODULE); + /* + * Disable kmem cache; vmalloc will be used instead + * to avoid OOM'ing when memory is available but not contiguous. + */ + r = kvm_init(&vmx_x86_ops, 0, 0, THIS_MODULE); if (r) return r; /* diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 786ade1843a2..8b979e7c3ecd 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4038,18 +4038,22 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, goto out_free_2; register_reboot_notifier(&kvm_reboot_notifier); - /* A kmem cache lets us meet the alignment requirements of fx_save. */ - if (!vcpu_align) - vcpu_align = __alignof__(struct kvm_vcpu); - kvm_vcpu_cache = - kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, - SLAB_ACCOUNT, - offsetof(struct kvm_vcpu, arch), - sizeof_field(struct kvm_vcpu, arch), - NULL); - if (!kvm_vcpu_cache) { - r = -ENOMEM; - goto out_free_3; + /* + * When vcpu_size is zero, + * architecture-specific code manages its own vcpu allocation. + */ + kvm_vcpu_cache = NULL; + if (vcpu_size) { + if (!vcpu_align) + vcpu_align = __alignof__(struct kvm_vcpu); + kvm_vcpu_cache = kmem_cache_create_usercopy( + "kvm_vcpu", vcpu_size, vcpu_align, SLAB_ACCOUNT, + offsetof(struct kvm_vcpu, arch), + sizeof_field(struct kvm_vcpu, arch), NULL); + if (!kvm_vcpu_cache) { + r = -ENOMEM; + goto out_free_3; + } } r = kvm_async_pf_init();