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.5 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 D9ED3C433E0 for ; Thu, 28 Jan 2021 07:04:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6B61764DCE for ; Thu, 28 Jan 2021 07:04:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B61764DCE 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 D16AF6B0082; Thu, 28 Jan 2021 02:04:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC8B16B0087; Thu, 28 Jan 2021 02:04:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DE756B0082; Thu, 28 Jan 2021 02:04:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 685476B0081 for ; Thu, 28 Jan 2021 02:04:43 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 36ADC363C for ; Thu, 28 Jan 2021 07:04:43 +0000 (UTC) X-FDA: 77754296046.20.mass91_30005932759d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 16009180C07A3 for ; Thu, 28 Jan 2021 07:04:43 +0000 (UTC) X-HE-Tag: mass91_30005932759d X-Filterd-Recvd-Size: 6281 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Jan 2021 07:04:42 +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=lIQIFMixnyjSDJcpHuiqmFYiF+kBlzmw0ySSor7xzXQ=; b=oP+8uriPDnf/B/i3Fc0C9cuURL RAjG19VC5yNGU/BmmORBHv42w4YyhcBuhnskdAWGuE7qeixklLutttyQxj8Zg9nSs439I5rDqsCu7 nKxxafbyTE5l54m24IUHdLhM1Fx8wn+SGMqpcjP444pbtr+JRHVVIr4OxdxAqr3AYf+v1MJ7GN51+ bGWEXu+qeJoHu2l8o5jL0T+holZma6qFD5RgDfTdp2fcu06UIL4bFwpeCm+xQ8TP5OKKWyeIA+/+N Y/yOWRANWhT39FK3lEUQY6hcZPO/aiG/wT2c2CN8ClnKYO1RA1cr8D/Z2LLrfVQpsv4lS0NjaUj9W kT3Kqlzg==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51Ly-00847x-14; Thu, 28 Jan 2021 07:04:30 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v3 14/25] mm: Add lock_folio Date: Thu, 28 Jan 2021 07:03:53 +0000 Message-Id: <20210128070404.1922318-15-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128070404.1922318-1-willy@infradead.org> References: <20210128070404.1922318-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: This is like lock_page() but for use by callers who know they have a foli= o. Convert __lock_page() to be __lock_folio(). This saves one call to compound_head() per contended call to lock_page(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 21 +++++++++++++++------ mm/filemap.c | 29 +++++++++++++++-------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 5fcab5e1787c..0e9ad46e8d55 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -618,7 +618,7 @@ static inline bool wake_page_match(struct wait_page_q= ueue *wait_page, return true; } =20 -extern void __lock_page(struct page *page); +void __lock_folio(struct folio *folio); extern int __lock_page_killable(struct page *page); extern int __lock_page_async(struct page *page, struct wait_page_queue *= wait); extern int __lock_page_or_retry(struct page *page, struct mm_struct *mm, @@ -640,13 +640,24 @@ static inline void unlock_page(struct page *page) return unlock_folio(page_folio(page)); } =20 +static inline bool trylock_folio(struct folio *folio) +{ + return likely(!test_and_set_bit_lock(PG_locked, folio_flags(folio))); +} + /* * Return true if the page was successfully locked */ static inline int trylock_page(struct page *page) { - page =3D compound_head(page); - return (likely(!test_and_set_bit_lock(PG_locked, &page->flags))); + return trylock_folio(page_folio(page)); +} + +static inline void lock_folio(struct folio *folio) +{ + might_sleep(); + if (!trylock_folio(folio)) + __lock_folio(folio); } =20 /* @@ -654,9 +665,7 @@ static inline int trylock_page(struct page *page) */ static inline void lock_page(struct page *page) { - might_sleep(); - if (!trylock_page(page)) - __lock_page(page); + lock_folio(page_folio(page)); } =20 /* diff --git a/mm/filemap.c b/mm/filemap.c index b639651d1573..f95967ef16da 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1159,7 +1159,7 @@ static void wake_up_page(struct page *page, int bit= ) */ enum behavior { EXCLUSIVE, /* Hold ref to page and take the bit when woken, like - * __lock_page() waiting on then setting PG_locked. + * __lock_folio() waiting on then setting PG_locked. */ SHARED, /* Hold ref to page and check the bit when woken, like * wait_on_page_writeback() waiting on PG_writeback. @@ -1505,17 +1505,16 @@ void page_endio(struct page *page, bool is_write,= int err) EXPORT_SYMBOL_GPL(page_endio); =20 /** - * __lock_page - get a lock on the page, assuming we need to sleep to ge= t it - * @__page: the page to lock + * __lock_folio - Get a lock on the folio, assuming we need to sleep to = get it. + * @folio: The folio to lock */ -void __lock_page(struct page *__page) +void __lock_folio(struct folio *folio) { - struct page *page =3D compound_head(__page); - wait_queue_head_t *q =3D page_waitqueue(page); - wait_on_page_bit_common(q, page, PG_locked, TASK_UNINTERRUPTIBLE, + wait_queue_head_t *q =3D page_waitqueue(&folio->page); + wait_on_page_bit_common(q, &folio->page, PG_locked, TASK_UNINTERRUPTIBL= E, EXCLUSIVE); } -EXPORT_SYMBOL(__lock_page); +EXPORT_SYMBOL(__lock_folio); =20 int __lock_page_killable(struct page *__page) { @@ -1590,10 +1589,10 @@ int __lock_page_or_retry(struct page *page, struc= t mm_struct *mm, return 0; } } else { - __lock_page(page); + __lock_folio(page_folio(page)); } - return 1; =20 + return 1; } =20 /** @@ -2738,7 +2737,9 @@ loff_t mapping_seek_hole_data(struct address_space = *mapping, loff_t start, static int lock_page_maybe_drop_mmap(struct vm_fault *vmf, struct page *= page, struct file **fpin) { - if (trylock_page(page)) + struct folio *folio =3D page_folio(page); + + if (trylock_folio(folio)) return 1; =20 /* @@ -2751,7 +2752,7 @@ static int lock_page_maybe_drop_mmap(struct vm_faul= t *vmf, struct page *page, =20 *fpin =3D maybe_unlock_mmap_for_io(vmf, *fpin); if (vmf->flags & FAULT_FLAG_KILLABLE) { - if (__lock_page_killable(page)) { + if (__lock_page_killable(&folio->page)) { /* * We didn't have the right flags to drop the mmap_lock, * but all fault_handlers only check for fatal signals @@ -2763,11 +2764,11 @@ static int lock_page_maybe_drop_mmap(struct vm_fa= ult *vmf, struct page *page, return 0; } } else - __lock_page(page); + __lock_folio(folio); + return 1; } =20 - /* * Synchronous readahead happens when we don't even find a page in the p= age * cache at all. We don't want to perform IO under the mmap sem, so if = we have --=20 2.29.2