From patchwork Wed Jun 20 22:09:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 10478775 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 EA850600F6 for ; Wed, 20 Jun 2018 22:09:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCCF82883A for ; Wed, 20 Jun 2018 22:09:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1C48288BB; Wed, 20 Jun 2018 22:09:36 +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=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable 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 78FA228842 for ; Wed, 20 Jun 2018 22:09:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A2866B0006; Wed, 20 Jun 2018 18:09:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 852396B0007; Wed, 20 Jun 2018 18:09:33 -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 7412E6B0008; Wed, 20 Jun 2018 18:09:33 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 336936B0006 for ; Wed, 20 Jun 2018 18:09:33 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id g20-v6so462814pfi.2 for ; Wed, 20 Jun 2018 15:09:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=mR5HnPNMgibQtvWRnsWtuYDgNYnMab1RfT1n7aFlQOM=; b=aU0NRTBlmsgsD9AWrdMFoq6WNMfRSPMsf6un7L8ADuIyJ0KTobc45R9pw4CD+/teAE 240Qev08Z3Tua3tq4DdHgM0z5npu/SFS8i1mnD0qs7rv4jZ3OP6OALepP/M+66PPpJJq O32rCFj8QCCT2RMir9G7gh8Aliyi1C7b7wFM8eyx1YVaTVzlA98X/eHCYfPvy++1vBQM GqUVec4BaabYDAwOtZILBLHP9HaAvc5NQg0iN47gzj/40V6UEUZ0k4yEzmqBRoV0Pch9 5EKYXsSFhWujwhXABXBVrEsSLbrlZrDZlQ3OL/QXGQg1ZotCbbKuGaFbdWjVk/DqdP5P OxRQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E0mE8CFkCTJiqhuqThVwQR8W3Q4UrP2ijFp9AAYFGvDGr6aUh+U 8+7TT4EYkLQ9jEnUeApu0e4kiuWENIZp4RinhOHHF6PDR9vpB6eM9GmOMmSpqmiyFMCKkwbrJTk PG+XXpx+yXOAfzs5J1PthLvW1ivf0P6db9H7R6lj/dm7Jdmp+i/Qxz7ETyn7wsGaGcA== X-Received: by 2002:a62:18a:: with SMTP id 132-v6mr24665694pfb.62.1529532572845; Wed, 20 Jun 2018 15:09:32 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIsvFHX1ZslR3Pkwcgnk5l8gq75oYFDTPq1mWI18mQ2Os5WUMwIfCzDRVs/6VeisZDrak3z X-Received: by 2002:a62:18a:: with SMTP id 132-v6mr24665641pfb.62.1529532571985; Wed, 20 Jun 2018 15:09:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529532571; cv=none; d=google.com; s=arc-20160816; b=PUeE26hOrH6G46HPlunS6AQWNc7ZCQbiDtBRYueGFQs6lMiiHcT1hsi+DORqxIB9rY ZrhikI83A31qszNZRg5AF/6UIz6Z9ObFZIuT2MCUICRzZDHI7jX06pKLhGmm1bkyqDen VZy2h0N5AW4g3Np5iLYJ6F3huKMMPdipSyyk0gmebN5XGBAdl3Cd6Mhh4Ghll8vbki9T Q0XifViRlssuZNOJirIuvmZnkTqN0uXkgnz1/Dd8koH7dtjNZxO986c+ZMQAPN7cyIuf bmvU1BGXuSrsOynIoEdKtjfy0O639843Z4z6KLjJf30z+UhqSMiJGvPTAvUew+wP2ZSb JV9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=mR5HnPNMgibQtvWRnsWtuYDgNYnMab1RfT1n7aFlQOM=; b=ZBIPC0DezarfT3CVjDQjupCWAepIUMxc5yP9ib7ECHAaLQpfInIu++nothVoE/JQ4j DDIGn/fhDihkhsRnSMZa6hKcp7dm5Cl1vcK4xLpzvZd7ofL8nzsqJZIX4+lgH2IcXu/q nq9RfeyZEJBWYBMT/OMNAVDeLygQ9ZdJDe7pz6PDCvowuuttrORMD7W/y3ZAe9RH9Brf e4S7SeNO8zTfBXHKwXPJbUwVQCCRzYXhctWGByJxKOXUKcgdp3sD/cIevE6bmtLS+wYb 5wysZhRNw8BhyAz1fvGMvoZgc922DhTRoKIKWk6COe0iMg+Hh9m+B6v5V0dKf6+vJ9Ei fA3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id r10-v6si3395620pfe.121.2018.06.20.15.09.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 15:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jun 2018 15:09:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,249,1526367600"; d="scan'208";a="66312710" Received: from linksys13920.jf.intel.com (HELO rpedgeco-HP-Z240-Tower-Workstation.jf.intel.com) ([10.7.197.56]) by orsmga001.jf.intel.com with ESMTP; 20 Jun 2018 15:09:31 -0700 From: Rick Edgecombe To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Cc: kristen.c.accardi@intel.com, dave.hansen@intel.com, arjan.van.de.ven@intel.com, Rick Edgecombe Subject: [PATCH 1/3] vmalloc: Add __vmalloc_node_try_addr function Date: Wed, 20 Jun 2018 15:09:28 -0700 Message-Id: <1529532570-21765-2-git-send-email-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529532570-21765-1-git-send-email-rick.p.edgecombe@intel.com> References: <1529532570-21765-1-git-send-email-rick.p.edgecombe@intel.com> 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 Create __vmalloc_node_try_addr function that tries to allocate at a specific address. The implementation relies on __vmalloc_node_range for the bulk of the work. To keep this function from spamming the logs when an allocation failure is fails, __vmalloc_node_range is changed to only warn when __GFP_NOWARN is not set. This behavior is consistent with this flags interpretation in alloc_vmap_area. Signed-off-by: Rick Edgecombe --- include/linux/vmalloc.h | 3 +++ mm/vmalloc.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 398e9c9..6eaa896 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -82,6 +82,9 @@ extern void *__vmalloc_node_range(unsigned long size, unsigned long align, unsigned long start, unsigned long end, gfp_t gfp_mask, pgprot_t prot, unsigned long vm_flags, int node, const void *caller); +extern void *__vmalloc_node_try_addr(unsigned long addr, unsigned long size, + gfp_t gfp_mask, pgprot_t prot, unsigned long vm_flags, + int node, const void *caller); #ifndef CONFIG_MMU extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags); static inline void *__vmalloc_node_flags_caller(unsigned long size, int node, diff --git a/mm/vmalloc.c b/mm/vmalloc.c index cfea25b..9e0820c9 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1710,6 +1710,42 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, } /** + * __vmalloc_try_addr - try to alloc at a specific address + * @addr: address to try + * @size: size to try + * @gfp_mask: flags for the page level allocator + * @prot: protection mask for the allocated pages + * @vm_flags: additional vm area flags (e.g. %VM_NO_GUARD) + * @node: node to use for allocation or NUMA_NO_NODE + * @caller: caller's return address + * + * Try to allocate at the specific address. If it succeeds the address is + * returned. If it fails NULL is returned. It may trigger TLB flushes. + */ +void *__vmalloc_node_try_addr(unsigned long addr, unsigned long size, + gfp_t gfp_mask, pgprot_t prot, unsigned long vm_flags, + int node, const void *caller) +{ + unsigned long addr_end; + unsigned long vsize = PAGE_ALIGN(size); + + if (!vsize || (vsize >> PAGE_SHIFT) > totalram_pages) + return NULL; + + if (!(vm_flags & VM_NO_GUARD)) + vsize += PAGE_SIZE; + + addr_end = addr + vsize; + + if (addr > addr_end) + return NULL; + + return __vmalloc_node_range(size, 1, addr, addr_end, + gfp_mask | __GFP_NOWARN, prot, vm_flags, node, + caller); +} + +/** * __vmalloc_node_range - allocate virtually contiguous memory * @size: allocation size * @align: desired alignment @@ -1759,8 +1795,9 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, return addr; fail: - warn_alloc(gfp_mask, NULL, - "vmalloc: allocation failure: %lu bytes", real_size); + if (!(gfp_mask & __GFP_NOWARN)) + warn_alloc(gfp_mask, NULL, + "vmalloc: allocation failure: %lu bytes", real_size); return NULL; }