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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 8B42CC433DF for ; Wed, 10 Jun 2020 20:39:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 48207206A4 for ; Wed, 10 Jun 2020 20:39:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="fZ2qNCLZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48207206A4 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 397E18D0034; Wed, 10 Jun 2020 16:39:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3489F8D002D; Wed, 10 Jun 2020 16:39:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A1D18D0034; Wed, 10 Jun 2020 16:39:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0018.hostedemail.com [216.40.44.18]) by kanga.kvack.org (Postfix) with ESMTP id EB7F58D0033 for ; Wed, 10 Jun 2020 16:39:33 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A7D8A1801C377 for ; Wed, 10 Jun 2020 20:39:33 +0000 (UTC) X-FDA: 76914467826.01.shock40_170a27826dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 7E4831801736E for ; Wed, 10 Jun 2020 20:39:33 +0000 (UTC) X-HE-Tag: shock40_170a27826dce X-Filterd-Recvd-Size: 4401 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Wed, 10 Jun 2020 20:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=GYkASM4BgicRB6qQw/ipKWc7P4OsD4qqbRXZJoBJj2A=; b=fZ2qNCLZY8A3ORQkyJtDxInaEG Ecup0o0tQdAskbPlcKAGJkERx1rVwDVpliXE0v56sOxSjvNkNJfecQ3fVI58HSMbEXzGNKOdBif3G DXv8jO2AifgU8NIxn1NHR75q907XSarxq4GYn0ljEUeXXRRH2uVyC9ouBMtk3HWOWFhdJKjmh5XBl MlZyubcdGQ69V9DNZj48RpjKvCg3Oi69Hv2gSpQc+SUwkcQXvWTQu4CfFKgVQoMuBFxVCWufXTOsZ h/Hl+P38eVcPsrviQQgN1txwem/H/6DkT+MZrF0J7Za5Edimj9JmwlOCN09qAxpYv0TOgmM7kvrUO yp8bAmgw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76a-0003Wa-LC; Wed, 10 Jun 2020 20:13:48 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A . Shutemov" Subject: [PATCH v6 34/51] mm: Add __page_cache_alloc_order Date: Wed, 10 Jun 2020 13:13:28 -0700 Message-Id: <20200610201345.13273-35-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7E4831801736E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: From: "Matthew Wilcox (Oracle)" This new function allows page cache pages to be allocated that are larger than an order-0 page. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Kirill A. Shutemov --- include/linux/pagemap.h | 24 +++++++++++++++++++++--- mm/filemap.c | 12 ++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index f47ba9f18f3e..8455a3e16900 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -280,15 +280,33 @@ static inline void *detach_page_private(struct page= *page) return data; } =20 +static inline gfp_t thp_gfpmask(gfp_t gfp) +{ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + /* We'd rather allocate smaller pages than stall a page fault */ + gfp |=3D GFP_TRANSHUGE_LIGHT; + gfp &=3D ~__GFP_DIRECT_RECLAIM; +#endif + return gfp; +} + #ifdef CONFIG_NUMA -extern struct page *__page_cache_alloc(gfp_t gfp); +extern struct page *__page_cache_alloc_order(gfp_t gfp, unsigned int ord= er); #else -static inline struct page *__page_cache_alloc(gfp_t gfp) +static inline +struct page *__page_cache_alloc_order(gfp_t gfp, unsigned int order) { - return alloc_pages(gfp, 0); + if (order =3D=3D 0) + return alloc_pages(gfp, 0); + return prep_transhuge_page(alloc_pages(thp_gfpmask(gfp), order)); } #endif =20 +static inline struct page *__page_cache_alloc(gfp_t gfp) +{ + return __page_cache_alloc_order(gfp, 0); +} + static inline struct page *page_cache_alloc(struct address_space *x) { return __page_cache_alloc(mapping_gfp_mask(x)); diff --git a/mm/filemap.c b/mm/filemap.c index 80ce3658b147..3a9579a1ffa7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -938,24 +938,28 @@ int add_to_page_cache_lru(struct page *page, struct= address_space *mapping, EXPORT_SYMBOL_GPL(add_to_page_cache_lru); =20 #ifdef CONFIG_NUMA -struct page *__page_cache_alloc(gfp_t gfp) +struct page *__page_cache_alloc_order(gfp_t gfp, unsigned int order) { int n; struct page *page; =20 + if (order > 0) + gfp =3D thp_gfpmask(gfp); + if (cpuset_do_page_mem_spread()) { unsigned int cpuset_mems_cookie; do { cpuset_mems_cookie =3D read_mems_allowed_begin(); n =3D cpuset_mem_spread_node(); - page =3D __alloc_pages_node(n, gfp, 0); + page =3D __alloc_pages_node(n, gfp, order); + prep_transhuge_page(page); } while (!page && read_mems_allowed_retry(cpuset_mems_cookie)); =20 return page; } - return alloc_pages(gfp, 0); + return prep_transhuge_page(alloc_pages(gfp, order)); } -EXPORT_SYMBOL(__page_cache_alloc); +EXPORT_SYMBOL(__page_cache_alloc_order); #endif =20 /* --=20 2.26.2