korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

vfs: take i_mutex on renamed file

Browse Source 
A read delegation is used by NFSv4 as a guarantee that a client can
perform local read opens without informing the server.

The open operation takes the last component of the pathname as an
argument, thus is also a lookup operation, and giving the client the
above guarantee means informing the client before we allow anything that
would change the set of names pointing to the inode.

Therefore, we need to break delegations on rename, link, and unlink.

We also need to prevent new delegations from being acquired while one of
these operations is in progress.

We could add some completely new locking for that purpose, but it's
simpler to use the i_mutex, since that's already taken by all the
operations we care about.

The single exception is rename.  So, modify rename to take the i_mutex
on the file that is being renamed.

Also fix up lockdep and Documentation/filesystems/directory-locking to
reflect the change.

Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
J. Bruce Fields 2012-03-05 11:40:41 -05:00 committed by Al Viro
parent 40bd22c9f8
commit 6cedba8962
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Documentation/filesystems/directory-locking
View File

@ -2,6 +2,10 @@
kinds of locks - per-inode (->i_mutex) and per-filesystem kinds of locks - per-inode (->i_mutex) and per-filesystem
(->s_vfs_rename_mutex). (->s_vfs_rename_mutex).
When taking the i_mutex on multiple non-directory objects, we
always acquire the locks in order by increasing address. We'll call
that "inode pointer" order in the following.
For our purposes all operations fall in 5 classes: For our purposes all operations fall in 5 classes:
1) read access. Locking rules: caller locks directory we are accessing. 1) read access. Locking rules: caller locks directory we are accessing.
@ -12,8 +16,9 @@ kinds of locks - per-inode (->i_mutex) and per-filesystem
locks victim and calls the method. locks victim and calls the method.
4) rename() that is _not_ cross-directory. Locking rules: caller locks 4) rename() that is _not_ cross-directory. Locking rules: caller locks
the parent, finds source and target, if target already exists - locks it the parent and finds source and target. If target already exists, lock
and then calls the method. it. If source is a non-directory, lock it. If that means we need to
lock both, lock them in inode pointer order.
5) link creation. Locking rules: 5) link creation. Locking rules:
* lock parent * lock parent
@ -30,7 +35,9 @@ rules:
fail with -ENOTEMPTY fail with -ENOTEMPTY
* if new parent is equal to or is a descendent of source * if new parent is equal to or is a descendent of source
fail with -ELOOP fail with -ELOOP
* if target exists - lock it. * If target exists, lock it. If source is a non-directory, lock
it. In case that means we need to lock both source and target,
do so in inode pointer order.
* call the method. * call the method.
@ -56,9 +63,11 @@ objects - A < B iff A is an ancestor of B.
renames will be blocked on filesystem lock and we don't start changing renames will be blocked on filesystem lock and we don't start changing
the order until we had acquired all locks). the order until we had acquired all locks).
(3) any operation holds at most one lock on non-directory object and (3) locks on non-directory objects are acquired only after locks on
that lock is acquired after all other locks. (Proof: see descriptions directory objects, and are acquired in inode pointer order.
of operations). (Proof: all operations but renames take lock on at most one
non-directory object, except renames, which take locks on source and
target in inode pointer order in the case they are not directories.)
Now consider the minimal deadlock. Each process is blocked on Now consider the minimal deadlock. Each process is blocked on
attempt to acquire some lock and already holds at least one lock. Let's attempt to acquire some lock and already holds at least one lock. Let's
@ -66,9 +75,13 @@ consider the set of contended locks. First of all, filesystem lock is
not contended, since any process blocked on it is not holding any locks. not contended, since any process blocked on it is not holding any locks.
Thus all processes are blocked on ->i_mutex. Thus all processes are blocked on ->i_mutex.
Non-directory objects are not contended due to (3). Thus link By (3), any process holding a non-directory lock can only be
creation can't be a part of deadlock - it can't be blocked on source waiting on another non-directory lock with a larger address. Therefore
and it means that it doesn't hold any locks. the process holding the "largest" such lock can always make progress, and
non-directory objects are not included in the set of contended locks.
Thus link creation can't be a part of deadlock - it can't be
blocked on source and it means that it doesn't hold any locks.
Any contended object is either held by cross-directory rename or Any contended object is either held by cross-directory rename or
has a child that is also contended. Indeed, suppose that it is held by has a child that is also contended. Indeed, suppose that it is held by

10
fs/namei.c
View File

@ -3918,7 +3918,8 @@ SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname
* That's where 4.4 screws up. Current fix: serialization on * That's where 4.4 screws up. Current fix: serialization on
* sb->s_vfs_rename_mutex. We might be more accurate, but that's another * sb->s_vfs_rename_mutex. We might be more accurate, but that's another
* story. * story.
* c) we have to lock _three_ objects - parents and victim (if it exists). * c) we have to lock _four_ objects - parents and victim (if it exists),
* and source (if it is not a directory).
* And that - after we got ->i_mutex on parents (until then we don't know * And that - after we got ->i_mutex on parents (until then we don't know
* whether the target exists). Solution: try to be smart with locking * whether the target exists). Solution: try to be smart with locking
* order for inodes. We rely on the fact that tree topology may change * order for inodes. We rely on the fact that tree topology may change
@ -3994,6 +3995,7 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry) struct inode *new_dir, struct dentry *new_dentry)
{ {
struct inode *target = new_dentry->d_inode; struct inode *target = new_dentry->d_inode;
struct inode *source = old_dentry->d_inode;
int error; int error;
error = security_inode_rename(old_dir, old_dentry, new_dir, new_dentry); error = security_inode_rename(old_dir, old_dentry, new_dir, new_dentry);
@ -4001,8 +4003,7 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
return error; return error;
dget(new_dentry); dget(new_dentry);
if (target) lock_two_nondirectories(source, target);
mutex_lock(&target->i_mutex);
error = -EBUSY; error = -EBUSY;
if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry)) if (d_mountpoint(old_dentry)||d_mountpoint(new_dentry))
@ -4017,8 +4018,7 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE)) if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
d_move(old_dentry, new_dentry); d_move(old_dentry, new_dentry);
out: out:
if (target) unlock_two_nondirectories(source, target);
mutex_unlock(&target->i_mutex);
dput(new_dentry); dput(new_dentry);
return error; return error;
} }