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 6B1F5C433DB for ; Sat, 20 Mar 2021 05:42:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 046146193E for ; Sat, 20 Mar 2021 05:42:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 046146193E 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 9C44E6B0073; Sat, 20 Mar 2021 01:42:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 99B476B0074; Sat, 20 Mar 2021 01:42:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8634B6B0085; Sat, 20 Mar 2021 01:42:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0005.hostedemail.com [216.40.44.5]) by kanga.kvack.org (Postfix) with ESMTP id 67A576B0073 for ; Sat, 20 Mar 2021 01:42:35 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 3124F8249980 for ; Sat, 20 Mar 2021 05:42:35 +0000 (UTC) X-FDA: 77939157828.30.057CA1A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id BE1495001522 for ; Sat, 20 Mar 2021 05:42:33 +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=IP6QZgGwEXaaFopeekBczSGdfJmZJVj0NuzgQhtzlmA=; b=cMOvj2OzXkJGXJg/q/R+ZqybO2 trLn8Yg+taRequdAFhoxcXYNK/9teYoprdMTru8pqwzM9g8uSYXbL9D1nj33IkOHDAB4/0ajLNZ1F ZXLL6e+S4vIz5lisbxuBwXh6dHzt54g2p2wEZGHkoDYf8sfpkU0nDaNVheh3ktLS1wo2SycgHVsW7 6cNjq5pz2mgAANBgEuw3u2GMuD5ChgX6paFd3VlDScnH7G+8TU7pyipGBrCYOEbhqlhjLFFSlJ9FI dKRkduoNnWOtlU6pkBuJDpvnQKWNnX9gz7uKVtLzj7TvMH37y5XWAEjAJ4olzXv0cZ9G4BhV7LvYt rudyYfBg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lNUNU-005SY1-G5; Sat, 20 Mar 2021 05:42:25 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, linux-afs@lists.infradead.org Subject: [PATCH v5 11/27] mm: Handle per-folio private data Date: Sat, 20 Mar 2021 05:40:48 +0000 Message-Id: <20210320054104.1300774-12-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210320054104.1300774-1-willy@infradead.org> References: <20210320054104.1300774-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: wbn4ap9xi3czhkpy5ae1n5kg5duyt1hr X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: BE1495001522 Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf01; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616218953-959077 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: Add folio_private() and set_folio_private() which mirror page_private() and set_page_private() -- ie folio private data is the same as page private data. The only difference is that these return a void * instead of an unsigned long, which matches the majority of users. Turn attach_page_private() into attach_folio_private() and reimplement attach_page_private() as a wrapper. No filesystem which uses page privat= e data currently supports compound pages, so we're free to define the rules= . attach_page_private() may only be called on a head page; if you want to add private data to a tail page, you can call set_page_private() directly (and shouldn't increment the page refcount! That should be done when adding private data to the head page / folio). This saves 597 bytes of text with the distro-derived config that I'm testing due to removing the calls to compound_head() in get_page() & put_page(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm_types.h | 16 ++++++++++++++ include/linux/pagemap.h | 48 ++++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 4fc0b230d3ea..90086f93e9de 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -278,6 +278,12 @@ static inline atomic_t *compound_pincount_ptr(struct= page *page) #define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) #define PAGE_FRAG_CACHE_MAX_ORDER get_order(PAGE_FRAG_CACHE_MAX_SIZE) =20 +/* + * page_private can be used on tail pages. However, PagePrivate is only + * checked by the VM on the head page. So page_private on the tail page= s + * should be used for data that's ancillary to the head page (eg attachi= ng + * buffer heads to tail pages after attaching buffer heads to the head p= age) + */ #define page_private(page) ((page)->private) =20 static inline void set_page_private(struct page *page, unsigned long pri= vate) @@ -285,6 +291,16 @@ static inline void set_page_private(struct page *pag= e, unsigned long private) page->private =3D private; } =20 +static inline void *folio_private(struct folio *folio) +{ + return (void *)folio->page.private; +} + +static inline void set_folio_private(struct folio *folio, void *v) +{ + folio->page.private =3D (unsigned long)v; +} + struct page_frag_cache { void * va; #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 8c844ba67785..6676210addf6 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -260,42 +260,52 @@ static inline int page_cache_add_speculative(struct= page *page, int count) } =20 /** - * attach_page_private - Attach private data to a page. - * @page: Page to attach data to. - * @data: Data to attach to page. + * attach_folio_private - Attach private data to a folio. + * @folio: Folio to attach data to. + * @data: Data to attach to folio. * - * Attaching private data to a page increments the page's reference coun= t. - * The data must be detached before the page will be freed. + * Attaching private data to a folio increments the page's reference cou= nt. + * The data must be detached before the folio will be freed. */ -static inline void attach_page_private(struct page *page, void *data) +static inline void attach_folio_private(struct folio *folio, void *data) { - get_page(page); - set_page_private(page, (unsigned long)data); - SetPagePrivate(page); + get_folio(folio); + set_folio_private(folio, data); + SetFolioPrivate(folio); } =20 /** - * detach_page_private - Detach private data from a page. - * @page: Page to detach data from. + * detach_folio_private - Detach private data from a folio. + * @folio: Folio to detach data from. * - * Removes the data that was previously attached to the page and decreme= nts + * Removes the data that was previously attached to the folio and decrem= ents * the refcount on the page. * - * Return: Data that was attached to the page. + * Return: Data that was attached to the folio. */ -static inline void *detach_page_private(struct page *page) +static inline void *detach_folio_private(struct folio *folio) { - void *data =3D (void *)page_private(page); + void *data =3D folio_private(folio); =20 - if (!PagePrivate(page)) + if (!FolioPrivate(folio)) return NULL; - ClearPagePrivate(page); - set_page_private(page, 0); - put_page(page); + ClearFolioPrivate(folio); + set_folio_private(folio, NULL); + put_folio(folio); =20 return data; } =20 +static inline void attach_page_private(struct page *page, void *data) +{ + attach_folio_private(page_folio(page), data); +} + +static inline void *detach_page_private(struct page *page) +{ + return detach_folio_private(page_folio(page)); +} + #ifdef CONFIG_NUMA extern struct page *__page_cache_alloc(gfp_t gfp); #else --=20 2.30.2