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 45F16C3B18A for ; Wed, 12 Feb 2020 04:19:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0872220848 for ; Wed, 12 Feb 2020 04:19:21 +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="EvJY83cu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0872220848 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 6641D6B039F; Tue, 11 Feb 2020 23:18:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 35BBB6B03AA; Tue, 11 Feb 2020 23:18:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9ECAE6B03B0; Tue, 11 Feb 2020 23:18:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0137.hostedemail.com [216.40.44.137]) by kanga.kvack.org (Postfix) with ESMTP id D1C0F6B039F for ; Tue, 11 Feb 2020 23:18:48 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7949F8248076 for ; Wed, 12 Feb 2020 04:18:48 +0000 (UTC) X-FDA: 76480169136.09.grass10_12a002e539f1c X-HE-Tag: grass10_12a002e539f1c X-Filterd-Recvd-Size: 3991 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Wed, 12 Feb 2020 04:18:47 +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=gXJv+foPDzm9zZZb2en6nqyTOSipe1jE6l4dnk9iVRY=; b=EvJY83cuo9CuZJSwbi/lXWN3fj 3hmkqb1bPoc4dHHzywZCdrw9jpeYiTqqBtnxy23Te13nFXUD9zv6WmZrQqrNpCxOJDcnHFLEaAjvu cI/IU+S+kEnckvQ33zp+vvt5HrXRget0R5I4oS4OF/XVbp84syTfZTPyqwi23UR9+KYuASjxG3j4b Jq+mT5s/TcDEa6IPWtAko+4rA1fFFXCi6hu8ubmfD5KucwIokKRQrNw3OpJNIKP/SPZXU/lNrfjpu BIhDwvKiLNrJ5+cqAt4m6860BFcMc/AJCQJ89CaoeCaX7cbamgIiU5I3qifIGDaoRGjtM1WX3xVjF duIt4uvA==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j1jU7-0006oi-B9; Wed, 12 Feb 2020 04:18:47 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, "Kirill A . Shutemov" Subject: [PATCH v2 20/25] mm: Make prep_transhuge_page return its argument Date: Tue, 11 Feb 2020 20:18:40 -0800 Message-Id: <20200212041845.25879-21-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200212041845.25879-1-willy@infradead.org> References: <20200212041845.25879-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 3de788ee25bd..865b9c16c99c 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -158,7 +158,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 @@ -307,7 +307,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 b08b199f9a11..b52e007f0856 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.25.0