public inbox for stable@vger.kernel.org
 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 5.10 62/70] btrfs: fix the filemap_range_has_page() call in btrfs_punch_hole_lock_range()
Date: Sun,  4 Jul 2021 19:07:55 -0400	[thread overview]
Message-ID: <20210704230804.1490078-62-sashal@kernel.org> (raw)
In-Reply-To: <20210704230804.1490078-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 ffa48ac98d1e..fdff99afb0be 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2485,6 +2485,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;
@@ -2505,7 +2516,7 @@ static int btrfs_punch_hole_lock_range(struct inode *inode,
 		    (ordered->file_offset + ordered->num_bytes <= 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:13 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-04 23:06 [PATCH AUTOSEL 5.10 01/70] spi: Make of_register_spi_device also set the fwnode Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 02/70] Add a reference to ucounts for each cred Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 03/70] staging: media: rkvdec: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 04/70] media: marvel-ccic: fix some issues when getting pm_runtime Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 05/70] media: mdk-mdp: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:06 ` [PATCH AUTOSEL 5.10 06/70] media: s5p: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 07/70] media: am437x: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 08/70] media: sh_vou: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 09/70] media: mtk-vcodec: fix PM runtime get logic Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 10/70] media: s5p-jpeg: fix pm_runtime_get_sync() usage count Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 11/70] media: sunxi: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 12/70] media: sti/bdisp: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 13/70] media: exynos4-is: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 14/70] media: exynos-gsc: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 15/70] spi: spi-loopback-test: Fix 'tx_buf' might be 'rx_buf' Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 16/70] spi: spi-topcliff-pch: Fix potential double free in pch_spi_process_messages() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 17/70] spi: omap-100k: Fix the length judgment problem Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 18/70] regulator: uniphier: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 19/70] sched/core: Initialize the idle task with preemption disabled Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 20/70] hwrng: exynos - Fix runtime PM imbalance on error Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 21/70] crypto: nx - add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 22/70] regmap-i2c: Set regmap max raw r/w from quirks Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 23/70] media: sti: fix obj-$(config) targets Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 24/70] media: cpia2: fix memory leak in cpia2_usb_probe Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 25/70] media: cobalt: fix race condition in setting HPD Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 26/70] media: hevc: Fix dependent slice segment flags Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 27/70] media: pvrusb2: fix warning in pvr2_i2c_core_done Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 28/70] media: imx: imx7_mipi_csis: Fix logging of only error event counters Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 29/70] crypto: qat - check return code of qat_hal_rd_rel_reg() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 30/70] crypto: qat - remove unused macro in FW loader Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 31/70] crypto: qce: skcipher: Fix incorrect sg count for dma transfers Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 32/70] arm64: perf: Convert snprintf to sysfs_emit Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 33/70] sched/fair: Fix ascii art by relpacing tabs Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 34/70] media: i2c: ov2659: Use clk_{prepare_enable,disable_unprepare}() to set xvclk on/off Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 35/70] media: bt878: do not schedule tasklet when it is not setup Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 36/70] media: em28xx: Fix possible memory leak of em28xx struct Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 37/70] media: hantro: Fix .buf_prepare Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 38/70] media: cedrus: " Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 39/70] media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 40/70] media: bt8xx: Fix a missing check bug in bt878_probe Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 41/70] media: st-hva: Fix potential NULL pointer dereferences Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 42/70] crypto: hisilicon/sec - fixup 3des minimum key size declaration Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 43/70] Makefile: fix GDB warning with CONFIG_RELR Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 44/70] media: dvd_usb: memory leak in cinergyt2_fe_attach Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 45/70] memstick: rtsx_usb_ms: fix UAF Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 46/70] mmc: sdhci-sprd: use sdhci_sprd_writew Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 47/70] mmc: via-sdmmc: add a check against NULL pointer dereference Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 48/70] spi: meson-spicc: fix a wrong goto jump for avoiding memory leak Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 49/70] spi: meson-spicc: fix memory leak in meson_spicc_probe Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 50/70] crypto: shash - avoid comparing pointers to exported functions under CFI Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 51/70] media: dvb_net: avoid speculation from net slot Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 52/70] media: siano: fix device register error path Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 53/70] media: imx-csi: Skip first few frames from a BT.656 source Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 54/70] hwmon: (max31790) Report correct current pwm duty cycles Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 55/70] hwmon: (max31790) Fix pwmX_enable attributes Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 56/70] drivers/perf: fix the missed ida_simple_remove() in ddr_perf_probe() Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 57/70] KVM: PPC: Book3S HV: Fix TLB management on SMT8 POWER9 and POWER10 processors Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 58/70] btrfs: fix error handling in __btrfs_update_delayed_inode Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 59/70] btrfs: abort transaction if we fail to update the delayed inode Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 60/70] btrfs: sysfs: fix format string for some discard stats Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 61/70] btrfs: make Private2 lifespan more consistent Sasha Levin
2021-07-04 23:07 ` Sasha Levin [this message]
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 63/70] btrfs: don't clear page extent mapped if we're not invalidating the full page Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 64/70] btrfs: disable build on platforms having page size 256K Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 65/70] locking/lockdep: Fix the dep path printing for backwards BFS Sasha Levin
2021-07-04 23:07 ` [PATCH AUTOSEL 5.10 66/70] lockding/lockdep: Avoid to find wrong lock dep path in check_irq_usage() Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 67/70] KVM: s390: get rid of register asm usage Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 68/70] regulator: mt6358: Fix vdram2 .vsel_mask Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 69/70] regulator: da9052: Ensure enough delay time for .set_voltage_time_sel Sasha Levin
2021-07-04 23:08 ` [PATCH AUTOSEL 5.10 70/70] media: Fix Media Controller API config checks 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=20210704230804.1490078-62-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