linux-stable.git/fs/sysfs/dir.c, branch linux-2.6.33.y

sysfs: Cache the last sysfs_dirent to improve readdir scalability v2

2010-03-15T16:06:26+00:00

commit 1e5289c97bba2d8ee7239a416bc3f28743362cd9 upstream.

When sysfs_readdir stops short we now cache the next
sysfs_dirent to return to user space in filp->private_data.
There is no impact on the rest of sysfs by doing this and
in the common case it allows us to pick up exactly where
we left off with no seeking.

Additionally I drop and regrab the sysfs_mutex around
filldir to avoid a page fault abritrarily increasing the
hold time on the sysfs_mutex.

v2: Returned to using INT_MAX as the EOF condition.
    seekdir is ambiguous unless all directory entries have
    a unique f_pos value.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14949

Signed-off-by: Eric W. Biederman 
Cc: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

sysfs: Add lockdep annotations for the sysfs active reference

2010-01-04T20:34:46+00:00

Holding locks over device_del -> kobject_del -> sysfs_deactivate can
cause deadlocks if those same locks are grabbed in sysfs show or store
methods.

The I model s_active count + completion as a sleeping read/write lock.
I describe to lockdep sysfs_get_active as a read_trylock,
sysfs_put_active as a read_unlock, and sysfs_deactivate as a
write_lock and write_unlock pair.  This seems to capture the essence
for purposes of finding deadlocks, and in my testing gives finds real
issues and ignores non-issues.

This brings us back to holding locks over kobject_del is a problem
that ideally we should find a way of addressing, but at least lockdep
can tell us about the problems instead of requiring developers to debug
rare strange system deadlocks, that happen when sysfs files are removed
while being written to.

Signed-off-by: Eric W. Biederman 
Acked-by: Tejun Heo 
Signed-off-by: Linus Torvalds

sysfs: Factor out sysfs_rename from sysfs_rename_dir and sysfs_move_dir

2009-12-11T19:24:54+00:00

These two functions do 90% of the same work and it doesn't significantly
obfuscate the function to allow both the parent dir and the name to change
at the same time.  So merge them together to simplify maintenance, and
increase testing.

Acked-by: Tejun Heo 
Acked-by: Serge Hallyn 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Propagate renames to the vfs on demand

2009-12-11T19:24:54+00:00

By teaching sysfs_revalidate to hide a dentry for
a sysfs_dirent if the sysfs_dirent has been renamed,
and by teaching sysfs_lookup to return the original
dentry if the sysfs dirent has been renamed.  I can
show the results of renames correctly without having to
update the dcache during the directory rename.

This massively simplifies the rename logic allowing a lot
of weird sysfs special cases to be removed along with
a lot of now unnecesary helper code.

Acked-by: Tejun Heo 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Gut sysfs_addrm_start and sysfs_addrm_finish

2009-12-11T19:24:54+00:00

With lazy inode updates and dentry operations bringing everything
into sync on demand there is no longer any need to immediately
update the vfs or grab i_mutex to protect those updates as we
make changes to sysfs.

Acked-by: Serge Hallyn 
Acked-by: Tejun Heo 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Implement sysfs_getattr & sysfs_permission

2009-12-11T19:24:54+00:00

With the implementation of sysfs_getattr and sysfs_permission
sysfs becomes able to lazily propogate inode attribute changes
from the sysfs_dirents to the vfs inodes.   This paves the way
for deleting significant chunks of now unnecessary code.

While doing this we did not reference sysfs_setattr from
sysfs_symlink_inode_operations so I added along with
sysfs_getattr and sysfs_permission.

Acked-by: Tejun Heo 
Acked-by: Serge Hallyn 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Update s_iattr on link and unlink.

2009-12-11T19:24:53+00:00

Currently sysfs updates the timestamps on the vfs directory
inode when we create or remove a directory entry but doesn't
update the cached copy on the sysfs_dirent, fix that oversight.

Acked-by: Tejun Heo 
Acked-by: Serge Hallyn 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Use dentry_ops instead of directly playing with the dcache

2009-12-11T19:24:53+00:00

Calling d_drop unconditionally when a sysfs_dirent is deleted has
the potential to leak mounts, so instead implement dentry delete
and revalidate operations that cause sysfs dentries to be removed
at the appropriate time.

Acked-by: Tejun Heo 
Acked-by: Serge Hallyn 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Rename sysfs_d_iput to sysfs_dentry_iput

2009-12-11T19:24:53+00:00

Using dentry instead of d in the function name is what
several other filesystems are doing and it seems to be
a more readable convention.

Acked-by: Tejun Heo 
Acked-by: Serge Hallyn 
Signed-off-by: Eric W. Biederman 
Signed-off-by: Greg Kroah-Hartman

sysfs: Don't leak secdata when a sysfs_dirent is freed.

2009-11-04T21:19:18+00:00

While refreshing my sysfs patches I noticed a leak in the secdata
implementation.  We don't free the secdata when we free the
sysfs dirent.

This is a bug in 2.6.32-rc5 that we really should close.

Signed-off-by: Eric W. Biederman 
Acked-by: Serge Hallyn 
Signed-off-by: James Morris