Theodore Ts'o c755e25135 ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea() ... The xattr_sem deadlock problems fixed in commit 2e81a4eeed: "ext4: avoid deadlock when expanding inode size" didn't include the use of xattr_sem in fs/ext4/inline.c. With the addition of project quota which added a new extra inode field, this exposed deadlocks in the inline_data code similar to the ones fixed by 2e81a4eeed. The deadlock can be reproduced via: dmesg -n 7 mke2fs -t ext4 -O inline_data -Fq -I 256 /dev/vdc 32768 mount -t ext4 -o debug_want_extra_isize=24 /dev/vdc /vdc mkdir /vdc/a umount /vdc mount -t ext4 /dev/vdc /vdc echo foo > /vdc/a/foo and looks like this: [ 11.158815] [ 11.160276] ============================================= [ 11.161960] [ INFO: possible recursive locking detected ] [ 11.161960] 4.10.0-rc3-00015-g011b30a8a3cf #160 Tainted: G W [ 11.161960] --------------------------------------------- [ 11.161960] bash/2519 is trying to acquire lock: [ 11.161960] (&ei->xattr_sem){++++..}, at: [<c1225a4b>] ext4_expand_extra_isize_ea+0x3d/0x4cd [ 11.161960] [ 11.161960] but task is already holding lock: [ 11.161960] (&ei->xattr_sem){++++..}, at: [<c1227941>] ext4_try_add_inline_entry+0x3a/0x152 [ 11.161960] [ 11.161960] other info that might help us debug this: [ 11.161960] Possible unsafe locking scenario: [ 11.161960] [ 11.161960] CPU0 [ 11.161960] ---- [ 11.161960] lock(&ei->xattr_sem); [ 11.161960] lock(&ei->xattr_sem); [ 11.161960] [ 11.161960] *** DEADLOCK *** [ 11.161960] [ 11.161960] May be due to missing lock nesting notation [ 11.161960] [ 11.161960] 4 locks held by bash/2519: [ 11.161960] #0: (sb_writers#3){.+.+.+}, at: [<c11a2414>] mnt_want_write+0x1e/0x3e [ 11.161960] #1: (&type->i_mutex_dir_key){++++++}, at: [<c119508b>] path_openat+0x338/0x67a [ 11.161960] #2: (jbd2_handle){++++..}, at: [<c123314a>] start_this_handle+0x582/0x622 [ 11.161960] #3: (&ei->xattr_sem){++++..}, at: [<c1227941>] ext4_try_add_inline_entry+0x3a/0x152 [ 11.161960] [ 11.161960] stack backtrace: [ 11.161960] CPU: 0 PID: 2519 Comm: bash Tainted: G W 4.10.0-rc3-00015-g011b30a8a3cf #160 [ 11.161960] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.1-1 04/01/2014 [ 11.161960] Call Trace: [ 11.161960] dump_stack+0x72/0xa3 [ 11.161960] __lock_acquire+0xb7c/0xcb9 [ 11.161960] ? kvm_clock_read+0x1f/0x29 [ 11.161960] ? __lock_is_held+0x36/0x66 [ 11.161960] ? __lock_is_held+0x36/0x66 [ 11.161960] lock_acquire+0x106/0x18a [ 11.161960] ? ext4_expand_extra_isize_ea+0x3d/0x4cd [ 11.161960] down_write+0x39/0x72 [ 11.161960] ? ext4_expand_extra_isize_ea+0x3d/0x4cd [ 11.161960] ext4_expand_extra_isize_ea+0x3d/0x4cd [ 11.161960] ? _raw_read_unlock+0x22/0x2c [ 11.161960] ? jbd2_journal_extend+0x1e2/0x262 [ 11.161960] ? __ext4_journal_get_write_access+0x3d/0x60 [ 11.161960] ext4_mark_inode_dirty+0x17d/0x26d [ 11.161960] ? ext4_add_dirent_to_inline.isra.12+0xa5/0xb2 [ 11.161960] ext4_add_dirent_to_inline.isra.12+0xa5/0xb2 [ 11.161960] ext4_try_add_inline_entry+0x69/0x152 [ 11.161960] ext4_add_entry+0xa3/0x848 [ 11.161960] ? __brelse+0x14/0x2f [ 11.161960] ? _raw_spin_unlock_irqrestore+0x44/0x4f [ 11.161960] ext4_add_nondir+0x17/0x5b [ 11.161960] ext4_create+0xcf/0x133 [ 11.161960] ? ext4_mknod+0x12f/0x12f [ 11.161960] lookup_open+0x39e/0x3fb [ 11.161960] ? __wake_up+0x1a/0x40 [ 11.161960] ? lock_acquire+0x11e/0x18a [ 11.161960] path_openat+0x35c/0x67a [ 11.161960] ? sched_clock_cpu+0xd7/0xf2 [ 11.161960] do_filp_open+0x36/0x7c [ 11.161960] ? _raw_spin_unlock+0x22/0x2c [ 11.161960] ? __alloc_fd+0x169/0x173 [ 11.161960] do_sys_open+0x59/0xcc [ 11.161960] SyS_open+0x1d/0x1f [ 11.161960] do_int80_syscall_32+0x4f/0x61 [ 11.161960] entry_INT80_32+0x2f/0x2f [ 11.161960] EIP: 0xb76ad469 [ 11.161960] EFLAGS: 00000286 CPU: 0 [ 11.161960] EAX: ffffffda EBX: 08168ac8 ECX: 00008241 EDX: 000001b6 [ 11.161960] ESI: b75e46bc EDI: b7755000 EBP: bfbdb108 ESP: bfbdafc0 [ 11.161960] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b Cc: stable@vger.kernel.org # 3.10 (requires 2e81a4eeed as a prereq) Reported-by: George Spelvin <linux@sciencehorizons.net> Signed-off-by: Theodore Ts'o <tytso@mit.edu>		2017-01-11 21:50:46 -05:00
..
9p	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
adfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
affs	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
afs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
autofs4	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
befs	befs: add NFS export support	2016-12-22 11:25:24 +00:00
bfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
btrfs	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
cachefiles	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
ceph	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
cifs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
coda	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
configfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
cramfs
crypto	fscrypt: make fscrypt_operations.key_prefix a string	2017-01-08 01:03:41 -05:00
debugfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
devpts	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
dlm	ktime: Get rid of ktime_equal()	2016-12-25 17:21:23 +01:00
ecryptfs	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
efivarfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
efs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
exofs	exofs: don't mess with simple_write_{begin,end}	2016-12-10 14:25:19 -05:00
exportfs	exportfs: be careful to only return expected errors.	2016-10-06 09:07:44 -04:00
ext2	ext2: Return BH_New buffers for zeroed blocks	2016-12-26 20:29:24 -08:00
ext4	ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea()	2017-01-11 21:50:46 -05:00
f2fs	fscrypt: make fscrypt_operations.key_prefix a string	2017-01-08 01:03:41 -05:00
fat	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
freevxfs
fscache
fuse	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
gfs2	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
hfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
hfsplus	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
hostfs	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
hpfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
hugetlbfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
isofs	Merge branch 'for-4.10/block' of git://git.kernel.dk/linux-block	2016-12-13 10:19:16 -08:00
jbd2	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
jffs2	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
jfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
kernfs	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
lockd	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
minix	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
ncpfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
nfs	ktime: Get rid of ktime_equal()	2016-12-25 17:21:23 +01:00
nfs_common	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
nfsd	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
nilfs2	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
nls
notify	Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit	2017-01-05 23:06:06 -08:00
ntfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
ocfs2	ktime: Get rid of the union	2016-12-25 17:21:22 +01:00
omfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
openpromfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
orangefs	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
overlayfs	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
proc	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
pstore	Improvements and fixes to pstore subsystem:	2016-12-13 09:16:11 -08:00
qnx4
qnx6
quota	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2016-12-19 08:23:53 -08:00
ramfs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
reiserfs	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
romfs
squashfs	Merge uncontroversial parts of branch 'readlink' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2016-12-17 19:16:12 -08:00
sysfs	Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2016-10-14 12:18:50 -07:00
sysv	vfs: remove ".readlink = generic_readlink" assignments	2016-12-09 16:45:04 +01:00
tracefs	fs: Replace CURRENT_TIME with current_time() for inode timestamps	2016-09-27 21:06:21 -04:00
ubifs	fscrypt: make fscrypt_operations.key_prefix a string	2017-01-08 01:03:41 -05:00
udf	block,fs: untangle fs.h and blk_types.h	2016-11-01 09:43:26 -06:00
ufs	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
xfs	xfs: fix max_retries _show and _store functions	2017-01-03 20:34:17 -08:00
aio.c	ktime: Get rid of the union	2016-12-25 17:21:22 +01:00
anon_inodes.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
attr.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
bad_inode.c	bad_inode: add missing i_op initializers	2016-12-09 11:57:43 +01:00
binfmt_aout.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
binfmt_elf_fdpic.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
binfmt_elf.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
binfmt_em86.c
binfmt_flat.c
binfmt_misc.c	fs: Replace current_fs_time() with current_time()	2016-09-27 21:06:22 -04:00
binfmt_script.c
block_dev.c	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2017-01-04 09:03:37 -08:00
buffer.c	clean_bdev_aliases: Prevent cleaning blocks that are not in block range	2017-01-02 09:35:14 -07:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
compat.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
coredump.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
dax.c	dax: Call ->iomap_begin without entry lock during dax fault	2016-12-26 20:29:25 -08:00
dcache.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
dcookies.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
direct-io.c	xfs: updates for 4.10-rc1	2016-12-14 21:35:31 -08:00
drop_caches.c
eventfd.c
eventpoll.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
exec.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
fcntl.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
fhandle.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
file_table.c	constify alloc_file()	2016-12-05 19:01:16 -05:00
file.c	fs/file: more unsigned file descriptors	2016-09-27 18:47:38 -04:00
filesystems.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
fs_pin.c
fs_struct.c
fs-writeback.c	fs/fs-writeback.c: remove redundant if check	2016-12-12 18:55:08 -08:00
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
internal.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-12-17 18:44:00 -08:00
ioctl.c	vfs: call vfs_clone_file_range() under freeze protection	2016-12-16 11:02:54 +01:00
iomap.c	xfs: updates for 4.10-rc1	2016-12-14 21:35:31 -08:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-12-16 10:24:44 -08:00
Kconfig.binfmt	docs: fix locations of several documents that got moved	2016-10-24 08:12:35 -02:00
libfs.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
locks.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
Makefile	logfs: remove from tree	2016-12-14 23:48:11 -05:00
mbcache.c	mbcache: document that "find" functions only return reusable entries	2016-12-03 15:55:01 -05:00
mount.h	vfs: add path_is_mountpoint() helper	2016-12-03 20:51:35 -05:00
mpage.c	fs: Add helper to clean bdev aliases under a bh and use it	2016-11-04 14:34:47 -06:00
namei.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
namespace.c	Merge branch 'work.namespace' into for-linus	2016-12-22 23:04:31 -05:00
no-block.c
nsfs.c	net: add an ioctl to get a socket network namespace	2016-10-31 10:56:36 -04:00
open.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
pipe.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
pnode.c	reorganize do_make_slave()	2016-12-16 16:30:49 -05:00
pnode.h	mnt: Add a per mount namespace limit on the number of mounts	2016-09-30 12:46:48 -05:00
posix_acl.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2016-10-10 20:16:43 -07:00
proc_namespace.c
read_write.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
readdir.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
select.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
seq_file.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
signalfd.c
splice.c	splice: reinstate SIGPIPE/EPIPE handling	2016-12-21 10:59:34 -08:00
stack.c
stat.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
statfs.c	vfs: misc struct path constification	2016-12-05 19:03:49 -05:00
super.c	quota: Remove dqonoff_mutex	2016-11-30 08:38:07 +01:00
sync.c
timerfd.c	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01:00
userfaultfd.c	mm: join struct fault_env and vm_fault	2016-12-14 16:04:09 -08:00
utimes.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
xattr.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00