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,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 94270C83004 for ; Wed, 29 Apr 2020 13:37:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4EB51206D6 for ; Wed, 29 Apr 2020 13:37:26 +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="de4RFMRD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4EB51206D6 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 2A0B98E0021; Wed, 29 Apr 2020 09:37:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C48BC8E0001; Wed, 29 Apr 2020 09:37:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F04EA8E0024; Wed, 29 Apr 2020 09:37:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id E7DE18E0006 for ; Wed, 29 Apr 2020 09:37:00 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id AAB16180AD817 for ; Wed, 29 Apr 2020 13:37:00 +0000 (UTC) X-FDA: 76760993400.06.smoke06_3d2ff42e51f5a X-HE-Tag: smoke06_3d2ff42e51f5a X-Filterd-Recvd-Size: 3991 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Wed, 29 Apr 2020 13:37:00 +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=VARbJRt66GXZ9qiKVVic699Ba+6i1AmoDjPwsJmH6Ms=; b=de4RFMRD8dMojIIeXBHcYPG/M5 nWhABiDosUpLCR6KRc1wgN3T8SPfYoLJVSfmoWAAg1yTm8JRu0hIRMVkBl2IZ0/57ANffY4eNtzjJ 0+Q6ZF75GUh0BNFNAZApP7LfPnMdiW5denJpYF1vBSQcUoqy2bSib5GP32tZnnvQcbyovRK8iv2mV 6K8E3kJCQHATjoghavXFEKlKQ7/yLyay0pxghvyOFcf5oQ4acCEwBoclrNn3vv50W6EKviUaNA55N d0J47upy2ZwpPWv8P6+upSJve7iOzniw5/f++qOU3MXp38F62EHS6G7tvp3I1X/ooTuqZH4bq49WO WJ444nfA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTmtX-0005vx-LQ; Wed, 29 Apr 2020 13:36:59 +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 v3 16/25] mm: Make prep_transhuge_page return its argument Date: Wed, 29 Apr 2020 06:36:48 -0700 Message-Id: <20200429133657.22632-17-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200429133657.22632-1-willy@infradead.org> References: <20200429133657.22632-1-willy@infradead.org> MIME-Version: 1.0 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)" By permitting NULL or order-0 pages as an argument, and returning the argument, callers can write: return prep_transhuge_page(alloc_pages(...)); instead of assigning the result to a temporary variable and conditionally passing that to prep_transhuge_page(). Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Kirill A. Shutemov --- include/linux/huge_mm.h | 7 +++++-- mm/huge_memory.c | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 1f6245091917..6a8502278f41 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -193,7 +193,7 @@ extern unsigned long thp_get_unmapped_area(struct fil= e *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); =20 -extern void prep_transhuge_page(struct page *page); +extern struct page *prep_transhuge_page(struct page *page); extern void free_transhuge_page(struct page *page); bool is_transparent_hugepage(struct page *page); =20 @@ -358,7 +358,10 @@ static inline bool transhuge_vma_suitable(struct vm_= area_struct *vma, return false; } =20 -static inline void prep_transhuge_page(struct page *page) {} +static inline struct page *prep_transhuge_page(struct page *page) +{ + return page; +} =20 static inline bool is_transparent_hugepage(struct page *page) { diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 6ecd1045113b..7a5e2b470bc7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -508,15 +508,20 @@ static inline struct deferred_split *get_deferred_s= plit_queue(struct page *page) } #endif =20 -void prep_transhuge_page(struct page *page) +struct page *prep_transhuge_page(struct page *page) { + if (!page || compound_order(page) =3D=3D 0) + return page; /* - * we use page->mapping and page->indexlru in second tail page + * we use page->mapping and page->index in second tail page * as list_head: assuming THP order >=3D 2 */ + BUG_ON(compound_order(page) =3D=3D 1); =20 INIT_LIST_HEAD(page_deferred_list(page)); set_compound_page_dtor(page, TRANSHUGE_PAGE_DTOR); + + return page; } =20 bool is_transparent_hugepage(struct page *page) --=20 2.26.2