mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Qu Wenruo <wqu@suse.com>, Ritesh Harjani <riteshh@linux.ibm.com>,
	Anand Jain <anand.jain@oracle.com>,
	David Sterba <dsterba@suse.com>, Sasha Levin <sashal@kernel.org>,
	linux-btrfs@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 29/31] btrfs: fix the filemap_range_has_page() call in btrfs_punch_hole_lock_range()
Date: Sun,  4 Jul 2021 19:10:41 -0400	[thread overview]
Message-ID: <20210704231043.1491209-29-sashal@kernel.org> (raw)
In-Reply-To: <20210704231043.1491209-1-sashal@kernel.org>

From: Qu Wenruo <wqu@suse.com>

[ Upstream commit 0528476b6ac7832f31e2ed740a57ae31316b124e ]

[BUG]
With current subpage RW support, the following script can hang the fs
with 64K page size.

 # mkfs.btrfs -f -s 4k $dev
 # mount $dev -o nospace_cache $mnt
 # fsstress -w -n 50 -p 1 -s 1607749395 -d $mnt

The kernel will do an infinite loop in btrfs_punch_hole_lock_range().

[CAUSE]
In btrfs_punch_hole_lock_range() we:

- Truncate page cache range
- Lock extent io tree
- Wait any ordered extents in the range.

We exit the loop until we meet all the following conditions:

- No ordered extent in the lock range
- No page is in the lock range

The latter condition has a pitfall, it only works for sector size ==
PAGE_SIZE case.

While can't handle the following subpage case:

  0       32K     64K     96K     128K
  |       |///////||//////|       ||

lockstart=32K
lockend=96K - 1

In this case, although the range crosses 2 pages,
truncate_pagecache_range() will invalidate no page at all, but only zero
the [32K, 96K) range of the two pages.

Thus filemap_range_has_page(32K, 96K-1) will always return true, thus we
will never meet the loop exit condition.

[FIX]
Fix the problem by doing page alignment for the lock range.

Function filemap_range_has_page() has already handled lend < lstart
case, we only need to round up @lockstart, and round_down @lockend for
truncate_pagecache_range().

This modification should not change any thing for sector size ==
PAGE_SIZE case, as in that case our range is already page aligned.

Tested-by: Ritesh Harjani <riteshh@linux.ibm.com> # [ppc64]
Tested-by: Anand Jain <anand.jain@oracle.com> # [aarch64]
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/btrfs/file.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 41ad37f8062a..cfbe2961bd1d 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2444,6 +2444,17 @@ static int btrfs_punch_hole_lock_range(struct inode *inode,
 				       const u64 lockend,
 				       struct extent_state **cached_state)
 {
+	/*
+	 * For subpage case, if the range is not at page boundary, we could
+	 * have pages at the leading/tailing part of the range.
+	 * This could lead to dead loop since filemap_range_has_page()
+	 * will always return true.
+	 * So here we need to do extra page alignment for
+	 * filemap_range_has_page().
+	 */
+	const u64 page_lockstart = round_up(lockstart, PAGE_SIZE);
+	const u64 page_lockend = round_down(lockend + 1, PAGE_SIZE) - 1;
+
 	while (1) {
 		struct btrfs_ordered_extent *ordered;
 		int ret;
@@ -2463,7 +2474,7 @@ static int btrfs_punch_hole_lock_range(struct inode *inode,
 		    (ordered->file_offset + ordered->len <= lockstart ||
 		     ordered->file_offset > lockend)) &&
 		     !filemap_range_has_page(inode->i_mapping,
-					     lockstart, lockend)) {
+					     page_lockstart, page_lockend)) {
 			if (ordered)
 				btrfs_put_ordered_extent(ordered);
 			break;
-- 
2.30.2


  parent reply	other threads:[~2021-07-04 23:15 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-04 23:10 [PATCH AUTOSEL 4.19 01/31] spi: Make of_register_spi_device also set the fwnode Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 02/31] media: s5p: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 03/31] media: sh_vou: " Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 04/31] media: sti/bdisp: " Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 05/31] spi: spi-loopback-test: Fix 'tx_buf' might be 'rx_buf' Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 06/31] spi: spi-topcliff-pch: Fix potential double free in pch_spi_process_messages() Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 07/31] spi: omap-100k: Fix the length judgment problem Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 08/31] regulator: uniphier: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 09/31] crypto: nx - add " Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 10/31] media: cpia2: fix memory leak in cpia2_usb_probe Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 11/31] media: cobalt: fix race condition in setting HPD Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 12/31] media: pvrusb2: fix warning in pvr2_i2c_core_done Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 13/31] crypto: qat - check return code of qat_hal_rd_rel_reg() Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 14/31] crypto: qat - remove unused macro in FW loader Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 15/31] sched/fair: Fix ascii art by relpacing tabs Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 16/31] media: em28xx: Fix possible memory leak of em28xx struct Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 17/31] media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 18/31] media: bt8xx: Fix a missing check bug in bt878_probe Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 19/31] media: st-hva: Fix potential NULL pointer dereferences Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 20/31] media: dvd_usb: memory leak in cinergyt2_fe_attach Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 21/31] mmc: via-sdmmc: add a check against NULL pointer dereference Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 22/31] crypto: shash - avoid comparing pointers to exported functions under CFI Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 23/31] media: dvb_net: avoid speculation from net slot Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 24/31] media: siano: fix device register error path Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 25/31] media: imx-csi: Skip first few frames from a BT.656 source Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 26/31] btrfs: fix error handling in __btrfs_update_delayed_inode Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 27/31] btrfs: abort transaction if we fail to update the delayed inode Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 28/31] btrfs: make Private2 lifespan more consistent Sasha Levin
2021-07-04 23:10 ` Sasha Levin [this message]
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 30/31] btrfs: disable build on platforms having page size 256K Sasha Levin
2021-07-04 23:10 ` [PATCH AUTOSEL 4.19 31/31] regulator: da9052: Ensure enough delay time for .set_voltage_time_sel Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210704231043.1491209-29-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=anand.jain@oracle.com \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=riteshh@linux.ibm.com \
    --cc=stable@vger.kernel.org \
    --cc=wqu@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®