fs/devpts: always delete dcache dentry-s in dput()
PATCH 1/1 fs/devpts: always delete dcache dentry-s in dput()
From: Varad Gautam <[email protected]>
d_delete only unhashes an entry if it is reached with dentry->d_lockref.count != 1. Prior to commit 8ead9dd54716 ("devpts:
more pty driver interface cleanups"), d_delete was called on a dentry from devpts_pty_kill with two references held, which would trigger the unhashing, and the subsequent dputs would release it.
Commit 8ead9dd54716 reworked devpts_pty_kill to stop acquiring the second reference from d_find_alias, and the d_delete call left the dentries still on the hashed list without actually ever being dropped from dcache before explicit cleanup. This causes the number of negative dentries for devpts to pile up, and an ls /dev/pts invocation can take seconds to return.
Provide always_delete_dentry() from simple_dentry_operations as .d_delete for devpts, to make the dentry be dropped from dcache.
Without this cleanup, the number of dentries in /dev/pts/ can be grown arbitrarily as:
python -c 'import pty; pty.spawn(["ls", "/dev/pts"])'
A systemtap probe on dcache_readdir to count d_subdirs shows this count to increase with each pty spawn invocation above:
probe kernel.function("dcache_readdir") {
subdirs = &@cast($file->f_path->dentry, "dentry")->d_subdirs;
p = subdirs;
p = @cast(p, "list_head")->next;
i = 0
while (p != subdirs) {
p = @cast(p, "list_head")->next;
i = i+1;
}
printf("number of dentries: %d\n", i);
}--- fs/devpts/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/devpts/inode.c +1 -0
@@ -455,6 +455,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) s->s_blocksize_bits =10 ; s->s_magic =DEVPTS_SUPER_MAGIC ; s->s_op = &devpts_sops; + s->s_d_op = &simple_dentry_operations; s->s_time_gran =1 ; error = -ENOMEM ;
Signature · 7 lines
2.7.4 Amazon Development Center Germany GmbH Berlin - Dresden - Aachen main office: Krausenstr. 38, 10117 Berlin Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger Ust-ID: DE289237879 Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
Al Viro
Appliedfs/devpts/inode.c devpts_fill_super(struct super_block *s, void *data, int silent) · line 461
Quoted 12 lines · On Thu, Jan 24, 2019 at 02:03:06PM +0100, [email protected] wrote:
fs/devpts/inode.c +1
-0@@ -455,6 +455,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) s->s_blocksize_bits =10 ; s->s_magic =DEVPTS_SUPER_MAGIC ; s->s_op = &devpts_sops; + s->s_d_op = &simple_dentry_operations; s->s_time_gran =1 ; error = -ENOMEM ;
Applied.