mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
6636b6dcc3
Fix race issue in fid contention.
Eric's and Greg's patch offer a mechanism to fix open-unlink-f*syscall
bug in 9p. But there is race issue in fid parallel accesses.
As Greg's patch stores all of fids from opened files into according inode,
so all the lookup fid ops can retrieve fid from inode preferentially. But
there is no mechanism to handle the fid contention issue. For example,
there are two threads get the same fid in the same time and one of them
clunk the fid before the other thread ready to discard the fid. In this
scenario, it will lead to some fatal problems, even kernel core dump.
I introduce a mechanism to fix this race issue. A counter field introduced
into p9_fid struct to store the reference counter to the fid. When a fid
is allocated from the inode or dentry, the counter will increase, and
will decrease at the end of its occupation. It is guaranteed that the
fid won't be clunked before the reference counter go down to 0, then
we can avoid the clunked fid to be used.
tests:
race issue test from the old test case:
for file in {01..50}; do touch f.${file}; done
seq 1 1000 | xargs -n 1 -P 50 -I{} cat f.* > /dev/null
open-unlink-f*syscall test:
I have tested for f*syscall include: ftruncate fstat fchown fchmod faccessat.
Link: http://lkml.kernel.org/r/20200923141146.90046-5-jianyong.wu@arm.com
Fixes: 478ba09edc ("fs/9p: search open fids first")
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
109 lines
2.5 KiB
C
109 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* linux/fs/9p/vfs_dentry.c
|
|
*
|
|
* This file contians vfs dentry ops for the 9P2000 protocol.
|
|
*
|
|
* Copyright (C) 2004 by Eric Van Hensbergen <ericvh@gmail.com>
|
|
* Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/file.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/string.h>
|
|
#include <linux/inet.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/slab.h>
|
|
#include <net/9p/9p.h>
|
|
#include <net/9p/client.h>
|
|
|
|
#include "v9fs.h"
|
|
#include "v9fs_vfs.h"
|
|
#include "fid.h"
|
|
|
|
/**
|
|
* v9fs_cached_dentry_delete - called when dentry refcount equals 0
|
|
* @dentry: dentry in question
|
|
*
|
|
*/
|
|
static int v9fs_cached_dentry_delete(const struct dentry *dentry)
|
|
{
|
|
p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",
|
|
dentry, dentry);
|
|
|
|
/* Don't cache negative dentries */
|
|
if (d_really_is_negative(dentry))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* v9fs_dentry_release - called when dentry is going to be freed
|
|
* @dentry: dentry that is being release
|
|
*
|
|
*/
|
|
|
|
static void v9fs_dentry_release(struct dentry *dentry)
|
|
{
|
|
struct hlist_node *p, *n;
|
|
p9_debug(P9_DEBUG_VFS, " dentry: %pd (%p)\n",
|
|
dentry, dentry);
|
|
hlist_for_each_safe(p, n, (struct hlist_head *)&dentry->d_fsdata)
|
|
p9_client_clunk(hlist_entry(p, struct p9_fid, dlist));
|
|
dentry->d_fsdata = NULL;
|
|
}
|
|
|
|
static int v9fs_lookup_revalidate(struct dentry *dentry, unsigned int flags)
|
|
{
|
|
struct p9_fid *fid;
|
|
struct inode *inode;
|
|
struct v9fs_inode *v9inode;
|
|
|
|
if (flags & LOOKUP_RCU)
|
|
return -ECHILD;
|
|
|
|
inode = d_inode(dentry);
|
|
if (!inode)
|
|
goto out_valid;
|
|
|
|
v9inode = V9FS_I(inode);
|
|
if (v9inode->cache_validity & V9FS_INO_INVALID_ATTR) {
|
|
int retval;
|
|
struct v9fs_session_info *v9ses;
|
|
fid = v9fs_fid_lookup(dentry);
|
|
if (IS_ERR(fid))
|
|
return PTR_ERR(fid);
|
|
|
|
v9ses = v9fs_inode2v9ses(inode);
|
|
if (v9fs_proto_dotl(v9ses))
|
|
retval = v9fs_refresh_inode_dotl(fid, inode);
|
|
else
|
|
retval = v9fs_refresh_inode(fid, inode);
|
|
p9_client_clunk(fid);
|
|
|
|
if (retval == -ENOENT)
|
|
return 0;
|
|
if (retval < 0)
|
|
return retval;
|
|
}
|
|
out_valid:
|
|
return 1;
|
|
}
|
|
|
|
const struct dentry_operations v9fs_cached_dentry_operations = {
|
|
.d_revalidate = v9fs_lookup_revalidate,
|
|
.d_weak_revalidate = v9fs_lookup_revalidate,
|
|
.d_delete = v9fs_cached_dentry_delete,
|
|
.d_release = v9fs_dentry_release,
|
|
};
|
|
|
|
const struct dentry_operations v9fs_dentry_operations = {
|
|
.d_delete = always_delete_dentry,
|
|
.d_release = v9fs_dentry_release,
|
|
};
|