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=-12.6 required=3.0 tests=BAYES_00,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 40BFBC5DF9D for ; Thu, 29 Oct 2020 19:34:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A7F8E20782 for ; Thu, 29 Oct 2020 19:34:14 +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="GjtdCwcf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7F8E20782 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 3ACAB6B0068; Thu, 29 Oct 2020 15:34:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 178786B0070; Thu, 29 Oct 2020 15:34:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6B2E6B006E; Thu, 29 Oct 2020 15:34:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0208.hostedemail.com [216.40.44.208]) by kanga.kvack.org (Postfix) with ESMTP id 959996B0068 for ; Thu, 29 Oct 2020 15:34:11 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 40B71824999B for ; Thu, 29 Oct 2020 19:34:11 +0000 (UTC) X-FDA: 77425963902.29.wave84_3d0458627290 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 249C918086CDA for ; Thu, 29 Oct 2020 19:34:11 +0000 (UTC) X-HE-Tag: wave84_3d0458627290 X-Filterd-Recvd-Size: 4498 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:34:09 +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=s1cCfqcsILzWonrmhPADFuQaWV/n44mIEDAgMnBPBWs=; b=GjtdCwcfhF/TVVIqPnUDC25++f BnD+8bDa4SOZWlnGoG3Ygs+kQnhqaxR+FPpm1Q9/3Izljt77lSRroTSVmH1B8H898vyRAPmXlXLbQ ee4kUxtRQH5hJpM+v3uC/KOo5Y1sI4U7rvfXDEuDOql7UQqlMI7ccJ0UMs3WZcwAooYnuQVqjvNkw Ar0YofCqerzlrNdX0ZQ9nci8/vB9jlzwQaBlmYUzxtx8suGfVO27aAHOlQe6m2gM39SSzEu+XJnOe yp39RaqKFYcT057V9xRdMwE4ABGftx9NKzrIQjaMOLwYHPu/St5IPisjwfYGIxtsk3bJmOwNgGJlC VU5KiK4Q==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDgW-0007bG-6y; Thu, 29 Oct 2020 19:34:08 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 03/19] mm: Support arbitrary THP sizes Date: Thu, 29 Oct 2020 19:33:49 +0000 Message-Id: <20201029193405.29125-4-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201029193405.29125-1-willy@infradead.org> References: <20201029193405.29125-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: Use the compound size of the page instead of assuming PTE or PMD size. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/huge_mm.h | 8 ++------ include/linux/mm.h | 42 ++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index c2ecb6036ad8..60a907a19f7d 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -272,9 +272,7 @@ static inline struct page *thp_head(struct page *page= ) static inline unsigned int thp_order(struct page *page) { VM_BUG_ON_PGFLAGS(PageTail(page), page); - if (PageHead(page)) - return HPAGE_PMD_ORDER; - return 0; + return compound_order(page); } =20 /** @@ -284,9 +282,7 @@ static inline unsigned int thp_order(struct page *pag= e) static inline int thp_nr_pages(struct page *page) { VM_BUG_ON_PGFLAGS(PageTail(page), page); - if (PageHead(page)) - return HPAGE_PMD_NR; - return 1; + return compound_nr(page); } =20 struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long= addr, diff --git a/include/linux/mm.h b/include/linux/mm.h index 4e75f1c64534..3a73161a25a4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -685,6 +685,27 @@ int vma_is_stack_for_current(struct vm_area_struct *= vma); struct mmu_gather; struct inode; =20 +static inline unsigned int compound_order(struct page *page) +{ + if (!PageHead(page)) + return 0; + return page[1].compound_order; +} + +/* Returns the number of pages in this potentially compound page. */ +static inline unsigned long compound_nr(struct page *page) +{ + if (!PageHead(page)) + return 1; + return page[1].compound_nr; +} + +static inline void set_compound_order(struct page *page, unsigned int or= der) +{ + page[1].compound_order =3D order; + page[1].compound_nr =3D 1U << order; +} + #include =20 /* @@ -901,13 +922,6 @@ static inline void destroy_compound_page(struct page= *page) compound_page_dtors[page[1].compound_dtor](page); } =20 -static inline unsigned int compound_order(struct page *page) -{ - if (!PageHead(page)) - return 0; - return page[1].compound_order; -} - static inline bool hpage_pincount_available(struct page *page) { /* @@ -931,20 +945,6 @@ static inline int compound_pincount(struct page *pag= e) return head_compound_pincount(page); } =20 -static inline void set_compound_order(struct page *page, unsigned int or= der) -{ - page[1].compound_order =3D order; - page[1].compound_nr =3D 1U << order; -} - -/* Returns the number of pages in this potentially compound page. */ -static inline unsigned long compound_nr(struct page *page) -{ - if (!PageHead(page)) - return 1; - return page[1].compound_nr; -} - /* Returns the number of bytes in this potentially compound page. */ static inline unsigned long page_size(struct page *page) { --=20 2.28.0