Commit 335eb531 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

proc: faster /proc/$PID lookup

Currently lookup for /proc/$PID first goes through spinlock and whole list
of misc /proc entries only to confirm that, yes, /proc/42 can not possibly
match random proc entry.

List is is several dozens entries long (52 entries on my setup).

None of this is necessary.

Try to convert dentry name to integer first.
If it works, it must be /proc/$PID.
If it doesn't, it must be random proc entry.

Based on patch from Al Viro.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dbcdb504
...@@ -2780,7 +2780,7 @@ static int proc_pid_instantiate(struct inode *dir, ...@@ -2780,7 +2780,7 @@ static int proc_pid_instantiate(struct inode *dir,
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags) struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsigned int flags)
{ {
int result = 0; int result = -ENOENT;
struct task_struct *task; struct task_struct *task;
unsigned tgid; unsigned tgid;
struct pid_namespace *ns; struct pid_namespace *ns;
......
...@@ -199,10 +199,10 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct ...@@ -199,10 +199,10 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags) static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags)
{ {
if (!proc_lookup(dir, dentry, flags)) if (!proc_pid_lookup(dir, dentry, flags))
return NULL; return NULL;
return proc_pid_lookup(dir, dentry, flags); return proc_lookup(dir, dentry, flags);
} }
static int proc_root_readdir(struct file *file, struct dir_context *ctx) static int proc_root_readdir(struct file *file, struct dir_context *ctx)
......
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