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 44ED6C433E0 for ; Thu, 28 Jan 2021 07:04:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D1CD164DCE for ; Thu, 28 Jan 2021 07:04:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1CD164DCE 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 9E41B6B0081; Thu, 28 Jan 2021 02:04:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E6BE6B0085; 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 5ACCA6B0083; Thu, 28 Jan 2021 02:04:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0123.hostedemail.com [216.40.44.123]) by kanga.kvack.org (Postfix) with ESMTP id 450266B0081 for ; Thu, 28 Jan 2021 02:04:43 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 101BA8249980 for ; Thu, 28 Jan 2021 07:04:43 +0000 (UTC) X-FDA: 77754296046.22.ducks49_3a06f5c2759d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id E65C118038E85 for ; Thu, 28 Jan 2021 07:04:42 +0000 (UTC) X-HE-Tag: ducks49_3a06f5c2759d X-Filterd-Recvd-Size: 5323 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf40.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=tMlKhew7ndgk0qOg+5AjyGBRQQoI8Dkzst9tOl3B0xU=; b=biyDQe2hpC/qqRkm9fBwEVMKeO TlQRAhC4jsYYXb9Kf/drzLfnJNrCSDHGXltdimzRUBnps6Oo1gc3uzWdgOtq88H5aPYm+phRz/o4+ XDxj9ijsXcl9NQDnhfMJkdaUr5jPe7aUA6HKV93+Mth8XLZ33T6H/NrhCwOBaDH6AkHLTt8xp8PiH civOxNppepZAZUqAOsKLjngY2dDfsVvTwLn/62Kw5jp4bPNfz+DOO5GWyvfPtIcslBjKqeTCIUZWT PhCXoCGFdCOR3+Vn9vI603NY4BOMt2XZQ8G77jRBZ2nfp8+ZZmQe++K1Rv2vVo8L9LKKwpP4LCU0r t8dEqt7w==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51M6-008487-UA; Thu, 28 Jan 2021 07:04:39 +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 15/25] mm: Add lock_folio_killable Date: Thu, 28 Jan 2021 07:03:54 +0000 Message-Id: <20210128070404.1922318-16-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_killable() but for use by callers who know they have a folio. Convert __lock_page_killable() to be __lock_folio_killable(). This saves one call to compound_head() per contended call to lock_page_killable(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 15 ++++++++++----- mm/filemap.c | 17 +++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0e9ad46e8d55..93a4ab9feaa8 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -619,7 +619,7 @@ static inline bool wake_page_match(struct wait_page_q= ueue *wait_page, } =20 void __lock_folio(struct folio *folio); -extern int __lock_page_killable(struct page *page); +int __lock_folio_killable(struct folio *folio); 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, unsigned int flags); @@ -668,6 +668,14 @@ static inline void lock_page(struct page *page) lock_folio(page_folio(page)); } =20 +static inline int lock_folio_killable(struct folio *folio) +{ + might_sleep(); + if (!trylock_folio(folio)) + return __lock_folio_killable(folio); + return 0; +} + /* * lock_page_killable is like lock_page but can be interrupted by fatal * signals. It returns 0 if it locked the page and -EINTR if it was @@ -675,10 +683,7 @@ static inline void lock_page(struct page *page) */ static inline int lock_page_killable(struct page *page) { - might_sleep(); - if (!trylock_page(page)) - return __lock_page_killable(page); - return 0; + return lock_folio_killable(page_folio(page)); } =20 /* diff --git a/mm/filemap.c b/mm/filemap.c index f95967ef16da..c378b28c2bdc 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1516,14 +1516,13 @@ void __lock_folio(struct folio *folio) } EXPORT_SYMBOL(__lock_folio); =20 -int __lock_page_killable(struct page *__page) +int __lock_folio_killable(struct folio *folio) { - struct page *page =3D compound_head(__page); - wait_queue_head_t *q =3D page_waitqueue(page); - return wait_on_page_bit_common(q, page, PG_locked, TASK_KILLABLE, + wait_queue_head_t *q =3D page_waitqueue(&folio->page); + return wait_on_page_bit_common(q, &folio->page, PG_locked, TASK_KILLABL= E, EXCLUSIVE); } -EXPORT_SYMBOL_GPL(__lock_page_killable); +EXPORT_SYMBOL_GPL(__lock_folio_killable); =20 int __lock_page_async(struct page *page, struct wait_page_queue *wait) { @@ -1565,6 +1564,8 @@ int __lock_page_async(struct page *page, struct wai= t_page_queue *wait) int __lock_page_or_retry(struct page *page, struct mm_struct *mm, unsigned int flags) { + struct folio *folio =3D page_folio(page); + if (fault_flag_allow_retry_first(flags)) { /* * CAUTION! In this case, mmap_lock is not released @@ -1583,13 +1584,13 @@ int __lock_page_or_retry(struct page *page, struc= t mm_struct *mm, if (flags & FAULT_FLAG_KILLABLE) { int ret; =20 - ret =3D __lock_page_killable(page); + ret =3D __lock_folio_killable(folio); if (ret) { mmap_read_unlock(mm); return 0; } } else { - __lock_folio(page_folio(page)); + __lock_folio(folio); } =20 return 1; @@ -2752,7 +2753,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(&folio->page)) { + if (__lock_folio_killable(folio)) { /* * We didn't have the right flags to drop the mmap_lock, * but all fault_handlers only check for fatal signals --=20 2.29.2