From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Wei Fang <fangwei1@huawei.com>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH 4.4 41/49] fs/dcache.c: avoid soft-lockup in dput()
Date: Sun, 14 Aug 2016 22:23:41 +0200 [thread overview]
Message-ID: <20160814202304.758344311@linuxfoundation.org> (raw)
In-Reply-To: <20160814202302.493206349@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Fang <fangwei1@huawei.com>
commit 47be61845c775643f1aa4d2a54343549f943c94c upstream.
We triggered soft-lockup under stress test which
open/access/write/close one file concurrently on more than
five different CPUs:
WARN: soft lockup - CPU#0 stuck for 11s! [who:30631]
...
[<ffffffc0003986f8>] dput+0x100/0x298
[<ffffffc00038c2dc>] terminate_walk+0x4c/0x60
[<ffffffc00038f56c>] path_lookupat+0x5cc/0x7a8
[<ffffffc00038f780>] filename_lookup+0x38/0xf0
[<ffffffc000391180>] user_path_at_empty+0x78/0xd0
[<ffffffc0003911f4>] user_path_at+0x1c/0x28
[<ffffffc00037d4fc>] SyS_faccessat+0xb4/0x230
->d_lock trylock may failed many times because of concurrently
operations, and dput() may execute a long time.
Fix this by replacing cpu_relax() with cond_resched().
dput() used to be sleepable, so make it sleepable again
should be safe.
Signed-off-by: Wei Fang <fangwei1@huawei.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/dcache.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -578,7 +578,6 @@ static struct dentry *dentry_kill(struct
failed:
spin_unlock(&dentry->d_lock);
- cpu_relax();
return dentry; /* try again with same dentry */
}
@@ -752,6 +751,8 @@ void dput(struct dentry *dentry)
return;
repeat:
+ might_sleep();
+
rcu_read_lock();
if (likely(fast_dput(dentry))) {
rcu_read_unlock();
@@ -783,8 +784,10 @@ repeat:
kill_it:
dentry = dentry_kill(dentry);
- if (dentry)
+ if (dentry) {
+ cond_resched();
goto repeat;
+ }
}
EXPORT_SYMBOL(dput);
next prev parent reply other threads:[~2016-08-14 20:25 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20160814202407uscas1p163bf70e2ff3a45b1cb089c7603e89f4a@uscas1p1.samsung.com>
2016-08-14 20:23 ` [PATCH 4.4 00/49] 4.4.18-stable review Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 01/49] tcp: make challenge acks less predictable Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 02/49] tcp: enable per-socket rate limiting of all challenge acks Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 03/49] ipv4: reject RTNH_F_DEAD and RTNH_F_LINKDOWN from user space Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 04/49] bonding: set carrier off for devices created through netlink Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 05/49] net: bgmac: Fix infinite loop in bgmac_dma_tx_add() Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 06/49] net/irda: fix NULL pointer dereference on memory allocation failure Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 07/49] qed: Fix setting/clearing bit in completion bitmap Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 08/49] tcp: consider recv buf for the initial window scale Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 09/49] ipath: Restrict use of the write() interface Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 10/49] scsi: ignore errors from scsi_dh_add_device() Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 11/49] PNP: Add Haswell-ULT to Intel MCH size workaround Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 12/49] PNP: Add Broadwell " Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 13/49] HID: sony: do not bail out when the sixaxis refuses the output report Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 14/49] x86/mm/32: Enable full randomization on i386 and X86_32 Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 17/49] arm: oabi compat: add missing access checks Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 18/49] KEYS: 64-bit MIPS needs to use compat_sys_keyctl for 32-bit userspace Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 19/49] Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL" Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 20/49] apparmor: fix ref count leak when profile sha1 hash is read Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 21/49] random: strengthen input validation for RNDADDTOENTCNT Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 22/49] devpts: clean up interface to pty drivers Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 23/49] x86/mm/pat: Add support of non-default PAT MSR setting Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 24/49] x86/mm/pat: Add pat_disable() interface Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 25/49] x86/mm/pat: Replace cpu_has_pat with boot_cpu_has() Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 26/49] x86/mtrr: Fix Xorg crashes in Qemu sessions Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 27/49] x86/mtrr: Fix PAT init handling when MTRR is disabled Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 28/49] x86/xen, pat: Remove PAT table init code from Xen Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 29/49] x86/pat: Document the PAT initialization sequence Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 30/49] x86/mm/pat: Fix BUG_ON() in mmap_mem() on QEMU/i386 Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 31/49] drm/i915: Pretend cursor is always on for ILK-style WM calculations (v2) Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 32/49] mm: memcontrol: fix cgroup creation failure after many small jobs Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 33/49] mm: memcontrol: fix swap counter leak on swapout from offline cgroup Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 34/49] mm: memcontrol: fix memcg id ref counter on swap charge move Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 35/49] x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 36/49] block: fix use-after-free in seq file Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 37/49] sysv, ipc: fix security-layer leaking Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 38/49] fuse: fsync() did not return IO errors Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 39/49] fuse: fuse_flush must check mapping->flags for errors Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 40/49] fuse: fix wrong assignment of ->flags in fuse_send_init() Greg Kroah-Hartman
2016-08-14 20:23 ` Greg Kroah-Hartman [this message]
2016-08-14 20:23 ` [PATCH 4.4 42/49] crypto: gcm - Filter out async ghash if necessary Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 43/49] crypto: scatterwalk - Fix test in scatterwalk_done Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 44/49] ext4: check for extents that wrap around Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 45/49] ext4: fix deadlock during page writeback Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 46/49] ext4: dont call ext4_should_journal_data() on the journal inode Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 47/49] ext4: validate s_reserved_gdt_blocks on mount Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 48/49] ext4: short-cut orphan cleanup on error Greg Kroah-Hartman
2016-08-14 20:23 ` [PATCH 4.4 49/49] ext4: fix reference counting bug on block allocation error Greg Kroah-Hartman
[not found] ` <57b11059.c4ebc20a.96bf2.6869@mx.google.com>
2016-08-15 7:56 ` [PATCH 4.4 00/49] 4.4.18-stable review Greg Kroah-Hartman
2016-08-15 13:05 ` Guenter Roeck
2016-08-16 4:02 ` Shuah Khan
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=20160814202304.758344311@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=fangwei1@huawei.com \
--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;
as well as URLs for NNTP newsgroup(s).