From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CE1AC433C1 for ; Mon, 22 Mar 2021 19:56:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A04EB61477 for ; Mon, 22 Mar 2021 19:56:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A04EB61477 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 30FBD6B0083; Mon, 22 Mar 2021 15:56:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F5336B00C4; Mon, 22 Mar 2021 15:56:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8EB76B00C2; Mon, 22 Mar 2021 15:56:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0170.hostedemail.com [216.40.44.170]) by kanga.kvack.org (Postfix) with ESMTP id CE1616B0083 for ; Mon, 22 Mar 2021 15:56:52 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 86A968249980 for ; Mon, 22 Mar 2021 19:56:52 +0000 (UTC) X-FDA: 77948568264.12.D31FFEB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id B0D2D600010C for ; Mon, 22 Mar 2021 19:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=bbKq2TN24ehai17x54FTajuPZY8Y2HOgf1z2a1oFDYM=; b=eMBWqZNOQwUsdB2mgz/CqQEgf6 Z8B5Ij5hAWqr/XbEBV16kSiKqeqe3tqD/86ydgEeERKsgX4ghr2/RC+Uekt4Zf+jyx4/anr7uMWHy uuG2dH+HtfRtuCNC7KbFBv5lNeK4jE6NvfmlUYSrw0m80uSoKEIS2mayvdDC+nzPIj4qUJqV6d6QG pRMOagFX+7TbAo+u2IoaqosO1ipVWUR9Thd9bmwFHc4gipggu0l0Qvfkuf9JwqrsTEg5T6bJTRMc3 k2ghvKCazeq7g6ZFagydv8ZlPMMcaY7dA/L46Xp9wJszaHmngZ1QQYNnfk2dO0LPvOEGcpepEtqZ3 XhLChCng==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lOQNw-008yqi-BF; Mon, 22 Mar 2021 19:38:51 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Uladzislau Rezki , Nicholas Piggin Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 2/2] mm/vmalloc: Use kvmalloc to allocate the table of pages Date: Mon, 22 Mar 2021 19:38:20 +0000 Message-Id: <20210322193820.2140045-2-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210322193820.2140045-1-willy@infradead.org> References: <20210322193820.2140045-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B0D2D600010C X-Stat-Signature: 4dmk3z4zjymeh6zqarisce3p9i55egme Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf25; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616443003-510540 Content-Transfer-Encoding: quoted-printable 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: If we're trying to allocate 4MB of memory, the table will be 8KiB in size (1024 pointers * 8 bytes per pointer), which can usually be satisfied by a kmalloc (which is significantly faster). Instead of changing this open-coded implementation, just use kvmalloc(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/vmalloc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 96444d64129a..32b640a84250 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2802,13 +2802,8 @@ static void *__vmalloc_area_node(struct vm_struct = *area, gfp_t gfp_mask, gfp_mask |=3D __GFP_HIGHMEM; =20 /* Please note that the recursion is strictly bounded. */ - if (array_size > PAGE_SIZE) { - pages =3D __vmalloc_node(array_size, 1, nested_gfp, node, + pages =3D kvmalloc_node_caller(array_size, nested_gfp, node, area->caller); - } else { - pages =3D kmalloc_node(array_size, nested_gfp, node); - } - if (!pages) { free_vm_area(area); return NULL; --=20 2.30.2