Commit dc351252 authored by Eric Sandeen's avatar Eric Sandeen Committed by Greg Kroah-Hartman

sysfs: store sysfs inode nrs in s_ino to avoid readdir oopses

Backport of
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc1/2.6.22-rc1-mm1/broken-out/gregkh-driver-sysfs-allocate-inode-number-using-ida.patch

For regular files in sysfs, sysfs_readdir wants to traverse
sysfs_dirent->s_dentry->d_inode->i_ino to get to the inode number.
But, the dentry can be reclaimed under memory pressure, and there is
no synchronization with readdir.  This patch follows Tejun's scheme of
allocating and storing an inode number in the new s_ino member of a
sysfs_dirent, when dirents are created, and retrieving it from there
for readdir, so that the pointer chain doesn't have to be traversed.

Tejun's upstream patch uses a new-ish "ida" allocator which brings
along some extra complexity; this -stable patch has a brain-dead
incrementing counter which does not guarantee uniqueness, but because
sysfs doesn't hash inodes as iunique expects, uniqueness wasn't
guaranteed today anyway.
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 99f9f3d4
...@@ -30,6 +30,14 @@ static struct dentry_operations sysfs_dentry_ops = { ...@@ -30,6 +30,14 @@ static struct dentry_operations sysfs_dentry_ops = {
.d_iput = sysfs_d_iput, .d_iput = sysfs_d_iput,
}; };
static unsigned int sysfs_inode_counter;
ino_t sysfs_get_inum(void)
{
if (unlikely(sysfs_inode_counter < 3))
sysfs_inode_counter = 3;
return sysfs_inode_counter++;
}
/* /*
* Allocates a new sysfs_dirent and links it to the parent sysfs_dirent * Allocates a new sysfs_dirent and links it to the parent sysfs_dirent
*/ */
...@@ -41,6 +49,7 @@ static struct sysfs_dirent * __sysfs_new_dirent(void * element) ...@@ -41,6 +49,7 @@ static struct sysfs_dirent * __sysfs_new_dirent(void * element)
if (!sd) if (!sd)
return NULL; return NULL;
sd->s_ino = sysfs_get_inum();
atomic_set(&sd->s_count, 1); atomic_set(&sd->s_count, 1);
atomic_set(&sd->s_event, 1); atomic_set(&sd->s_event, 1);
INIT_LIST_HEAD(&sd->s_children); INIT_LIST_HEAD(&sd->s_children);
...@@ -509,7 +518,7 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir) ...@@ -509,7 +518,7 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
switch (i) { switch (i) {
case 0: case 0:
ino = dentry->d_inode->i_ino; ino = parent_sd->s_ino;
if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0) if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0)
break; break;
filp->f_pos++; filp->f_pos++;
...@@ -538,10 +547,7 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir) ...@@ -538,10 +547,7 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
name = sysfs_get_name(next); name = sysfs_get_name(next);
len = strlen(name); len = strlen(name);
if (next->s_dentry) ino = next->s_ino;
ino = next->s_dentry->d_inode->i_ino;
else
ino = iunique(sysfs_sb, 2);
if (filldir(dirent, name, len, filp->f_pos, ino, if (filldir(dirent, name, len, filp->f_pos, ino,
dt_type(next)) < 0) dt_type(next)) < 0)
......
...@@ -141,6 +141,7 @@ struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent * sd) ...@@ -141,6 +141,7 @@ struct inode * sysfs_new_inode(mode_t mode, struct sysfs_dirent * sd)
inode->i_mapping->a_ops = &sysfs_aops; inode->i_mapping->a_ops = &sysfs_aops;
inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info; inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
inode->i_op = &sysfs_inode_operations; inode->i_op = &sysfs_inode_operations;
inode->i_ino = sd->s_ino;
lockdep_set_class(&inode->i_mutex, &sysfs_inode_imutex_key); lockdep_set_class(&inode->i_mutex, &sysfs_inode_imutex_key);
if (sd->s_iattr) { if (sd->s_iattr) {
......
...@@ -33,6 +33,7 @@ static struct sysfs_dirent sysfs_root = { ...@@ -33,6 +33,7 @@ static struct sysfs_dirent sysfs_root = {
.s_element = NULL, .s_element = NULL,
.s_type = SYSFS_ROOT, .s_type = SYSFS_ROOT,
.s_iattr = NULL, .s_iattr = NULL,
.s_ino = 1,
}; };
static void sysfs_clear_inode(struct inode *inode) static void sysfs_clear_inode(struct inode *inode)
......
...@@ -5,6 +5,7 @@ struct sysfs_dirent { ...@@ -5,6 +5,7 @@ struct sysfs_dirent {
void * s_element; void * s_element;
int s_type; int s_type;
umode_t s_mode; umode_t s_mode;
ino_t s_ino;
struct dentry * s_dentry; struct dentry * s_dentry;
struct iattr * s_iattr; struct iattr * s_iattr;
atomic_t s_event; atomic_t s_event;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment