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 4762FC55179 for ; Thu, 29 Oct 2020 19:35:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AD35321D7B for ; Thu, 29 Oct 2020 19:35:00 +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="kqmrBljn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD35321D7B 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 150FF6B0088; Thu, 29 Oct 2020 15:34:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B3D76B008A; Thu, 29 Oct 2020 15:34:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F08B06B008C; Thu, 29 Oct 2020 15:34:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0251.hostedemail.com [216.40.44.251]) by kanga.kvack.org (Postfix) with ESMTP id BD0286B0088 for ; Thu, 29 Oct 2020 15:34:17 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 69B768249980 for ; Thu, 29 Oct 2020 19:34:17 +0000 (UTC) X-FDA: 77425964154.17.brake72_4d1095227290 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 51F70180D0180 for ; Thu, 29 Oct 2020 19:34:17 +0000 (UTC) X-HE-Tag: brake72_4d1095227290 X-Filterd-Recvd-Size: 5249 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:34:16 +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=9jHZ5GBv8es5xhWOYPp8bxpNJzE+ReAs7wgmc5S+gNQ=; b=kqmrBljnmjaTQvkFMi1WHooSuA 0QUGbNxPu826EVcm6Lisk4YJeN/cmFioWhhmvI5Ht9FRuJ5FI48bubHzDj43/Jm2yluBYF9Dw1m2Q NCpx86vk0VZNMZ36YaDN66SivObYsJFcvyP4BYwdcsKH2yc+W7Q+oS79RrmAxmK9dOZs+a5sOyCco p0vD8Sxh0gr50U27O6CEW8neQxQNZWqg5MxMHHQ5eaIkqnzRIZs8f54ATCKtCazKyGfoyhnWYDUjz 2RC4RB+Nn5ib2cjZscK1pg4cXzxUvaJnsb996ggqJLTXoHbeY6rI5vVeBMf8tCUtkoR1SIqSOXdkf MzdUImBQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDgY-0007cM-NC; Thu, 29 Oct 2020 19:34:10 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 12/19] mm: Pass a sleep state to put_and_wait_on_page_locked Date: Thu, 29 Oct 2020 19:33:58 +0000 Message-Id: <20201029193405.29125-13-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: This is prep work for the next patch, but I think at least one of the current callers would prefer a killable sleep to an uninterruptible one. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 3 +-- mm/filemap.c | 7 +++++-- mm/huge_memory.c | 4 ++-- mm/migrate.c | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index bb6692001028..b5baaf1347e2 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -699,8 +699,7 @@ static inline int wait_on_page_locked_killable(struct= page *page) return wait_on_page_bit_killable(compound_head(page), PG_locked); } =20 -extern void put_and_wait_on_page_locked(struct page *page); - +int put_and_wait_on_page_locked(struct page *page, int state); void wait_on_page_writeback(struct page *page); extern void end_page_writeback(struct page *page); void wait_for_stable_page(struct page *page); diff --git a/mm/filemap.c b/mm/filemap.c index 91145e33635d..215729048cbd 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1369,20 +1369,23 @@ static int wait_on_page_locked_async(struct page = *page, /** * put_and_wait_on_page_locked - Drop a reference and wait for it to be = unlocked * @page: The page to wait for. + * @state: The sleep state (TASK_KILLABLE, TASK_UNINTERRUPTIBLE, etc). * * The caller should hold a reference on @page. They expect the page to * become unlocked relatively soon, but do not wish to hold up migration * (for example) by holding the reference while waiting for the page to * come unlocked. After this function returns, the caller should not * dereference @page. + * + * Return: 0 if the page was unlocked or -EINTR if interrupted by a sign= al. */ -void put_and_wait_on_page_locked(struct page *page) +int put_and_wait_on_page_locked(struct page *page, int state) { wait_queue_head_t *q; =20 page =3D compound_head(page); q =3D page_waitqueue(page); - wait_on_page_bit_common(q, page, PG_locked, TASK_UNINTERRUPTIBLE, DROP)= ; + return wait_on_page_bit_common(q, page, PG_locked, state, DROP); } =20 /** diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 03374ec61b45..580afce93d4a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1432,7 +1432,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *v= mf, pmd_t pmd) if (!get_page_unless_zero(page)) goto out_unlock; spin_unlock(vmf->ptl); - put_and_wait_on_page_locked(page); + put_and_wait_on_page_locked(page, TASK_UNINTERRUPTIBLE); goto out; } =20 @@ -1468,7 +1468,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *v= mf, pmd_t pmd) if (!get_page_unless_zero(page)) goto out_unlock; spin_unlock(vmf->ptl); - put_and_wait_on_page_locked(page); + put_and_wait_on_page_locked(page, TASK_UNINTERRUPTIBLE); goto out; } =20 diff --git a/mm/migrate.c b/mm/migrate.c index 39663dfbc273..a50bbb0e029b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -335,7 +335,7 @@ void __migration_entry_wait(struct mm_struct *mm, pte= _t *ptep, if (!get_page_unless_zero(page)) goto out; pte_unmap_unlock(ptep, ptl); - put_and_wait_on_page_locked(page); + put_and_wait_on_page_locked(page, TASK_UNINTERRUPTIBLE); return; out: pte_unmap_unlock(ptep, ptl); @@ -369,7 +369,7 @@ void pmd_migration_entry_wait(struct mm_struct *mm, p= md_t *pmd) if (!get_page_unless_zero(page)) goto unlock; spin_unlock(ptl); - put_and_wait_on_page_locked(page); + put_and_wait_on_page_locked(page, TASK_UNINTERRUPTIBLE); return; unlock: spin_unlock(ptl); --=20 2.28.0