From patchwork Thu Apr 10 01:49:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 14045746 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FFA5C369A2 for ; Thu, 10 Apr 2025 01:50:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D951A6B02A2; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D76E6B024C; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5530E6B0280; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0F6E06B02A2 for ; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4D02EBB057 for ; Thu, 10 Apr 2025 01:49:58 +0000 (UTC) X-FDA: 83316453276.19.B6E0EED Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf18.hostedemail.com (Postfix) with ESMTP id 5E2911C0003 for ; Thu, 10 Apr 2025 01:49:56 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="Yw//8RAk"; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine); spf=none (imf18.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744249796; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vTKYqeK6owf1W0PFCfkmcr/WH0zrnKyGAnGwrj+ptGw=; b=QKjRHhzEhvwxerP5kubfugzD4O5ynj8K4Wh073GG/AiecDGhN4CdmZpHp+UGuzsyKCZRwn Nk6wZ3T04lScAVVgG2d9zyOV8p9MVtJFEfG3n24RbK+7HgfkEWmeEFjPvSKM5M3MqtW642 kn0kwVoFRZ/uRBNXrcbeU7YeoFbirZU= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="Yw//8RAk"; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine); spf=none (imf18.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744249796; a=rsa-sha256; cv=none; b=KUn9Csjf9q03Yf7U5fCjzIB7/zyJy63hTHg9H7EVndoOhxAl+HeHJm5IYq20nTpqgsudD2 sAW99et9y5HKHNMpOSvRdV+POL9i08WYyIWC5Ljhw2UZjoVblTKFUTy5TCz8A5U9g00MJN 04Eabpq7pkPFoHwzLni3UaCe/VmLkCc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=vTKYqeK6owf1W0PFCfkmcr/WH0zrnKyGAnGwrj+ptGw=; b=Yw//8RAkVfn5FzwjQqq2jaRoNX VzPuh+AjIaEx6KIP7Yx5LcTOpptHkTAeDWIPwy+3tzS2/smqJLeuJ+oBb0yAZFkX3RQwVre04CAOy a1WKN5Xl1vTRpgwK25wuPi7rvQ8FCimEw1FU4mZqd2fWe/JTz0rzjT5sCLHgi2bG4VQOIC8Z0y8lZ JKIjgKSt1QMD4NwFRfaEyrgRsIPjAgaT6u40ehpHsnitQqNhMD+2mDVAnGN7nuAuV7fzKRhjJw21X UVL9ZoHR0ZGuINF0W2kc4CH+LJIblsNeZlApOVZpSxxzfcjInWmE96/RUpvF4viwNPZTJiLAFSKyO f7WZbJkg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1u2h35-00000008yvO-47o1; Thu, 10 Apr 2025 01:49:47 +0000 From: Luis Chamberlain To: brauner@kernel.org, jack@suse.cz, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, riel@surriel.com Cc: dave@stgolabs.net, willy@infradead.org, hannes@cmpxchg.org, oliver.sang@intel.com, david@redhat.com, axboe@kernel.dk, hare@suse.de, david@fromorbit.com, djwong@kernel.org, ritesh.list@gmail.com, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, gost.dev@samsung.com, p.raghav@samsung.com, da.gomez@samsung.com, mcgrof@kernel.org Subject: [PATCH v2 5/8] fs/jbd2: use sleeping version of __find_get_block() Date: Wed, 9 Apr 2025 18:49:42 -0700 Message-ID: <20250410014945.2140781-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410014945.2140781-1-mcgrof@kernel.org> References: <20250410014945.2140781-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 5E2911C0003 X-Stat-Signature: x7n18cr8suq3o61mr74recwbkbu3zpx3 X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1744249796-462313 X-HE-Meta: U2FsdGVkX19OzRPYKx8SBzLQOpv8P/DQeejlivhkE8AYVDiDXjZaKrlevMDHvixJR7CaxIxPA6RkBoIkYr4Iemfb83WQXxFPhH4xSWADnwzQjCJwaJtMXFW/Km+5SUoae9trYXpvl8LonaP7QdCcGUO72CeDHhcR5U/FciBow0kuITmeWuRIB+Tut05PU29ZtVn85+ZNlvLwXiKRBhRJ22f0bkTbxI/qqaWhEXcvePdsTlxKTnlwCAqyL3PqnruVwgCKG8rw5slEYHIcHlx7SYHR5vWPXAwC3w1FU/2/ySYprNBj+l5pjQ53of3RN/ThIGb8kPG4dQtHJkMWD3JwOiHF9mAu+T6S7jQB6/O0hNNo7qYUAHQA/lxA5hdExdexopZB3fpaDjwxqnOONqjJuOGIC6s4TpZ9u6MWfXKWElgKEXven4ftT+tq9sXZ25K5WUe1po4LHOlUkcrmjd/uVIEiix837zhiOFL3vUHJtWXF9r89HnFVDOCndmkg1A4YftPJTKK6ehGvkBynqxAs1Z4mTGCKNMRPWYSdeQExXRXzo7oJJHLwU9FHjtqHGf1SMFJFUZl2if829pccc/dy67OHdGKJBY8OahEXKzfI9Tw+gUcn+r/gWyWNSFNNibdcJ7dEDorp/F5ZHlU42EF4c+3SEPjJJo2cFbSudJM8/dCVggxQ5LMnBsyyYVLqz0eq6SpwRyr5goMaaowWeYZomjkRLwRziCR6FHA2CSvx59HOFoW7ARoxTxfYNJJIOotypAS7ZyGwggG2ZdXx9JtnCsJY65qmFV9VHSCQJ7njA1sG9d2QctMmJvSn5SY1S2yMl39D62rblRAi5sUZjIo/BcHLj5qXEpPIeUS0ao89f9HNKnNeB7paLBD35Via5RbzXe0yMdDlWvtwSaprNqQpuEegIVtCWISAT57jseVm1HqkxLuitvhNsVu4Dqsr0oiAe21zSbxXlBwWDkJFGDE fpY+0pn8 WI/f1sTowCNZO6Wc0Z5trKnrKv3StvTUdoL2235YtyZXkEfbsfYadx8dnJ8aro8h7/xffOcFusgfFZHxnzllN+ux7x9QcLu8F9EBHFM88r5CbVxK7pMpygLtpVJAagy6XhhmVo0Bg0DZ3v7UDYtGdtIwHGK0/9z6oiKEduRZCxk2cnjH76ZM7kYRof1KA3Ulm/Jp+IN1MqcvGSuJUigfNdXj+9+xg0jHik4fCiVM0DJlR5cpFMjf2Lvjd/nmUZEQgUNfeTAuajfYNC5OFpMafrnPxn4ITx8bHMR8+ND9qtCNtrC0oPuW5kPu+hdK944OloVD0Xg2+kQ/Magq2sFc829EQM4Cx1P/crbjpqsABzkLQnLdiT3Fju7XHKzvhRMZvqcXt+DbDIKNj02sp6nDu1H0gvgKdv3YnpCwTTnLsYFyUlckK0iFN3GxSPcIJQHMciJjwE+M4JqRPLzzHwy8fmu0FRO/2KtrFPuiKWJselJuQzB8F7JbQ+udGc9/suxKshKC2BWBEe7pgpfhSpL2AHbSnD5vu83ZokXq9Y1n7kbVq3b99aboPbCIvvRxV0ptspalmGtVAluelifZQxPhxEc2pH66oyLMRBQ0m 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: List-Subscribe: List-Unsubscribe: From: Davidlohr Bueso Convert to the new nonatomic flavor to benefit from potential performance benefits and adapt in the future vs migration such that semantics are kept. - jbd2_journal_revoke(): can sleep (has might_sleep() in the beginning) - jbd2_journal_cancel_revoke(): only used from do_get_write_access() and do_get_create_access() which do sleep. So can sleep. - jbd2_clear_buffer_revoked_flags() - only called from journal commit code which sleeps. So can sleep. Suggested-by: Jan Kara Signed-off-by: Davidlohr Bueso Signed-off-by: Luis Chamberlain --- fs/jbd2/revoke.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 0cf0fddbee81..1467f6790747 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -345,7 +345,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, bh = bh_in; if (!bh) { - bh = __find_get_block(bdev, blocknr, journal->j_blocksize); + bh = __find_get_block_nonatomic(bdev, blocknr, + journal->j_blocksize); if (bh) BUFFER_TRACE(bh, "found on hash"); } @@ -355,7 +356,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, /* If there is a different buffer_head lying around in * memory anywhere... */ - bh2 = __find_get_block(bdev, blocknr, journal->j_blocksize); + bh2 = __find_get_block_nonatomic(bdev, blocknr, + journal->j_blocksize); if (bh2) { /* ... and it has RevokeValid status... */ if (bh2 != bh && buffer_revokevalid(bh2)) @@ -464,7 +466,8 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh) * state machine will get very upset later on. */ if (need_cancel) { struct buffer_head *bh2; - bh2 = __find_get_block(bh->b_bdev, bh->b_blocknr, bh->b_size); + bh2 = __find_get_block_nonatomic(bh->b_bdev, bh->b_blocknr, + bh->b_size); if (bh2) { if (bh2 != bh) clear_buffer_revoked(bh2); @@ -492,9 +495,9 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal) struct jbd2_revoke_record_s *record; struct buffer_head *bh; record = (struct jbd2_revoke_record_s *)list_entry; - bh = __find_get_block(journal->j_fs_dev, - record->blocknr, - journal->j_blocksize); + bh = __find_get_block_nonatomic(journal->j_fs_dev, + record->blocknr, + journal->j_blocksize); if (bh) { clear_buffer_revoked(bh); __brelse(bh);