2009-12-17 19:24:27 -07:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2008 Red Hat, Inc., Eric Paris <eparis@redhat.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
* any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; see the file COPYING. If not, write to
|
|
|
|
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* fsnotify inode mark locking/lifetime/and refcnting
|
|
|
|
*
|
|
|
|
* REFCNT:
|
2013-07-08 16:59:46 -06:00
|
|
|
* The group->recnt and mark->refcnt tell how many "things" in the kernel
|
|
|
|
* currently are referencing the objects. Both kind of objects typically will
|
|
|
|
* live inside the kernel with a refcnt of 2, one for its creation and one for
|
|
|
|
* the reference a group and a mark hold to each other.
|
|
|
|
* If you are holding the appropriate locks, you can take a reference and the
|
|
|
|
* object itself is guaranteed to survive until the reference is dropped.
|
2009-12-17 19:24:27 -07:00
|
|
|
*
|
|
|
|
* LOCKING:
|
2013-07-08 16:59:46 -06:00
|
|
|
* There are 3 locks involved with fsnotify inode marks and they MUST be taken
|
|
|
|
* in order as follows:
|
2009-12-17 19:24:27 -07:00
|
|
|
*
|
2013-07-08 16:59:46 -06:00
|
|
|
* group->mark_mutex
|
2009-12-17 19:24:27 -07:00
|
|
|
* mark->lock
|
|
|
|
* inode->i_lock
|
|
|
|
*
|
2013-07-08 16:59:46 -06:00
|
|
|
* group->mark_mutex protects the marks_list anchored inside a given group and
|
|
|
|
* each mark is hooked via the g_list. It also protects the groups private
|
|
|
|
* data (i.e group limits).
|
|
|
|
|
|
|
|
* mark->lock protects the marks attributes like its masks and flags.
|
|
|
|
* Furthermore it protects the access to a reference of the group that the mark
|
|
|
|
* is assigned to as well as the access to a reference of the inode/vfsmount
|
|
|
|
* that is being watched by the mark.
|
2009-12-17 19:24:27 -07:00
|
|
|
*
|
|
|
|
* inode->i_lock protects the i_fsnotify_marks list anchored inside a
|
|
|
|
* given inode and each mark is hooked via the i_list. (and sorta the
|
|
|
|
* free_i_list)
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* LIFETIME:
|
|
|
|
* Inode marks survive between when they are added to an inode and when their
|
|
|
|
* refcnt==0.
|
|
|
|
*
|
|
|
|
* The inode mark can be cleared for a number of different reasons including:
|
|
|
|
* - The inode is unlinked for the last time. (fsnotify_inode_remove)
|
|
|
|
* - The inode is being evicted from cache. (fsnotify_inode_delete)
|
|
|
|
* - The fs the inode is on is unmounted. (fsnotify_inode_delete/fsnotify_unmount_inodes)
|
|
|
|
* - Something explicitly requests that it be removed. (fsnotify_destroy_mark)
|
|
|
|
* - The fsnotify_group associated with the mark is going away and all such marks
|
|
|
|
* need to be cleaned up. (fsnotify_clear_marks_by_group)
|
|
|
|
*
|
|
|
|
* Worst case we are given an inode and need to clean up all the marks on that
|
|
|
|
* inode. We take i_lock and walk the i_fsnotify_marks safely. For each
|
|
|
|
* mark on the list we take a reference (so the mark can't disappear under us).
|
|
|
|
* We remove that mark form the inode's list of marks and we add this mark to a
|
2013-07-08 16:59:46 -06:00
|
|
|
* private list anchored on the stack using i_free_list; we walk i_free_list
|
|
|
|
* and before we destroy the mark we make sure that we dont race with a
|
|
|
|
* concurrent destroy_group by getting a ref to the marks group and taking the
|
|
|
|
* groups mutex.
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
* Very similarly for freeing by group, except we use free_g_list.
|
|
|
|
*
|
|
|
|
* This has the very interesting property of being able to run concurrently with
|
|
|
|
* any (or all) other directions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kernel.h>
|
2010-07-28 08:18:38 -06:00
|
|
|
#include <linux/kthread.h>
|
2009-12-17 19:24:27 -07:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/mutex.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/spinlock.h>
|
2010-07-28 08:18:38 -06:00
|
|
|
#include <linux/srcu.h>
|
2009-12-17 19:24:27 -07:00
|
|
|
|
2011-07-26 17:09:06 -06:00
|
|
|
#include <linux/atomic.h>
|
2009-12-17 19:24:27 -07:00
|
|
|
|
|
|
|
#include <linux/fsnotify_backend.h>
|
|
|
|
#include "fsnotify.h"
|
|
|
|
|
2010-07-28 08:18:38 -06:00
|
|
|
struct srcu_struct fsnotify_mark_srcu;
|
|
|
|
static DEFINE_SPINLOCK(destroy_lock);
|
|
|
|
static LIST_HEAD(destroy_list);
|
|
|
|
static DECLARE_WAIT_QUEUE_HEAD(destroy_waitq);
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
void fsnotify_get_mark(struct fsnotify_mark *mark)
|
|
|
|
{
|
|
|
|
atomic_inc(&mark->refcnt);
|
|
|
|
}
|
|
|
|
|
|
|
|
void fsnotify_put_mark(struct fsnotify_mark *mark)
|
|
|
|
{
|
2011-06-14 09:29:47 -06:00
|
|
|
if (atomic_dec_and_test(&mark->refcnt)) {
|
|
|
|
if (mark->group)
|
|
|
|
fsnotify_put_group(mark->group);
|
2009-12-17 19:24:27 -07:00
|
|
|
mark->free_mark(mark);
|
2011-06-14 09:29:47 -06:00
|
|
|
}
|
2009-12-17 19:24:27 -07:00
|
|
|
}
|
|
|
|
|
2014-12-12 17:58:36 -07:00
|
|
|
/* Calculate mask of events for a list of marks */
|
|
|
|
u32 fsnotify_recalc_mask(struct hlist_head *head)
|
|
|
|
{
|
|
|
|
u32 new_mask = 0;
|
|
|
|
struct fsnotify_mark *mark;
|
|
|
|
|
|
|
|
hlist_for_each_entry(mark, head, obj_list)
|
|
|
|
new_mask |= mark->mask;
|
|
|
|
return new_mask;
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
/*
|
|
|
|
* Any time a mark is getting freed we end up here.
|
|
|
|
* The caller had better be holding a reference to this mark so we don't actually
|
|
|
|
* do the final put under the mark->lock
|
|
|
|
*/
|
2011-06-14 09:29:52 -06:00
|
|
|
void fsnotify_destroy_mark_locked(struct fsnotify_mark *mark,
|
|
|
|
struct fsnotify_group *group)
|
2009-12-17 19:24:27 -07:00
|
|
|
{
|
2009-12-17 19:24:27 -07:00
|
|
|
struct inode *inode = NULL;
|
2009-12-17 19:24:27 -07:00
|
|
|
|
2011-06-14 09:29:52 -06:00
|
|
|
BUG_ON(!mutex_is_locked(&group->mark_mutex));
|
|
|
|
|
2011-06-14 09:29:48 -06:00
|
|
|
spin_lock(&mark->lock);
|
2009-12-17 19:24:27 -07:00
|
|
|
|
2010-07-28 08:18:38 -06:00
|
|
|
/* something else already called this function on this mark */
|
|
|
|
if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE)) {
|
2009-12-17 19:24:27 -07:00
|
|
|
spin_unlock(&mark->lock);
|
2011-06-14 09:29:51 -06:00
|
|
|
return;
|
2009-12-17 19:24:27 -07:00
|
|
|
}
|
|
|
|
|
2010-07-28 08:18:38 -06:00
|
|
|
mark->flags &= ~FSNOTIFY_MARK_FLAG_ALIVE;
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
if (mark->flags & FSNOTIFY_MARK_FLAG_INODE) {
|
2014-12-12 17:58:36 -07:00
|
|
|
inode = mark->inode;
|
2010-04-21 14:49:38 -06:00
|
|
|
fsnotify_destroy_inode_mark(mark);
|
2009-12-17 19:24:27 -07:00
|
|
|
} else if (mark->flags & FSNOTIFY_MARK_FLAG_VFSMOUNT)
|
|
|
|
fsnotify_destroy_vfsmount_mark(mark);
|
2009-12-17 19:24:27 -07:00
|
|
|
else
|
|
|
|
BUG();
|
|
|
|
|
|
|
|
list_del_init(&mark->g_list);
|
2015-07-21 17:06:53 -06:00
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
spin_unlock(&mark->lock);
|
2011-06-14 09:29:52 -06:00
|
|
|
|
fsnotify: change locking order
On Mon, Aug 01, 2011 at 04:38:22PM -0400, Eric Paris wrote:
>
> I finally built and tested a v3.0 kernel with these patches (I know I'm
> SOOOOOO far behind). Not what I hoped for:
>
> > [ 150.937798] VFS: Busy inodes after unmount of tmpfs. Self-destruct in 5 seconds. Have a nice day...
> > [ 150.945290] BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
> > [ 150.946012] IP: [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] PGD 2bf9e067 PUD 2bf9f067 PMD 0
> > [ 150.946012] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
> > [ 150.946012] CPU 0
> > [ 150.946012] Modules linked in: nfs lockd fscache auth_rpcgss nfs_acl sunrpc ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ext4 jbd2 crc16 joydev ata_piix i2c_piix4 pcspkr uinput ipv6 autofs4 usbhid [last unloaded: scsi_wait_scan]
> > [ 150.946012]
> > [ 150.946012] Pid: 2764, comm: syscall_thrash Not tainted 3.0.0+ #1 Red Hat KVM
> > [ 150.946012] RIP: 0010:[<ffffffff810ffd58>] [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] RSP: 0018:ffff88002c2e5df8 EFLAGS: 00010282
> > [ 150.946012] RAX: 000000004e370d9f RBX: 0000000000000000 RCX: ffff88003a029438
> > [ 150.946012] RDX: 0000000033630a5f RSI: 0000000000000000 RDI: ffff88003491c240
> > [ 150.946012] RBP: ffff88002c2e5e08 R08: 0000000000000000 R09: 0000000000000000
> > [ 150.946012] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a029428
> > [ 150.946012] R13: ffff88003a029428 R14: ffff88003a029428 R15: ffff88003499a610
> > [ 150.946012] FS: 00007f5a05420700(0000) GS:ffff88003f600000(0000) knlGS:0000000000000000
> > [ 150.946012] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
> > [ 150.946012] CR2: 0000000000000070 CR3: 000000002a662000 CR4: 00000000000006f0
> > [ 150.946012] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> > [ 150.946012] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> > [ 150.946012] Process syscall_thrash (pid: 2764, threadinfo ffff88002c2e4000, task ffff88002bfbc760)
> > [ 150.946012] Stack:
> > [ 150.946012] ffff88003a029438 ffff88003a029428 ffff88002c2e5e38 ffffffff81102f76
> > [ 150.946012] ffff88003a029438 ffff88003a029598 ffffffff8160f9c0 ffff88002c221250
> > [ 150.946012] ffff88002c2e5e68 ffffffff8115e9be ffff88002c2e5e68 ffff88003a029438
> > [ 150.946012] Call Trace:
> > [ 150.946012] [<ffffffff81102f76>] shmem_evict_inode+0x76/0x130
> > [ 150.946012] [<ffffffff8115e9be>] evict+0x7e/0x170
> > [ 150.946012] [<ffffffff8115ee40>] iput_final+0xd0/0x190
> > [ 150.946012] [<ffffffff8115ef33>] iput+0x33/0x40
> > [ 150.946012] [<ffffffff81180205>] fsnotify_destroy_mark_locked+0x145/0x160
> > [ 150.946012] [<ffffffff81180316>] fsnotify_destroy_mark+0x36/0x50
> > [ 150.946012] [<ffffffff81181937>] sys_inotify_rm_watch+0x77/0xd0
> > [ 150.946012] [<ffffffff815aca52>] system_call_fastpath+0x16/0x1b
> > [ 150.946012] Code: 67 4a 00 b8 e4 ff ff ff eb aa 66 0f 1f 84 00 00 00 00 00 55 48 89 e5 48 83 ec 10 48 89 1c 24 4c 89 64 24 08 48 8b 9f 40 05 00 00
> > [ 150.946012] 83 7b 70 00 74 1c 4c 8d a3 80 00 00 00 4c 89 e7 e8 d2 5d 4a
> > [ 150.946012] RIP [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] RSP <ffff88002c2e5df8>
> > [ 150.946012] CR2: 0000000000000070
>
> Looks at aweful lot like the problem from:
> http://www.spinics.net/lists/linux-fsdevel/msg46101.html
>
I tried to reproduce this bug with your test program, but without success.
However, if I understand correctly, this occurs since we dont hold any locks when
we call iput() in mark_destroy(), right?
With the patches you tested, iput() is also not called within any lock, since the
groups mark_mutex is released temporarily before iput() is called. This is, since
the original codes behaviour is similar.
However since we now have a mutex as the biggest lock, we can do what you
suggested (http://www.spinics.net/lists/linux-fsdevel/msg46107.html) and
call iput() with the mutex held to avoid the race.
The patch below implements this. It uses nested locking to avoid deadlock in case
we do the final iput() on an inode which still holds marks and thus would take
the mutex again when calling fsnotify_inode_delete() in destroy_inode().
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
2011-08-11 17:13:31 -06:00
|
|
|
if (inode && (mark->flags & FSNOTIFY_MARK_FLAG_OBJECT_PINNED))
|
|
|
|
iput(inode);
|
2015-07-21 17:06:53 -06:00
|
|
|
/* release lock temporarily */
|
|
|
|
mutex_unlock(&group->mark_mutex);
|
2009-12-17 19:24:27 -07:00
|
|
|
|
2010-07-28 08:18:38 -06:00
|
|
|
spin_lock(&destroy_lock);
|
2014-12-12 17:58:39 -07:00
|
|
|
list_add(&mark->g_list, &destroy_list);
|
2010-07-28 08:18:38 -06:00
|
|
|
spin_unlock(&destroy_lock);
|
|
|
|
wake_up(&destroy_waitq);
|
2015-07-21 17:06:53 -06:00
|
|
|
/*
|
|
|
|
* We don't necessarily have a ref on mark from caller so the above destroy
|
|
|
|
* may have actually freed it, unless this group provides a 'freeing_mark'
|
|
|
|
* function which must be holding a reference.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Some groups like to know that marks are being freed. This is a
|
|
|
|
* callback to the group function to let it know that this mark
|
|
|
|
* is being freed.
|
|
|
|
*/
|
|
|
|
if (group->ops->freeing_mark)
|
|
|
|
group->ops->freeing_mark(mark, group);
|
2009-12-17 19:24:27 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* __fsnotify_update_child_dentry_flags(inode);
|
|
|
|
*
|
|
|
|
* I really want to call that, but we can't, we have no idea if the inode
|
|
|
|
* still exists the second we drop the mark->lock.
|
|
|
|
*
|
|
|
|
* The next time an event arrive to this inode from one of it's children
|
|
|
|
* __fsnotify_parent will see that the inode doesn't care about it's
|
|
|
|
* children and will update all of these flags then. So really this
|
|
|
|
* is just a lazy update (and could be a perf win...)
|
|
|
|
*/
|
|
|
|
|
2011-06-14 09:29:47 -06:00
|
|
|
atomic_dec(&group->num_marks);
|
2015-07-21 17:06:53 -06:00
|
|
|
|
|
|
|
mutex_lock_nested(&group->mark_mutex, SINGLE_DEPTH_NESTING);
|
2011-06-14 09:29:52 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void fsnotify_destroy_mark(struct fsnotify_mark *mark,
|
|
|
|
struct fsnotify_group *group)
|
|
|
|
{
|
fsnotify: change locking order
On Mon, Aug 01, 2011 at 04:38:22PM -0400, Eric Paris wrote:
>
> I finally built and tested a v3.0 kernel with these patches (I know I'm
> SOOOOOO far behind). Not what I hoped for:
>
> > [ 150.937798] VFS: Busy inodes after unmount of tmpfs. Self-destruct in 5 seconds. Have a nice day...
> > [ 150.945290] BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
> > [ 150.946012] IP: [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] PGD 2bf9e067 PUD 2bf9f067 PMD 0
> > [ 150.946012] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
> > [ 150.946012] CPU 0
> > [ 150.946012] Modules linked in: nfs lockd fscache auth_rpcgss nfs_acl sunrpc ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ext4 jbd2 crc16 joydev ata_piix i2c_piix4 pcspkr uinput ipv6 autofs4 usbhid [last unloaded: scsi_wait_scan]
> > [ 150.946012]
> > [ 150.946012] Pid: 2764, comm: syscall_thrash Not tainted 3.0.0+ #1 Red Hat KVM
> > [ 150.946012] RIP: 0010:[<ffffffff810ffd58>] [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] RSP: 0018:ffff88002c2e5df8 EFLAGS: 00010282
> > [ 150.946012] RAX: 000000004e370d9f RBX: 0000000000000000 RCX: ffff88003a029438
> > [ 150.946012] RDX: 0000000033630a5f RSI: 0000000000000000 RDI: ffff88003491c240
> > [ 150.946012] RBP: ffff88002c2e5e08 R08: 0000000000000000 R09: 0000000000000000
> > [ 150.946012] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a029428
> > [ 150.946012] R13: ffff88003a029428 R14: ffff88003a029428 R15: ffff88003499a610
> > [ 150.946012] FS: 00007f5a05420700(0000) GS:ffff88003f600000(0000) knlGS:0000000000000000
> > [ 150.946012] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
> > [ 150.946012] CR2: 0000000000000070 CR3: 000000002a662000 CR4: 00000000000006f0
> > [ 150.946012] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> > [ 150.946012] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> > [ 150.946012] Process syscall_thrash (pid: 2764, threadinfo ffff88002c2e4000, task ffff88002bfbc760)
> > [ 150.946012] Stack:
> > [ 150.946012] ffff88003a029438 ffff88003a029428 ffff88002c2e5e38 ffffffff81102f76
> > [ 150.946012] ffff88003a029438 ffff88003a029598 ffffffff8160f9c0 ffff88002c221250
> > [ 150.946012] ffff88002c2e5e68 ffffffff8115e9be ffff88002c2e5e68 ffff88003a029438
> > [ 150.946012] Call Trace:
> > [ 150.946012] [<ffffffff81102f76>] shmem_evict_inode+0x76/0x130
> > [ 150.946012] [<ffffffff8115e9be>] evict+0x7e/0x170
> > [ 150.946012] [<ffffffff8115ee40>] iput_final+0xd0/0x190
> > [ 150.946012] [<ffffffff8115ef33>] iput+0x33/0x40
> > [ 150.946012] [<ffffffff81180205>] fsnotify_destroy_mark_locked+0x145/0x160
> > [ 150.946012] [<ffffffff81180316>] fsnotify_destroy_mark+0x36/0x50
> > [ 150.946012] [<ffffffff81181937>] sys_inotify_rm_watch+0x77/0xd0
> > [ 150.946012] [<ffffffff815aca52>] system_call_fastpath+0x16/0x1b
> > [ 150.946012] Code: 67 4a 00 b8 e4 ff ff ff eb aa 66 0f 1f 84 00 00 00 00 00 55 48 89 e5 48 83 ec 10 48 89 1c 24 4c 89 64 24 08 48 8b 9f 40 05 00 00
> > [ 150.946012] 83 7b 70 00 74 1c 4c 8d a3 80 00 00 00 4c 89 e7 e8 d2 5d 4a
> > [ 150.946012] RIP [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] RSP <ffff88002c2e5df8>
> > [ 150.946012] CR2: 0000000000000070
>
> Looks at aweful lot like the problem from:
> http://www.spinics.net/lists/linux-fsdevel/msg46101.html
>
I tried to reproduce this bug with your test program, but without success.
However, if I understand correctly, this occurs since we dont hold any locks when
we call iput() in mark_destroy(), right?
With the patches you tested, iput() is also not called within any lock, since the
groups mark_mutex is released temporarily before iput() is called. This is, since
the original codes behaviour is similar.
However since we now have a mutex as the biggest lock, we can do what you
suggested (http://www.spinics.net/lists/linux-fsdevel/msg46107.html) and
call iput() with the mutex held to avoid the race.
The patch below implements this. It uses nested locking to avoid deadlock in case
we do the final iput() on an inode which still holds marks and thus would take
the mutex again when calling fsnotify_inode_delete() in destroy_inode().
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
2011-08-11 17:13:31 -06:00
|
|
|
mutex_lock_nested(&group->mark_mutex, SINGLE_DEPTH_NESTING);
|
2011-06-14 09:29:52 -06:00
|
|
|
fsnotify_destroy_mark_locked(mark, group);
|
|
|
|
mutex_unlock(&group->mark_mutex);
|
2009-12-17 19:24:27 -07:00
|
|
|
}
|
|
|
|
|
2015-09-04 16:43:09 -06:00
|
|
|
void fsnotify_destroy_marks(struct hlist_head *head, spinlock_t *lock)
|
2014-12-12 17:58:36 -07:00
|
|
|
{
|
2015-09-04 16:43:09 -06:00
|
|
|
struct fsnotify_mark *mark;
|
2014-12-12 17:58:36 -07:00
|
|
|
|
2015-09-04 16:43:09 -06:00
|
|
|
while (1) {
|
|
|
|
/*
|
|
|
|
* We have to be careful since we can race with e.g.
|
|
|
|
* fsnotify_clear_marks_by_group() and once we drop 'lock',
|
|
|
|
* mark can get removed from the obj_list and destroyed. But
|
|
|
|
* we are holding mark reference so mark cannot be freed and
|
|
|
|
* calling fsnotify_destroy_mark() more than once is fine.
|
|
|
|
*/
|
|
|
|
spin_lock(lock);
|
|
|
|
if (hlist_empty(head)) {
|
|
|
|
spin_unlock(lock);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
mark = hlist_entry(head->first, struct fsnotify_mark, obj_list);
|
|
|
|
/*
|
|
|
|
* We don't update i_fsnotify_mask / mnt_fsnotify_mask here
|
|
|
|
* since inode / mount is going away anyway. So just remove
|
|
|
|
* mark from the list.
|
|
|
|
*/
|
|
|
|
hlist_del_init_rcu(&mark->obj_list);
|
|
|
|
fsnotify_get_mark(mark);
|
|
|
|
spin_unlock(lock);
|
|
|
|
fsnotify_destroy_mark(mark, mark->group);
|
2014-12-12 17:58:36 -07:00
|
|
|
fsnotify_put_mark(mark);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:33 -07:00
|
|
|
void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
|
|
|
|
{
|
|
|
|
assert_spin_locked(&mark->lock);
|
|
|
|
|
|
|
|
mark->mask = mask;
|
|
|
|
|
|
|
|
if (mark->flags & FSNOTIFY_MARK_FLAG_INODE)
|
|
|
|
fsnotify_set_inode_mark_mask_locked(mark, mask);
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:33 -07:00
|
|
|
void fsnotify_set_mark_ignored_mask_locked(struct fsnotify_mark *mark, __u32 mask)
|
|
|
|
{
|
|
|
|
assert_spin_locked(&mark->lock);
|
|
|
|
|
|
|
|
mark->ignored_mask = mask;
|
|
|
|
}
|
2009-12-17 19:24:33 -07:00
|
|
|
|
2014-11-13 16:19:33 -07:00
|
|
|
/*
|
|
|
|
* Sorting function for lists of fsnotify marks.
|
|
|
|
*
|
|
|
|
* Fanotify supports different notification classes (reflected as priority of
|
|
|
|
* notification group). Events shall be passed to notification groups in
|
|
|
|
* decreasing priority order. To achieve this marks in notification lists for
|
|
|
|
* inodes and vfsmounts are sorted so that priorities of corresponding groups
|
|
|
|
* are descending.
|
|
|
|
*
|
|
|
|
* Furthermore correct handling of the ignore mask requires processing inode
|
|
|
|
* and vfsmount marks of each group together. Using the group address as
|
|
|
|
* further sort criterion provides a unique sorting order and thus we can
|
|
|
|
* merge inode and vfsmount lists of marks in linear time and find groups
|
|
|
|
* present in both lists.
|
|
|
|
*
|
|
|
|
* A return value of 1 signifies that b has priority over a.
|
|
|
|
* A return value of 0 signifies that the two marks have to be handled together.
|
|
|
|
* A return value of -1 signifies that a has priority over b.
|
|
|
|
*/
|
|
|
|
int fsnotify_compare_groups(struct fsnotify_group *a, struct fsnotify_group *b)
|
|
|
|
{
|
|
|
|
if (a == b)
|
|
|
|
return 0;
|
|
|
|
if (!a)
|
|
|
|
return 1;
|
|
|
|
if (!b)
|
|
|
|
return -1;
|
|
|
|
if (a->priority < b->priority)
|
|
|
|
return 1;
|
|
|
|
if (a->priority > b->priority)
|
|
|
|
return -1;
|
|
|
|
if (a < b)
|
|
|
|
return 1;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-12-12 17:58:36 -07:00
|
|
|
/* Add mark into proper place in given list of marks */
|
|
|
|
int fsnotify_add_mark_list(struct hlist_head *head, struct fsnotify_mark *mark,
|
|
|
|
int allow_dups)
|
|
|
|
{
|
|
|
|
struct fsnotify_mark *lmark, *last = NULL;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
/* is mark the first mark? */
|
|
|
|
if (hlist_empty(head)) {
|
|
|
|
hlist_add_head_rcu(&mark->obj_list, head);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* should mark be in the middle of the current list? */
|
|
|
|
hlist_for_each_entry(lmark, head, obj_list) {
|
|
|
|
last = lmark;
|
|
|
|
|
|
|
|
if ((lmark->group == mark->group) && !allow_dups)
|
|
|
|
return -EEXIST;
|
|
|
|
|
|
|
|
cmp = fsnotify_compare_groups(lmark->group, mark->group);
|
|
|
|
if (cmp >= 0) {
|
|
|
|
hlist_add_before_rcu(&mark->obj_list, &lmark->obj_list);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BUG_ON(last == NULL);
|
|
|
|
/* mark should be the last entry. last is the current last entry */
|
|
|
|
hlist_add_behind_rcu(&mark->obj_list, &last->obj_list);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
/*
|
|
|
|
* Attach an initialized mark to a given group and fs object.
|
|
|
|
* These marks may be used for the fsnotify backend to determine which
|
|
|
|
* event types should be delivered to which group.
|
|
|
|
*/
|
2011-06-14 09:29:52 -06:00
|
|
|
int fsnotify_add_mark_locked(struct fsnotify_mark *mark,
|
|
|
|
struct fsnotify_group *group, struct inode *inode,
|
|
|
|
struct vfsmount *mnt, int allow_dups)
|
2009-12-17 19:24:27 -07:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
BUG_ON(inode && mnt);
|
|
|
|
BUG_ON(!inode && !mnt);
|
2011-06-14 09:29:52 -06:00
|
|
|
BUG_ON(!mutex_is_locked(&group->mark_mutex));
|
2009-12-17 19:24:27 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* LOCKING ORDER!!!!
|
2011-06-14 09:29:50 -06:00
|
|
|
* group->mark_mutex
|
2011-06-14 09:29:48 -06:00
|
|
|
* mark->lock
|
2009-12-17 19:24:27 -07:00
|
|
|
* inode->i_lock
|
|
|
|
*/
|
2011-06-14 09:29:48 -06:00
|
|
|
spin_lock(&mark->lock);
|
2010-07-28 08:18:38 -06:00
|
|
|
mark->flags |= FSNOTIFY_MARK_FLAG_ALIVE;
|
|
|
|
|
2011-06-14 09:29:47 -06:00
|
|
|
fsnotify_get_group(group);
|
2009-12-17 19:24:27 -07:00
|
|
|
mark->group = group;
|
|
|
|
list_add(&mark->g_list, &group->marks_list);
|
|
|
|
atomic_inc(&group->num_marks);
|
|
|
|
fsnotify_get_mark(mark); /* for i_list and g_list */
|
|
|
|
|
|
|
|
if (inode) {
|
|
|
|
ret = fsnotify_add_inode_mark(mark, group, inode, allow_dups);
|
|
|
|
if (ret)
|
|
|
|
goto err;
|
2009-12-17 19:24:27 -07:00
|
|
|
} else if (mnt) {
|
|
|
|
ret = fsnotify_add_vfsmount_mark(mark, group, mnt, allow_dups);
|
|
|
|
if (ret)
|
|
|
|
goto err;
|
2009-12-17 19:24:27 -07:00
|
|
|
} else {
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:33 -07:00
|
|
|
/* this will pin the object if appropriate */
|
|
|
|
fsnotify_set_mark_mask_locked(mark, mark->mask);
|
2009-12-17 19:24:27 -07:00
|
|
|
spin_unlock(&mark->lock);
|
|
|
|
|
|
|
|
if (inode)
|
|
|
|
__fsnotify_update_child_dentry_flags(inode);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
err:
|
2010-07-28 08:18:38 -06:00
|
|
|
mark->flags &= ~FSNOTIFY_MARK_FLAG_ALIVE;
|
2009-12-17 19:24:27 -07:00
|
|
|
list_del_init(&mark->g_list);
|
2011-06-14 09:29:47 -06:00
|
|
|
fsnotify_put_group(group);
|
2010-07-28 08:18:38 -06:00
|
|
|
mark->group = NULL;
|
2009-12-17 19:24:27 -07:00
|
|
|
atomic_dec(&group->num_marks);
|
|
|
|
|
|
|
|
spin_unlock(&mark->lock);
|
|
|
|
|
2010-07-28 08:18:38 -06:00
|
|
|
spin_lock(&destroy_lock);
|
2014-12-12 17:58:39 -07:00
|
|
|
list_add(&mark->g_list, &destroy_list);
|
2010-07-28 08:18:38 -06:00
|
|
|
spin_unlock(&destroy_lock);
|
|
|
|
wake_up(&destroy_waitq);
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-06-14 09:29:52 -06:00
|
|
|
int fsnotify_add_mark(struct fsnotify_mark *mark, struct fsnotify_group *group,
|
|
|
|
struct inode *inode, struct vfsmount *mnt, int allow_dups)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
mutex_lock(&group->mark_mutex);
|
|
|
|
ret = fsnotify_add_mark_locked(mark, group, inode, mnt, allow_dups);
|
|
|
|
mutex_unlock(&group->mark_mutex);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-12-12 17:58:36 -07:00
|
|
|
/*
|
|
|
|
* Given a list of marks, find the mark associated with given group. If found
|
|
|
|
* take a reference to that mark and return it, else return NULL.
|
|
|
|
*/
|
|
|
|
struct fsnotify_mark *fsnotify_find_mark(struct hlist_head *head,
|
|
|
|
struct fsnotify_group *group)
|
|
|
|
{
|
|
|
|
struct fsnotify_mark *mark;
|
|
|
|
|
|
|
|
hlist_for_each_entry(mark, head, obj_list) {
|
|
|
|
if (mark->group == group) {
|
|
|
|
fsnotify_get_mark(mark);
|
|
|
|
return mark;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
/*
|
2015-07-21 17:06:53 -06:00
|
|
|
* clear any marks in a group in which mark->flags & flags is true
|
2009-12-17 19:24:27 -07:00
|
|
|
*/
|
2009-12-17 19:24:34 -07:00
|
|
|
void fsnotify_clear_marks_by_group_flags(struct fsnotify_group *group,
|
|
|
|
unsigned int flags)
|
2009-12-17 19:24:27 -07:00
|
|
|
{
|
|
|
|
struct fsnotify_mark *lmark, *mark;
|
2015-08-06 16:46:42 -06:00
|
|
|
LIST_HEAD(to_free);
|
2009-12-17 19:24:27 -07:00
|
|
|
|
2015-08-06 16:46:42 -06:00
|
|
|
/*
|
|
|
|
* We have to be really careful here. Anytime we drop mark_mutex, e.g.
|
|
|
|
* fsnotify_clear_marks_by_inode() can come and free marks. Even in our
|
|
|
|
* to_free list so we have to use mark_mutex even when accessing that
|
|
|
|
* list. And freeing mark requires us to drop mark_mutex. So we can
|
|
|
|
* reliably free only the first mark in the list. That's why we first
|
|
|
|
* move marks to free to to_free list in one go and then free marks in
|
|
|
|
* to_free list one by one.
|
|
|
|
*/
|
fsnotify: change locking order
On Mon, Aug 01, 2011 at 04:38:22PM -0400, Eric Paris wrote:
>
> I finally built and tested a v3.0 kernel with these patches (I know I'm
> SOOOOOO far behind). Not what I hoped for:
>
> > [ 150.937798] VFS: Busy inodes after unmount of tmpfs. Self-destruct in 5 seconds. Have a nice day...
> > [ 150.945290] BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
> > [ 150.946012] IP: [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] PGD 2bf9e067 PUD 2bf9f067 PMD 0
> > [ 150.946012] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
> > [ 150.946012] CPU 0
> > [ 150.946012] Modules linked in: nfs lockd fscache auth_rpcgss nfs_acl sunrpc ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ext4 jbd2 crc16 joydev ata_piix i2c_piix4 pcspkr uinput ipv6 autofs4 usbhid [last unloaded: scsi_wait_scan]
> > [ 150.946012]
> > [ 150.946012] Pid: 2764, comm: syscall_thrash Not tainted 3.0.0+ #1 Red Hat KVM
> > [ 150.946012] RIP: 0010:[<ffffffff810ffd58>] [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] RSP: 0018:ffff88002c2e5df8 EFLAGS: 00010282
> > [ 150.946012] RAX: 000000004e370d9f RBX: 0000000000000000 RCX: ffff88003a029438
> > [ 150.946012] RDX: 0000000033630a5f RSI: 0000000000000000 RDI: ffff88003491c240
> > [ 150.946012] RBP: ffff88002c2e5e08 R08: 0000000000000000 R09: 0000000000000000
> > [ 150.946012] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a029428
> > [ 150.946012] R13: ffff88003a029428 R14: ffff88003a029428 R15: ffff88003499a610
> > [ 150.946012] FS: 00007f5a05420700(0000) GS:ffff88003f600000(0000) knlGS:0000000000000000
> > [ 150.946012] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
> > [ 150.946012] CR2: 0000000000000070 CR3: 000000002a662000 CR4: 00000000000006f0
> > [ 150.946012] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> > [ 150.946012] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
> > [ 150.946012] Process syscall_thrash (pid: 2764, threadinfo ffff88002c2e4000, task ffff88002bfbc760)
> > [ 150.946012] Stack:
> > [ 150.946012] ffff88003a029438 ffff88003a029428 ffff88002c2e5e38 ffffffff81102f76
> > [ 150.946012] ffff88003a029438 ffff88003a029598 ffffffff8160f9c0 ffff88002c221250
> > [ 150.946012] ffff88002c2e5e68 ffffffff8115e9be ffff88002c2e5e68 ffff88003a029438
> > [ 150.946012] Call Trace:
> > [ 150.946012] [<ffffffff81102f76>] shmem_evict_inode+0x76/0x130
> > [ 150.946012] [<ffffffff8115e9be>] evict+0x7e/0x170
> > [ 150.946012] [<ffffffff8115ee40>] iput_final+0xd0/0x190
> > [ 150.946012] [<ffffffff8115ef33>] iput+0x33/0x40
> > [ 150.946012] [<ffffffff81180205>] fsnotify_destroy_mark_locked+0x145/0x160
> > [ 150.946012] [<ffffffff81180316>] fsnotify_destroy_mark+0x36/0x50
> > [ 150.946012] [<ffffffff81181937>] sys_inotify_rm_watch+0x77/0xd0
> > [ 150.946012] [<ffffffff815aca52>] system_call_fastpath+0x16/0x1b
> > [ 150.946012] Code: 67 4a 00 b8 e4 ff ff ff eb aa 66 0f 1f 84 00 00 00 00 00 55 48 89 e5 48 83 ec 10 48 89 1c 24 4c 89 64 24 08 48 8b 9f 40 05 00 00
> > [ 150.946012] 83 7b 70 00 74 1c 4c 8d a3 80 00 00 00 4c 89 e7 e8 d2 5d 4a
> > [ 150.946012] RIP [<ffffffff810ffd58>] shmem_free_inode+0x18/0x50
> > [ 150.946012] RSP <ffff88002c2e5df8>
> > [ 150.946012] CR2: 0000000000000070
>
> Looks at aweful lot like the problem from:
> http://www.spinics.net/lists/linux-fsdevel/msg46101.html
>
I tried to reproduce this bug with your test program, but without success.
However, if I understand correctly, this occurs since we dont hold any locks when
we call iput() in mark_destroy(), right?
With the patches you tested, iput() is also not called within any lock, since the
groups mark_mutex is released temporarily before iput() is called. This is, since
the original codes behaviour is similar.
However since we now have a mutex as the biggest lock, we can do what you
suggested (http://www.spinics.net/lists/linux-fsdevel/msg46107.html) and
call iput() with the mutex held to avoid the race.
The patch below implements this. It uses nested locking to avoid deadlock in case
we do the final iput() on an inode which still holds marks and thus would take
the mutex again when calling fsnotify_inode_delete() in destroy_inode().
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
2011-08-11 17:13:31 -06:00
|
|
|
mutex_lock_nested(&group->mark_mutex, SINGLE_DEPTH_NESTING);
|
2009-12-17 19:24:27 -07:00
|
|
|
list_for_each_entry_safe(mark, lmark, &group->marks_list, g_list) {
|
2015-08-06 16:46:42 -06:00
|
|
|
if (mark->flags & flags)
|
|
|
|
list_move(&mark->g_list, &to_free);
|
2009-12-17 19:24:27 -07:00
|
|
|
}
|
2011-06-14 09:29:50 -06:00
|
|
|
mutex_unlock(&group->mark_mutex);
|
2015-08-06 16:46:42 -06:00
|
|
|
|
|
|
|
while (1) {
|
|
|
|
mutex_lock_nested(&group->mark_mutex, SINGLE_DEPTH_NESTING);
|
|
|
|
if (list_empty(&to_free)) {
|
|
|
|
mutex_unlock(&group->mark_mutex);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
mark = list_first_entry(&to_free, struct fsnotify_mark, g_list);
|
|
|
|
fsnotify_get_mark(mark);
|
|
|
|
fsnotify_destroy_mark_locked(mark, group);
|
|
|
|
mutex_unlock(&group->mark_mutex);
|
|
|
|
fsnotify_put_mark(mark);
|
|
|
|
}
|
2009-12-17 19:24:27 -07:00
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:34 -07:00
|
|
|
/*
|
|
|
|
* Given a group, destroy all of the marks associated with that group.
|
|
|
|
*/
|
|
|
|
void fsnotify_clear_marks_by_group(struct fsnotify_group *group)
|
|
|
|
{
|
|
|
|
fsnotify_clear_marks_by_group_flags(group, (unsigned int)-1);
|
|
|
|
}
|
|
|
|
|
2009-12-17 19:24:27 -07:00
|
|
|
void fsnotify_duplicate_mark(struct fsnotify_mark *new, struct fsnotify_mark *old)
|
|
|
|
{
|
|
|
|
assert_spin_locked(&old->lock);
|
2014-12-12 17:58:36 -07:00
|
|
|
new->inode = old->inode;
|
|
|
|
new->mnt = old->mnt;
|
2011-06-14 09:29:47 -06:00
|
|
|
if (old->group)
|
|
|
|
fsnotify_get_group(old->group);
|
2009-12-17 19:24:27 -07:00
|
|
|
new->group = old->group;
|
|
|
|
new->mask = old->mask;
|
|
|
|
new->free_mark = old->free_mark;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Nothing fancy, just initialize lists and locks and counters.
|
|
|
|
*/
|
|
|
|
void fsnotify_init_mark(struct fsnotify_mark *mark,
|
|
|
|
void (*free_mark)(struct fsnotify_mark *mark))
|
|
|
|
{
|
2009-12-17 19:24:27 -07:00
|
|
|
memset(mark, 0, sizeof(*mark));
|
2009-12-17 19:24:27 -07:00
|
|
|
spin_lock_init(&mark->lock);
|
|
|
|
atomic_set(&mark->refcnt, 1);
|
|
|
|
mark->free_mark = free_mark;
|
|
|
|
}
|
2010-07-28 08:18:38 -06:00
|
|
|
|
|
|
|
static int fsnotify_mark_destroy(void *ignored)
|
|
|
|
{
|
|
|
|
struct fsnotify_mark *mark, *next;
|
2014-06-04 17:05:42 -06:00
|
|
|
struct list_head private_destroy_list;
|
2010-07-28 08:18:38 -06:00
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
spin_lock(&destroy_lock);
|
2010-07-28 08:18:38 -06:00
|
|
|
/* exchange the list head */
|
|
|
|
list_replace_init(&destroy_list, &private_destroy_list);
|
2010-07-28 08:18:38 -06:00
|
|
|
spin_unlock(&destroy_lock);
|
|
|
|
|
|
|
|
synchronize_srcu(&fsnotify_mark_srcu);
|
|
|
|
|
2014-12-12 17:58:39 -07:00
|
|
|
list_for_each_entry_safe(mark, next, &private_destroy_list, g_list) {
|
|
|
|
list_del_init(&mark->g_list);
|
2010-07-28 08:18:38 -06:00
|
|
|
fsnotify_put_mark(mark);
|
|
|
|
}
|
|
|
|
|
|
|
|
wait_event_interruptible(destroy_waitq, !list_empty(&destroy_list));
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init fsnotify_mark_init(void)
|
|
|
|
{
|
|
|
|
struct task_struct *thread;
|
|
|
|
|
|
|
|
thread = kthread_run(fsnotify_mark_destroy, NULL,
|
|
|
|
"fsnotify_mark");
|
|
|
|
if (IS_ERR(thread))
|
|
|
|
panic("unable to start fsnotify mark destruction thread.");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
device_initcall(fsnotify_mark_init);
|