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 A6AEEC433E0 for ; Mon, 18 Jan 2021 17:02:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5F132222BB for ; Mon, 18 Jan 2021 17:02:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F132222BB 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 5247D6B00F8; Mon, 18 Jan 2021 12:02:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 485696B00FB; Mon, 18 Jan 2021 12:02:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34BD56B00FC; Mon, 18 Jan 2021 12:02:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0169.hostedemail.com [216.40.44.169]) by kanga.kvack.org (Postfix) with ESMTP id 1D7396B00FB for ; Mon, 18 Jan 2021 12:02:38 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id CE1D42491 for ; Mon, 18 Jan 2021 17:02:37 +0000 (UTC) X-FDA: 77719514754.23.face39_4f16c8f2754a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id A604E37608 for ; Mon, 18 Jan 2021 17:02:37 +0000 (UTC) X-HE-Tag: face39_4f16c8f2754a X-Filterd-Recvd-Size: 5323 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Mon, 18 Jan 2021 17:02:37 +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=jARN5G1znGLwfSj55+Daqu/+UcQBxuyDpa50QC0pHA4=; b=TelTRaIX5dLsHy2wHOo1Yge7T1 uQOyBAt7fjvJ588wTJqQfIwjCLPbPN/aoVqFJMJD/CFzxf+ClOtNDsX/mirVX9wdzpWj9xBd0NFQR NhOyttxEy87q402zm1sLXz+2XoG2gNPRRTWnrdMxervs00pws/xoZL2H8QtAK0TaudBzrbjvKJ2S9 8NmeFAz2Z82bSgEwxv0o2bR8TSSsktpKvWh7xnTs5lt/WCQsivMTkarGrG8Og0/DY3STwX+8BCToy 8Kl16B8SL9zGib8+DgHNWFl1LKUI6KQyRKSQpzJKpOyQbQXGNea7Qmv2YOTepoTQ23exhtkEM5Cr9 m7y2XHkw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l1Xv7-00D7Lx-6E; Mon, 18 Jan 2021 17:02:26 +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 v2 15/27] mm: Add lock_folio_killable Date: Mon, 18 Jan 2021 17:01:36 +0000 Message-Id: <20210118170148.3126186-16-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210118170148.3126186-1-willy@infradead.org> References: <20210118170148.3126186-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 03b67915b0f7..5260ae7d9196 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); @@ -667,6 +667,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 @@ -674,10 +682,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 167552fad5a6..31b90b878eba 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1529,14 +1529,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) { @@ -1557,6 +1556,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 @@ -1575,13 +1576,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; @@ -2777,7 +2778,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