From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 05/35] fast_dput(): handle underflows gracefully
Date: Mon, 22 Jan 2024 10:12:02 -0500 [thread overview]
Message-ID: <20240122151302.995456-5-sashal@kernel.org> (raw)
In-Reply-To: <20240122151302.995456-1-sashal@kernel.org>
From: Al Viro <viro@zeniv.linux.org.uk>
[ Upstream commit 504e08cebe1d4e1efe25f915234f646e74a364a8 ]
If refcount is less than 1, we should just warn, unlock dentry and
return true, so that the caller doesn't try to do anything else.
Taking care of that leaves the rest of "lockref_put_return() has
failed" case equivalent to "decrement refcount and rejoin the
normal slow path after the point where we grab ->d_lock".
NOTE: lockref_put_return() is strictly a fastpath thing - unlike
the rest of lockref primitives, it does not contain a fallback.
Caller (and it looks like fast_dput() is the only legitimate one
in the entire kernel) has to do that itself. Reasons for
lockref_put_return() failures:
* ->d_lock held by somebody
* refcount <= 0
* ... or an architecture not supporting lockref use of
cmpxchg - sparc, anything non-SMP, config with spinlock debugging...
We could add a fallback, but it would be a clumsy API - we'd have
to distinguish between:
(1) refcount > 1 - decremented, lock not held on return
(2) refcount < 1 - left alone, probably no sense to hold the lock
(3) refcount is 1, no cmphxcg - decremented, lock held on return
(4) refcount is 1, cmphxcg supported - decremented, lock *NOT* held
on return.
We want to return with no lock held in case (4); that's the whole point of that
thing. We very much do not want to have the fallback in case (3) return without
a lock, since the caller might have to retake it in that case.
So it wouldn't be more convenient than doing the fallback in the caller and
it would be very easy to screw up, especially since the test coverage would
suck - no way to test (3) and (4) on the same kernel build.
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/dcache.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/dcache.c b/fs/dcache.c
index cf871a81f4fd..422c440b492a 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -762,12 +762,12 @@ static inline bool fast_dput(struct dentry *dentry)
*/
if (unlikely(ret < 0)) {
spin_lock(&dentry->d_lock);
- if (dentry->d_lockref.count > 1) {
- dentry->d_lockref.count--;
+ if (WARN_ON_ONCE(dentry->d_lockref.count <= 0)) {
spin_unlock(&dentry->d_lock);
return true;
}
- return false;
+ dentry->d_lockref.count--;
+ goto locked;
}
/*
@@ -825,6 +825,7 @@ static inline bool fast_dput(struct dentry *dentry)
* else could have killed it and marked it dead. Either way, we
* don't need to do anything else.
*/
+locked:
if (dentry->d_lockref.count) {
spin_unlock(&dentry->d_lock);
return true;
--
2.43.0
next prev parent reply other threads:[~2024-01-22 15:13 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-22 15:11 [PATCH AUTOSEL 5.15 01/35] f2fs: fix to check return value of f2fs_reserve_new_block() Sasha Levin
2024-01-22 15:11 ` [PATCH AUTOSEL 5.15 02/35] ALSA: hda: Refer to correct stream index at loops Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 03/35] ASoC: doc: Fix undefined SND_SOC_DAPM_NOPM argument Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 04/35] drm: Fix color LUT rounding Sasha Levin
2024-01-22 15:12 ` Sasha Levin [this message]
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 06/35] RDMA/IPoIB: Fix error code return in ipoib_mcast_join Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 07/35] drm/amd/display: Fix tiled display misalignment Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 08/35] f2fs: fix write pointers on zoned device after roll forward Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 09/35] drm/amd/display: Fix writeback_info never got updated Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 10/35] drm/drm_file: fix use of uninitialized variable Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 11/35] drm/framebuffer: Fix " Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 12/35] drm/mipi-dsi: Fix detach call without attach Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 13/35] media: stk1160: Fixed high volume of stk1160_dbg messages Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 14/35] media: rockchip: rga: fix swizzling for RGB formats Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 15/35] PCI: add INTEL_HDA_ARL to pci_ids.h Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 16/35] ALSA: hda: Intel: add HDA_ARL PCI ID support Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 17/35] ALSA: hda: intel-dspcfg: add filters for ARL-S and ARL Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 18/35] media: rkisp1: Drop IRQF_SHARED Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 19/35] hwmon: (pc87360) Bounds check data->innr usage Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 20/35] f2fs: fix to tag gcing flag on page during block migration Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 21/35] drm/exynos: Call drm_atomic_helper_shutdown() at shutdown/unbind time Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 22/35] IB/ipoib: Fix mcast list locking Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 23/35] media: ddbridge: fix an error code problem in ddb_probe Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 24/35] media: i2c: imx335: Fix hblank min/max values Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 25/35] drm/msm/dpu: Ratelimit framedone timeout msgs Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 26/35] drm/amdgpu: fix ftrace event amdgpu_bo_move always move on same heap Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 27/35] clk: hi3620: Fix memory leak in hi3620_mmc_clk_init() Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 28/35] clk: mmp: pxa168: Fix memory leak in pxa168_clk_init() Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 29/35] watchdog: it87_wdt: Keep WDTCTRL bit 3 unmodified for IT8784/IT8786 Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 30/35] drm/amd/display: make flip_timestamp_in_us a 64-bit variable Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 31/35] clk: imx: scu: Fix memory leak in __imx_clk_gpr_scu() Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 32/35] clk: imx: clk-imx8qxp: fix LVDS bypass, pixel and phy clocks Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 33/35] drm/amdgpu: Let KFD sync with VM fences Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 34/35] drm/amdgpu: Drop 'fence' check in 'to_amdgpu_amdkfd_fence()' Sasha Levin
2024-01-22 15:12 ` [PATCH AUTOSEL 5.15 35/35] ALSA: hda/conexant: Fix headset auto detect fail in cx8070 and SN6140 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=20240122151302.995456-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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