Skip to content

Commit

Permalink
fs/dcache: disable preemption on i_dir_seq's write side
Browse files Browse the repository at this point in the history
i_dir_seq is an opencoded seqcounter. Based on the code it looks like we
could have two writers in parallel despite the fact that the d_lock is
held. The problem is that during the write process on RT the preemption
is still enabled and if this process is interrupted by a reader with RT
priority then we lock up.
To avoid that lock up I am disabling the preemption during the update.
The rename of i_dir_seq is here to ensure to catch new write sides in
future.

Cc: stable-rt@vger.kernel.org
Reported-by: Oleg.Karfich@wago.com
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Sebastian Andrzej Siewior committed Sep 13, 2021
1 parent f1ca438 commit 05bc801
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
12 changes: 7 additions & 5 deletions fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -2538,17 +2538,19 @@ EXPORT_SYMBOL(d_rehash);
static inline unsigned start_dir_add(struct inode *dir)
{

preempt_disable_rt();
for (;;) {
unsigned n = dir->i_dir_seq;
if (!(n & 1) && cmpxchg(&dir->i_dir_seq, n, n + 1) == n)
unsigned n = dir->__i_dir_seq;
if (!(n & 1) && cmpxchg(&dir->__i_dir_seq, n, n + 1) == n)
return n;
cpu_relax();
}
}

static inline void end_dir_add(struct inode *dir, unsigned n)
{
smp_store_release(&dir->i_dir_seq, n + 2);
smp_store_release(&dir->__i_dir_seq, n + 2);
preempt_enable_rt();
}

static void d_wait_lookup(struct dentry *dentry)
Expand Down Expand Up @@ -2584,7 +2586,7 @@ struct dentry *d_alloc_parallel(struct dentry *parent,

retry:
rcu_read_lock();
seq = smp_load_acquire(&parent->d_inode->i_dir_seq);
seq = smp_load_acquire(&parent->d_inode->__i_dir_seq);
r_seq = read_seqbegin(&rename_lock);
dentry = __d_lookup_rcu(parent, name, &d_seq);
if (unlikely(dentry)) {
Expand Down Expand Up @@ -2612,7 +2614,7 @@ struct dentry *d_alloc_parallel(struct dentry *parent,
}

hlist_bl_lock(b);
if (unlikely(READ_ONCE(parent->d_inode->i_dir_seq) != seq)) {
if (unlikely(READ_ONCE(parent->d_inode->__i_dir_seq) != seq)) {
hlist_bl_unlock(b);
rcu_read_unlock();
goto retry;
Expand Down
2 changes: 1 addition & 1 deletion fs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
inode->i_pipe = NULL;
inode->i_cdev = NULL;
inode->i_link = NULL;
inode->i_dir_seq = 0;
inode->__i_dir_seq = 0;
inode->i_rdev = 0;
inode->dirtied_when = 0;

Expand Down
2 changes: 1 addition & 1 deletion include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ struct inode {
struct pipe_inode_info *i_pipe;
struct cdev *i_cdev;
char *i_link;
unsigned i_dir_seq;
unsigned __i_dir_seq;
};

__u32 i_generation;
Expand Down

0 comments on commit 05bc801

Please sign in to comment.