From: Sasha Levin <sashal@kernel.org>
To: patches@lists.linux.dev, stable@vger.kernel.org
Cc: Zhang Yi <yi.zhang@huawei.com>, Theodore Ts'o <tytso@mit.edu>,
Sasha Levin <sashal@kernel.org>,
adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH AUTOSEL 6.12 51/93] ext4: prevent stale extent cache entries caused by concurrent get es_cache
Date: Sun, 1 Jun 2025 19:33:18 -0400 [thread overview]
Message-ID: <20250601233402.3512823-51-sashal@kernel.org> (raw)
In-Reply-To: <20250601233402.3512823-1-sashal@kernel.org>
From: Zhang Yi <yi.zhang@huawei.com>
[ Upstream commit f22a0ef2231a7d8374bb021eb86404d0e9de5a02 ]
The EXT4_IOC_GET_ES_CACHE and EXT4_IOC_PRECACHE_EXTENTS currently
invokes ext4_ext_precache() to preload the extent cache without holding
the inode's i_rwsem. This can result in stale extent cache entries when
competing with operations such as ext4_collapse_range() which calls
ext4_ext_remove_space() or ext4_ext_shift_extents().
The problem arises when ext4_ext_remove_space() temporarily releases
i_data_sem due to insufficient journal credits. During this interval, a
concurrent EXT4_IOC_GET_ES_CACHE or EXT4_IOC_PRECACHE_EXTENTS may cache
extent entries that are about to be deleted. As a result, these cached
entries become stale and inconsistent with the actual extents.
Loading the extents cache without holding the inode's i_rwsem or the
mapping's invalidate_lock is not permitted besides during the writeback.
Fix this by holding the i_rwsem during EXT4_IOC_GET_ES_CACHE and
EXT4_IOC_PRECACHE_EXTENTS.
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20250423085257.122685-6-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
Based on my comprehensive analysis of this commit and comparison with
the historical similar commits, here is my assessment: **YES** This
commit should be backported to stable kernel trees for the following
reasons: ## Analysis Summary ### **Type of Bug Fix** This commit
addresses a **race condition** that can lead to **stale extent cache
entries** in the ext4 filesystem. The race occurs between: 1.
`EXT4_IOC_GET_ES_CACHE` and `EXT4_IOC_PRECACHE_EXTENTS` operations 2.
Concurrent `ext4_collapse_range()` operations that call
`ext4_ext_remove_space()` or `ext4_ext_shift_extents()` ### **Technical
Details of the Race** The problem stems from the fact that
`ext4_ext_remove_space()` temporarily releases `i_data_sem` when journal
credits are insufficient. During this critical window: - The extent
precaching operations (`ext4_ext_precache()`) can cache extent entries -
These cached entries are about to be deleted by the ongoing
collapse/shift operation - Result: **stale, inconsistent extent cache
entries** ### **Code Changes Analysis** The fix is **minimal and
surgical**: **In `fs/ext4/extents.c` (ext4_get_es_cache function):**
```c if (fieinfo->fi_flags & FIEMAP_FLAG_CACHE) { +
inode_lock_shared(inode); error = ext4_ext_precache(inode); +
inode_unlock_shared(inode); if (error) return error; ``` **In
`fs/ext4/ioctl.c` (EXT4_IOC_PRECACHE_EXTENTS case):** ```c case
EXT4_IOC_PRECACHE_EXTENTS: - return ext4_ext_precache(inode); +{ + int
ret; + + inode_lock_shared(inode); + ret = ext4_ext_precache(inode); +
inode_unlock_shared(inode); + return ret; +} ``` ### **Why This
Qualifies for Backporting** 1. **Important Bug Fix**: Stale extent cache
entries can lead to filesystem inconsistencies and potential data
corruption scenarios. 2. **Minimal Risk**: The changes are extremely
small and contained: - Only adds proper locking around existing
operations - Uses shared locking (`inode_lock_shared`) which allows
concurrent readers - No algorithmic changes or new features 3. **Follows
Established Patterns**: Similar commits in the repository (marked with
"Backport Status: YES") show this pattern: - Similar commit #2: "ext4:
fix data races when using cached status extents" - also deals with
extent cache consistency - Similar commit #3: "ext4: convert to
exclusive lock while inserting delalloc extents" - addresses similar
race conditions with proper locking - Similar commit #4: "ext4: do not
polute the extents cache while shifting extents" - prevents extent cache
corruption during shift operations 4. **Clear Impact**: The commit
message explicitly states this prevents "stale extent cache entries"
which can cause inconsistency with actual extents. 5. **Contained to
Subsystem**: Changes are limited to ext4 extent management and don't
affect other kernel subsystems. 6. **Stable Backport Indicators**: - No
"Cc: stable@" tag is present, but the nature of the fix (race condition
leading to corruption) makes it a good candidate - The fix follows
ext4's established locking protocol requirements - Multiple similar
extent cache race condition fixes have been backported ### **Risk
Assessment** - **Very Low Regression Risk**: Only adds locking
protection, doesn't change functional behavior - **Well-understood
Fix**: The locking pattern matches established ext4 conventions -
**Limited Scope**: Only affects two specific ioctl code paths This
commit represents exactly the type of fix that stable trees are meant
for: a small, safe fix for a real bug that can cause filesystem
corruption without introducing new functionality or architectural
changes.
fs/ext4/extents.c | 2 ++
fs/ext4/ioctl.c | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 4d7729321c80e..b805daa94206b 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5045,7 +5045,9 @@ int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo,
}
if (fieinfo->fi_flags & FIEMAP_FLAG_CACHE) {
+ inode_lock_shared(inode);
error = ext4_ext_precache(inode);
+ inode_unlock_shared(inode);
if (error)
return error;
fieinfo->fi_flags &= ~FIEMAP_FLAG_CACHE;
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 1c77400bd88e1..c87094357e3d7 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -1511,8 +1511,14 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return 0;
}
case EXT4_IOC_PRECACHE_EXTENTS:
- return ext4_ext_precache(inode);
+ {
+ int ret;
+ inode_lock_shared(inode);
+ ret = ext4_ext_precache(inode);
+ inode_unlock_shared(inode);
+ return ret;
+ }
case FS_IOC_SET_ENCRYPTION_POLICY:
if (!ext4_has_feature_encrypt(sb))
return -EOPNOTSUPP;
--
2.39.5
next prev parent reply other threads:[~2025-06-01 23:36 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-01 23:32 [PATCH AUTOSEL 6.12 01/93] drm/amd/display: disable DPP RCG before DPP CLK enable Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 02/93] drm/bridge: select DRM_KMS_HELPER for AUX_BRIDGE Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 03/93] drm/amdgpu/gfx6: fix CSIB handling Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 04/93] media: imx-jpeg: Check decoding is ongoing for motion-jpeg Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 05/93] drm/rockchip: inno-hdmi: Fix video timing HSYNC/VSYNC polarity setting for rk3036 Sasha Levin
2025-06-01 23:32 ` Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 06/93] drm/dp: add option to disable zero sized address only transactions Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 07/93] sunrpc: update nextcheck time when adding new cache entries Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 08/93] drm/amdgpu: Fix API status offset for MES queue reset Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 09/93] drm/amd/display: DCN32 null data check Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 10/93] drm/bridge: analogix_dp: Add irq flag IRQF_NO_AUTOEN instead of calling disable_irq() Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 11/93] workqueue: Fix race condition in wq->stats incrementation Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 12/93] drm/panel/sharp-ls043t1le01: Use _multi variants Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 13/93] exfat: fix double free in delayed_free Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 14/93] drm/bridge: anx7625: enable HPD interrupts Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 15/93] arm64/cpuinfo: only show one cpu's info in c_show() Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 16/93] drm/panthor: Don't update MMU_INT_MASK in panthor_mmu_irq_handler() Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 17/93] drm/bridge: anx7625: change the gpiod_set_value API Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 18/93] exfat: do not clear volume dirty flag during sync Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 19/93] drm/amdgpu/gfx11: fix CSIB handling Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 20/93] media: nuvoton: npcm-video: Fix stuck due to no video signal error Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 21/93] drm/nouveau: fix hibernate on disabled GPU Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 22/93] media: i2c: imx334: Enable runtime PM before sub-device registration Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 23/93] drm/amd/display: Avoid divide by zero by initializing dummy pitch to 1 Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 24/93] drm/nouveau/gsp: fix rm shutdown wait condition Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 25/93] drm/msm/hdmi: add runtime PM calls to DDC transfer function Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 26/93] media: uapi: v4l: Fix V4L2_TYPE_IS_OUTPUT condition Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 27/93] drm/amd/display: Add NULL pointer checks in dm_force_atomic_commit() Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 28/93] media: verisilicon: Enable wide 4K in AV1 decoder Sasha Levin
2025-06-01 23:32 ` Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 29/93] drm/amd/display: Skip to enable dsc if it has been off Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 30/93] dlm: use SHUT_RDWR for SCTP shutdown Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 31/93] drm/msm/a6xx: Increase HFI response timeout Sasha Levin
2025-06-01 23:32 ` [PATCH AUTOSEL 6.12 32/93] drm/amd/display: Do Not Consider DSC if Valid Config Not Found Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 33/93] media: i2c: imx334: Fix runtime PM handling in remove function Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 34/93] drm/amdgpu/gfx10: fix CSIB handling Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 35/93] drm: panel-orientation-quirks: Add ZOTAC Gaming Zone Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 36/93] media: ccs-pll: Better validate VT PLL branch Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 37/93] media: uapi: v4l: Change V4L2_TYPE_IS_CAPTURE condition Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 38/93] drm/amd/display: fix zero value for APU watermark_c Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 39/93] drm/ttm/tests: fix incorrect assert in ttm_bo_unreserve_bulk() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 40/93] drm/amdgpu/gfx7: fix CSIB handling Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 41/93] ext4: ext4: unify EXT4_EX_NOCACHE|NOFAIL flags in ext4_ext_remove_space() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 42/93] jfs: fix array-index-out-of-bounds read in add_missing_indices Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 43/93] media: ti: cal: Fix wrong goto on error path Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 44/93] drm/amd/display: Correct SSC enable detection for DCN351 Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 45/93] media: rkvdec: h264: Use bytesperline and buffer height as virstride Sasha Levin
2025-06-01 23:33 ` Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 46/93] media: cec: extron-da-hd-4k-plus: Fix Wformat-truncation Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 47/93] media: rkvdec: Initialize the m2m context before the controls Sasha Levin
2025-06-01 23:33 ` Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 48/93] drm/amdgpu: fix MES GFX mask Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 49/93] drm/amdgpu: Disallow partition query during reset Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 50/93] sunrpc: fix race in cache cleanup causing stale nextcheck time Sasha Levin
2025-06-01 23:33 ` Sasha Levin [this message]
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 52/93] drm/amdgpu/gfx8: fix CSIB handling Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 53/93] drm/amd/display: disable EASF narrow filter sharpening Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 54/93] drm/amdgpu/gfx9: fix CSIB handling Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 55/93] jfs: Fix null-ptr-deref in jfs_ioc_trim Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 56/93] media: renesas: vsp1: Fix media bus code setup on RWPF source pad Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 57/93] drm/msm/dpu: don't select single flush for active CTL blocks Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 58/93] drm/amdkfd: Set SDMA_RLCx_IB_CNTL/SWITCH_INSIDE_IB Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 59/93] media: tc358743: ignore video while HPD is low Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 60/93] media: platform: exynos4-is: Add hardware sync wait to fimc_is_hw_change_mode() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 61/93] media: i2c: imx334: update mode_3840x2160_regs array Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 62/93] nios2: force update_mmu_cache on spurious tlb-permission--related pagefaults Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 63/93] media: rcar-vin: Fix stride setting for RAW8 formats Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 64/93] drm/xe/uc: Remove static from loop variable Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 65/93] media: qcom: venus: Fix uninitialized variable warning Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 66/93] drm/panel: simple: Add POWERTIP PH128800T004-ZZA01 panel entry Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 67/93] Make 'cc-option' work correctly for the -Wno-xyzzy pattern Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 68/93] ACPI: bus: Bail out if acpi_kobj registration fails Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 69/93] selftests: harness: Mark functions without prototypes static Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 70/93] pmdomain: ti: Fix STANDBY handling of PER power domain Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 71/93] PM: runtime: fix denying of auto suspend in pm_suspend_timer_fn() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 72/93] ASoC: amd: yc: Add quirk for Lenovo Yoga Pro 7 14ASP9 Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 73/93] thermal/drivers/qcom/tsens: Update conditions to strictly evaluate for IP v2+ Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 74/93] clocksource/drivers/timer-tegra186: Fix watchdog self-pinging Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 75/93] gpio: pxa: Make irq_chip immutable Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 76/93] gpio: grgpio: " Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 77/93] gpio: xgene-sb: " Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 78/93] genirq: Retain disable depth for managed interrupts across CPU hotplug Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 79/93] mmc: sdhci-esdhc-imx: Save tuning value when card stays powered in suspend Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 80/93] mmc: Add quirk to disable DDR50 tuning Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 81/93] ASoC: intel/sdw_utils: Assign initial value in asoc_sdw_rt_amp_spk_rtd_init() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 82/93] clocksource: Fix the CPUs' choice in the watchdog per CPU verification Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 83/93] ACPICA: Avoid sequence overread in call to strncmp() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 84/93] ACPICA: utilities: Fix overflow check in vsnprintf() Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 85/93] ACPI: EC: Add device to acpi_ec_no_wakeup[] qurik list Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 86/93] ALSA: seq: Remove unused snd_seq_queue_client_leave_cells Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 87/93] spi: axi-spi-engine: wait for completion in setup Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 88/93] cpufreq: Force sync policy boost with global boost on sysfs update Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 89/93] power: supply: bq27xxx: Retrieve again when busy Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 90/93] pmdomain: core: Reset genpd->states to avoid freeing invalid data Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 91/93] tools/nolibc: use intmax definitions from compiler Sasha Levin
2025-06-01 23:33 ` [PATCH AUTOSEL 6.12 92/93] gpio: ds4520: don't check the 'ngpios' property in the driver Sasha Levin
2025-06-01 23:34 ` [PATCH AUTOSEL 6.12 93/93] ASoC: tas2770: Power cycle amp on ISENSE/VSENSE change 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=20250601233402.3512823-51-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=adilger.kernel@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=yi.zhang@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.