From patchwork Wed Oct 24 08:34:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Orr X-Patchwork-Id: 10654393 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 02DA617E2 for ; Wed, 24 Oct 2018 08:34:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2D732A310 for ; Wed, 24 Oct 2018 08:34:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D636E2A461; Wed, 24 Oct 2018 08:34:45 +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 21F8F2A3D4 for ; Wed, 24 Oct 2018 08:34:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23EEE6B026F; Wed, 24 Oct 2018 04:34:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1C79D6B0270; Wed, 24 Oct 2018 04:34:44 -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 0666A6B0271; Wed, 24 Oct 2018 04:34:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by kanga.kvack.org (Postfix) with ESMTP id C15F56B026F for ; Wed, 24 Oct 2018 04:34:43 -0400 (EDT) Received: by mail-yb1-f200.google.com with SMTP id 186-v6so2621958ybt.9 for ; Wed, 24 Oct 2018 01:34:43 -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:message-id:mime-version :subject:from:to:cc; bh=jY5bPiA/lwZ7nISUDxTUzBjFnU/S+1frTRl+SnOdYDQ=; b=oY5X5hUtEbmeR6aWb0lXWVEAbKK+yXq5X6eZYxB2C33UWBo9WI5Mgwh1SJZudmyf93 xYWUcHvGtABOxrwdD0fN328+FYKaE9mh7x3QarXl1bwL6NZWbDxnkup90wCacCKbeLSO sbdHWehLu0uCbQnMeJEVmk8cDuSgVQ6FC+EJTZN85K/1EC3GpEulVhNjspeAQ/sZMBAx wJmHMwWG6iBoAN2uMwfAIA1Ht6D8qLvG5X21LMhHP+rELVbKLzDcCywsuSX2zux9LQlw IikK9sYirCoL2h/DXxJte2FFLiVESVrQNjF3dblE04GtVKO56kOX6SiLCDySPxaKUViy 0/Nw== X-Gm-Message-State: AGRZ1gLCP2Gfhj6qSKZ0y+lg01TW6BxXPW4uXFbPMKNNtF6eaFN5eYJ1 Lvcj4a0XQklaLeBIi2uKvjWNbrKYmIlWh/wx3Yuzn+ZxGjf0ye8FIglMaAYF4iMWTPcUpkVfYWe L/Wff6eQX/GiJPGOx6LnrVQtOJSiJV7l5TEwtfkIyAU9LthBilVEH3wkt2LANJL/YQZAycVo/R+ 0FC/5Gr4njQ0ZDXMXchz3M6g4UPZ2hMDlsXpdy+4ErfCAG52nAnuRaI5091vwCQsWT63fXyi0tN p1JZvujD3tfpp7pUesbdeTRALrWapKG0vSntZQPIz+pG54oA+3T5ifEdJ6SXgWm3f0yrDsJGNjX 67x8cFvCLz3Ttg765V5zxSCnUeF2sNVuzZlBtgDHOSSRlstziiltmraqZZM7+dkEkOJOX2nHEFk l X-Received: by 2002:a25:ad99:: with SMTP id z25-v6mr1331553ybi.48.1540370083395; Wed, 24 Oct 2018 01:34:43 -0700 (PDT) X-Received: by 2002:a25:ad99:: with SMTP id z25-v6mr1331520ybi.48.1540370082404; Wed, 24 Oct 2018 01:34:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540370082; cv=none; d=google.com; s=arc-20160816; b=bNciYhYOPYfg2smnT6K2QofYD9FPRZwRCNRGPALKjMO+1FZVS62u9t9RxuAjHOsNE1 FYYTggt7TmCDlvT6Ryho8l/+yIVqYa0iO7l1UqhrwJIfk+rfjchlwhRCxb3YuCZEum4P O0nSHldzXM3TfrJ8HonWyoGJTg2MzfL5OKkON+0fiZYl+3E4JjLRALWj2eT8xS7vjwsV l61qoTSGVa1Wj0sj/JFP6Pi8vewVl4z5JnU5H0R9RbyQFBORM2rIjU+LJG8OyDQYBq9x W4zVglUbeGFVwKFf3pRn0WR1PIFu/tl3DMlumuGaE1GhwEh3TylQItP5qjuq8aGa1QbZ guIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:mime-version:message-id:date:dkim-signature; bh=jY5bPiA/lwZ7nISUDxTUzBjFnU/S+1frTRl+SnOdYDQ=; b=Ba/yoNBP1HYgoy7/l0H0s8C5CePDjKS/03g0td8lqJ9K0+MtEXhGZ4EmNOlJtLVdyf BPK1TiJTyBqIAY+BRO7gbRgNvAtYhWW6XMF6YotVQ09r32KgjBQV1BVH1lbZpnp9JH0X U/Bk/rQjEBr4/7oGO/P8QUWM7SLbltsT31ediRu9mOC+ymnkNKmJ/41EyRAQ9oiQKyI9 Iz8IfUvY/or76nbbURWYwbDq8Fl/Eb9GYEu6QlOaYvhvqPDf9wsE60/5c0j6PNiiSlHT YUYfMTOa+9kBAawDIpdSQcvT2yHRT2uVv4uHvTH2aU1v7rTxTHoIXwr0s5fQh6XwVij8 RHNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=GPZpfcA5; spf=pass (google.com: domain of 3oi7qwwckccunbsdpsshpphmf.dpnmjovy-nnlwbdl.psh@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3oi7QWwcKCCUNBSDPSSHPPHMF.DPNMJOVY-NNLWBDL.PSH@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 g9-v6sor1692076ybm.52.2018.10.24.01.34.42 for (Google Transport Security); Wed, 24 Oct 2018 01:34:42 -0700 (PDT) Received-SPF: pass (google.com: domain of 3oi7qwwckccunbsdpsshpphmf.dpnmjovy-nnlwbdl.psh@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=GPZpfcA5; spf=pass (google.com: domain of 3oi7qwwckccunbsdpsshpphmf.dpnmjovy-nnlwbdl.psh@flex--marcorr.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3oi7QWwcKCCUNBSDPSSHPPHMF.DPNMJOVY-NNLWBDL.PSH@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:message-id:mime-version:subject:from:to:cc; bh=jY5bPiA/lwZ7nISUDxTUzBjFnU/S+1frTRl+SnOdYDQ=; b=GPZpfcA5A8EVvQ7hQLpWYmQfoG+xfeAoTYJwvZJkATySwBm5z+bLwObd4anvKm4M1f dLXTt14wpLKdb8ZOrRHvxC5Hflq5FcnEtM8GihttVT6WxN15rI762btjIjatAzQsHYA+ avIxcKkknc2l0O1mYEpkaEEjpd/+0hxy0hdlfAulsAG4Zrja2Id5qiPNIXV9yAmCBM6E vcYL/GLLWIzPOyZw+238dQZS0csXTi95Pp78HxXeCdkImqsEUvZQ6LP5vfmWSrndYBfd /4+YEkZt71qjE78UkmgmopkKzKmqZ3OakbVIClc1YMdqhnJWJB0n9B9s+xsXWdgLFQXv Yihw== X-Google-Smtp-Source: AJdET5eb+FsGO63QDUuMKzaFvXs3zPgwtrcY5xXWqH9b2LTu1ADaBu81g0iENNTFZFCOx0oTkkBevj8GIjnA X-Received: by 2002:a25:824f:: with SMTP id d15-v6mr906759ybn.87.1540370082028; Wed, 24 Oct 2018 01:34:42 -0700 (PDT) Date: Wed, 24 Oct 2018 01:34:37 -0700 Message-Id: <20181024083437.8831-1-marcorr@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [kvm PATCH v2 1/1] 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 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. Note, this patch uses the __vmalloc_node_range() API, which is in the include/linux/vmalloc.h file. To use __vmalloc_node_range(), this patch exports the API. Signed-off-by: Marc Orr --- arch/x86/kvm/vmx.c | 98 +++++++++++++++++++++++++++++++++++++++++---- mm/vmalloc.c | 1 + virt/kvm/kvm_main.c | 28 +++++++------ 3 files changed, 107 insertions(+), 20 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index abeeb45d1c33..d480a2cc0667 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 { @@ -970,8 +977,25 @@ static inline int pi_test_sn(struct pi_desc *pi_desc) struct vmx_msrs { unsigned int nr; - struct vmx_msr_entry val[NR_AUTOLOAD_MSRS]; + struct vmx_msr_entry *val; }; +struct kmem_cache *vmx_msr_entry_cache; + +/* + * To prevent vmx_msr_entry array from crossing a page boundary, require: + * sizeof(*vmx_msrs.vmx_msr_entry.val) to be a power of two. This is guaranteed + * through compile-time asserts that: + * - NR_AUTOLOAD_MSRS * sizeof(struct vmx_msr_entry) is a power of two + * - NR_AUTOLOAD_MSRS * sizeof(struct vmx_msr_entry) <= PAGE_SIZE + * - The allocation of vmx_msrs.vmx_msr_entry.val is aligned to its size. + */ +#define CHECK_POWER_OF_TWO(val) \ + BUILD_BUG_ON_MSG(!((val) && !((val) & ((val) - 1))), \ + #val " is not a power of two.") +#define CHECK_INTRA_PAGE(val) do { \ + CHECK_POWER_OF_TWO(val); \ + BUILD_BUG_ON(!(val <= PAGE_SIZE)); \ + } while (0) struct vcpu_vmx { struct kvm_vcpu vcpu; @@ -6616,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); @@ -6624,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)) { @@ -11476,19 +11508,43 @@ 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_node_range( + sizeof(struct vcpu_vmx), + __alignof__(struct vcpu_vmx), + VMALLOC_START, + VMALLOC_END, + GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO | __GFP_ACCOUNT, + PAGE_KERNEL, + 0, + NUMA_NO_NODE, + __builtin_return_address(0)); unsigned long *msr_bitmap; int cpu; if (!vmx) return ERR_PTR(-ENOMEM); + vmx->msr_autoload.guest.val = + kmem_cache_zalloc(vmx_msr_entry_cache, GFP_KERNEL); + if (!vmx->msr_autoload.guest.val) { + err = -ENOMEM; + goto free_vmx; + } + vmx->msr_autoload.host.val = + kmem_cache_zalloc(vmx_msr_entry_cache, GFP_KERNEL); + if (!vmx->msr_autoload.host.val) { + err = -ENOMEM; + goto free_msr_autoload_guest; + } + vmx->vpid = allocate_vpid(); err = kvm_vcpu_init(&vmx->vcpu, kvm, id); @@ -11576,7 +11632,11 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) kvm_vcpu_uninit(&vmx->vcpu); free_vcpu: free_vpid(vmx->vpid); - kmem_cache_free(kvm_vcpu_cache, vmx); + kmem_cache_free(vmx_msr_entry_cache, vmx->msr_autoload.host.val); +free_msr_autoload_guest: + kmem_cache_free(vmx_msr_entry_cache, vmx->msr_autoload.guest.val); +free_vmx: + vfree(vmx); return ERR_PTR(err); } @@ -15153,6 +15213,10 @@ module_exit(vmx_exit); static int __init vmx_init(void) { int r; + size_t vmx_msr_entry_size = + sizeof(struct vmx_msr_entry) * NR_AUTOLOAD_MSRS; + + CHECK_INTRA_PAGE(vmx_msr_entry_size); #if IS_ENABLED(CONFIG_HYPERV) /* @@ -15183,10 +15247,25 @@ 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; + /* + * A vmx_msr_entry array resides exclusively within the kernel. Thus, + * use kmem_cache_create_usercopy(), with the usersize argument set to + * ZERO, to blacklist copying vmx_msr_entry to/from user space. + */ + vmx_msr_entry_cache = + kmem_cache_create_usercopy("vmx_msr_entry", vmx_msr_entry_size, + vmx_msr_entry_size, SLAB_ACCOUNT, 0, 0, NULL); + if (!vmx_msr_entry_cache) { + r = -ENOMEM; + goto out; + } /* * Must be called after kvm_init() so enable_ept is properly set @@ -15210,5 +15289,8 @@ static int __init vmx_init(void) vmx_check_vmcs12_offsets(); return 0; +out: + kvm_exit(); + return r; } module_init(vmx_init); diff --git a/mm/vmalloc.c b/mm/vmalloc.c index a728fc492557..9e7974ab1da4 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1763,6 +1763,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, "vmalloc: allocation failure: %lu bytes", real_size); return NULL; } +EXPORT_SYMBOL_GPL(__vmalloc_node_range); /** * __vmalloc_node - allocate virtually contiguous memory 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();