Commit fd2421f5 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Eric Van Hensbergen

fs/9p: When doing inode lookup compare qid details and inode mode bits.

This make sure we don't use wrong inode from the inode hash. The inode number
of the file deleted is reused by the next file system object created
and if we only use inode number for inode hash lookup we could end up
with wrong struct inode.

Also compare inode generation number. Not all Linux file system provide
st_gen in userspace. So it could be 0;
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 5034990e
...@@ -108,11 +108,10 @@ static uint16_t v9fs_cache_inode_get_key(const void *cookie_netfs_data, ...@@ -108,11 +108,10 @@ static uint16_t v9fs_cache_inode_get_key(const void *cookie_netfs_data,
void *buffer, uint16_t bufmax) void *buffer, uint16_t bufmax)
{ {
const struct v9fs_inode *v9inode = cookie_netfs_data; const struct v9fs_inode *v9inode = cookie_netfs_data;
memcpy(buffer, &v9inode->fscache_key->path, memcpy(buffer, &v9inode->qid.path, sizeof(v9inode->qid.path));
sizeof(v9inode->fscache_key->path));
P9_DPRINTK(P9_DEBUG_FSC, "inode %p get key %llu", &v9inode->vfs_inode, P9_DPRINTK(P9_DEBUG_FSC, "inode %p get key %llu", &v9inode->vfs_inode,
v9inode->fscache_key->path); v9inode->qid.path);
return sizeof(v9inode->fscache_key->path); return sizeof(v9inode->qid.path);
} }
static void v9fs_cache_inode_get_attr(const void *cookie_netfs_data, static void v9fs_cache_inode_get_attr(const void *cookie_netfs_data,
...@@ -129,11 +128,10 @@ static uint16_t v9fs_cache_inode_get_aux(const void *cookie_netfs_data, ...@@ -129,11 +128,10 @@ static uint16_t v9fs_cache_inode_get_aux(const void *cookie_netfs_data,
void *buffer, uint16_t buflen) void *buffer, uint16_t buflen)
{ {
const struct v9fs_inode *v9inode = cookie_netfs_data; const struct v9fs_inode *v9inode = cookie_netfs_data;
memcpy(buffer, &v9inode->fscache_key->version, memcpy(buffer, &v9inode->qid.version, sizeof(v9inode->qid.version));
sizeof(v9inode->fscache_key->version));
P9_DPRINTK(P9_DEBUG_FSC, "inode %p get aux %u", &v9inode->vfs_inode, P9_DPRINTK(P9_DEBUG_FSC, "inode %p get aux %u", &v9inode->vfs_inode,
v9inode->fscache_key->version); v9inode->qid.version);
return sizeof(v9inode->fscache_key->version); return sizeof(v9inode->qid.version);
} }
static enum static enum
...@@ -143,11 +141,11 @@ fscache_checkaux v9fs_cache_inode_check_aux(void *cookie_netfs_data, ...@@ -143,11 +141,11 @@ fscache_checkaux v9fs_cache_inode_check_aux(void *cookie_netfs_data,
{ {
const struct v9fs_inode *v9inode = cookie_netfs_data; const struct v9fs_inode *v9inode = cookie_netfs_data;
if (buflen != sizeof(v9inode->fscache_key->version)) if (buflen != sizeof(v9inode->qid.version))
return FSCACHE_CHECKAUX_OBSOLETE; return FSCACHE_CHECKAUX_OBSOLETE;
if (memcmp(buffer, &v9inode->fscache_key->version, if (memcmp(buffer, &v9inode->qid.version,
sizeof(v9inode->fscache_key->version))) sizeof(v9inode->qid.version)))
return FSCACHE_CHECKAUX_OBSOLETE; return FSCACHE_CHECKAUX_OBSOLETE;
return FSCACHE_CHECKAUX_OKAY; return FSCACHE_CHECKAUX_OKAY;
......
...@@ -93,15 +93,6 @@ static inline void v9fs_uncache_page(struct inode *inode, struct page *page) ...@@ -93,15 +93,6 @@ static inline void v9fs_uncache_page(struct inode *inode, struct page *page)
BUG_ON(PageFsCache(page)); BUG_ON(PageFsCache(page));
} }
static inline void v9fs_fscache_set_key(struct inode *inode,
struct p9_qid *qid)
{
struct v9fs_inode *v9inode = V9FS_I(inode);
spin_lock(&v9inode->fscache_lock);
v9inode->fscache_key = qid;
spin_unlock(&v9inode->fscache_lock);
}
static inline void v9fs_fscache_wait_on_page_write(struct inode *inode, static inline void v9fs_fscache_wait_on_page_write(struct inode *inode,
struct page *page) struct page *page)
{ {
......
...@@ -487,8 +487,8 @@ static void v9fs_inode_init_once(void *foo) ...@@ -487,8 +487,8 @@ static void v9fs_inode_init_once(void *foo)
struct v9fs_inode *v9inode = (struct v9fs_inode *)foo; struct v9fs_inode *v9inode = (struct v9fs_inode *)foo;
#ifdef CONFIG_9P_FSCACHE #ifdef CONFIG_9P_FSCACHE
v9inode->fscache = NULL; v9inode->fscache = NULL;
v9inode->fscache_key = NULL;
#endif #endif
memset(&v9inode->qid, 0, sizeof(v9inode->qid));
inode_init_once(&v9inode->vfs_inode); inode_init_once(&v9inode->vfs_inode);
} }
......
...@@ -125,8 +125,8 @@ struct v9fs_inode { ...@@ -125,8 +125,8 @@ struct v9fs_inode {
#ifdef CONFIG_9P_FSCACHE #ifdef CONFIG_9P_FSCACHE
spinlock_t fscache_lock; spinlock_t fscache_lock;
struct fscache_cookie *fscache; struct fscache_cookie *fscache;
struct p9_qid *fscache_key;
#endif #endif
struct p9_qid qid;
unsigned int cache_validity; unsigned int cache_validity;
struct p9_fid *writeback_fid; struct p9_fid *writeback_fid;
struct mutex v_mutex; struct mutex v_mutex;
......
...@@ -216,7 +216,6 @@ struct inode *v9fs_alloc_inode(struct super_block *sb) ...@@ -216,7 +216,6 @@ struct inode *v9fs_alloc_inode(struct super_block *sb)
return NULL; return NULL;
#ifdef CONFIG_9P_FSCACHE #ifdef CONFIG_9P_FSCACHE
v9inode->fscache = NULL; v9inode->fscache = NULL;
v9inode->fscache_key = NULL;
spin_lock_init(&v9inode->fscache_lock); spin_lock_init(&v9inode->fscache_lock);
#endif #endif
v9inode->writeback_fid = NULL; v9inode->writeback_fid = NULL;
...@@ -433,6 +432,37 @@ void v9fs_evict_inode(struct inode *inode) ...@@ -433,6 +432,37 @@ void v9fs_evict_inode(struct inode *inode)
} }
} }
static int v9fs_test_inode(struct inode *inode, void *data)
{
int umode;
struct v9fs_inode *v9inode = V9FS_I(inode);
struct p9_wstat *st = (struct p9_wstat *)data;
struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);
umode = p9mode2unixmode(v9ses, st->mode);
/* don't match inode of different type */
if ((inode->i_mode & S_IFMT) != (umode & S_IFMT))
return 0;
/* compare qid details */
if (memcmp(&v9inode->qid.version,
&st->qid.version, sizeof(v9inode->qid.version)))
return 0;
if (v9inode->qid.type != st->qid.type)
return 0;
return 1;
}
static int v9fs_set_inode(struct inode *inode, void *data)
{
struct v9fs_inode *v9inode = V9FS_I(inode);
struct p9_wstat *st = (struct p9_wstat *)data;
memcpy(&v9inode->qid, &st->qid, sizeof(st->qid));
return 0;
}
static struct inode *v9fs_qid_iget(struct super_block *sb, static struct inode *v9fs_qid_iget(struct super_block *sb,
struct p9_qid *qid, struct p9_qid *qid,
struct p9_wstat *st) struct p9_wstat *st)
...@@ -443,7 +473,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, ...@@ -443,7 +473,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
struct v9fs_session_info *v9ses = sb->s_fs_info; struct v9fs_session_info *v9ses = sb->s_fs_info;
i_ino = v9fs_qid2ino(qid); i_ino = v9fs_qid2ino(qid);
inode = iget_locked(sb, i_ino); inode = iget5_locked(sb, i_ino, v9fs_test_inode, v9fs_set_inode, st);
if (!inode) if (!inode)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (!(inode->i_state & I_NEW)) if (!(inode->i_state & I_NEW))
...@@ -453,6 +483,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, ...@@ -453,6 +483,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
* FIXME!! we may need support for stale inodes * FIXME!! we may need support for stale inodes
* later. * later.
*/ */
inode->i_ino = i_ino;
umode = p9mode2unixmode(v9ses, st->mode); umode = p9mode2unixmode(v9ses, st->mode);
retval = v9fs_init_inode(v9ses, inode, umode); retval = v9fs_init_inode(v9ses, inode, umode);
if (retval) if (retval)
...@@ -460,7 +491,6 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, ...@@ -460,7 +491,6 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
v9fs_stat2inode(st, inode, sb); v9fs_stat2inode(st, inode, sb);
#ifdef CONFIG_9P_FSCACHE #ifdef CONFIG_9P_FSCACHE
v9fs_fscache_set_key(inode, &st->qid);
v9fs_cache_inode_get_cookie(inode); v9fs_cache_inode_get_cookie(inode);
#endif #endif
unlock_new_inode(inode); unlock_new_inode(inode);
......
...@@ -86,6 +86,38 @@ static struct dentry *v9fs_dentry_from_dir_inode(struct inode *inode) ...@@ -86,6 +86,38 @@ static struct dentry *v9fs_dentry_from_dir_inode(struct inode *inode)
return dentry; return dentry;
} }
static int v9fs_test_inode_dotl(struct inode *inode, void *data)
{
struct v9fs_inode *v9inode = V9FS_I(inode);
struct p9_stat_dotl *st = (struct p9_stat_dotl *)data;
/* don't match inode of different type */
if ((inode->i_mode & S_IFMT) != (st->st_mode & S_IFMT))
return 0;
if (inode->i_generation != st->st_gen)
return 0;
/* compare qid details */
if (memcmp(&v9inode->qid.version,
&st->qid.version, sizeof(v9inode->qid.version)))
return 0;
if (v9inode->qid.type != st->qid.type)
return 0;
return 1;
}
static int v9fs_set_inode_dotl(struct inode *inode, void *data)
{
struct v9fs_inode *v9inode = V9FS_I(inode);
struct p9_stat_dotl *st = (struct p9_stat_dotl *)data;
memcpy(&v9inode->qid, &st->qid, sizeof(st->qid));
inode->i_generation = st->st_gen;
return 0;
}
static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
struct p9_qid *qid, struct p9_qid *qid,
struct p9_fid *fid, struct p9_fid *fid,
...@@ -97,7 +129,8 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, ...@@ -97,7 +129,8 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
struct v9fs_session_info *v9ses = sb->s_fs_info; struct v9fs_session_info *v9ses = sb->s_fs_info;
i_ino = v9fs_qid2ino(qid); i_ino = v9fs_qid2ino(qid);
inode = iget_locked(sb, i_ino); inode = iget5_locked(sb, i_ino, v9fs_test_inode_dotl,
v9fs_set_inode_dotl, st);
if (!inode) if (!inode)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (!(inode->i_state & I_NEW)) if (!(inode->i_state & I_NEW))
...@@ -107,13 +140,13 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, ...@@ -107,13 +140,13 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
* FIXME!! we may need support for stale inodes * FIXME!! we may need support for stale inodes
* later. * later.
*/ */
inode->i_ino = i_ino;
retval = v9fs_init_inode(v9ses, inode, st->st_mode); retval = v9fs_init_inode(v9ses, inode, st->st_mode);
if (retval) if (retval)
goto error; goto error;
v9fs_stat2inode_dotl(st, inode); v9fs_stat2inode_dotl(st, inode);
#ifdef CONFIG_9P_FSCACHE #ifdef CONFIG_9P_FSCACHE
v9fs_fscache_set_key(inode, &st->qid);
v9fs_cache_inode_get_cookie(inode); v9fs_cache_inode_get_cookie(inode);
#endif #endif
retval = v9fs_get_acl(inode, fid); retval = v9fs_get_acl(inode, fid);
...@@ -136,7 +169,7 @@ v9fs_inode_from_fid_dotl(struct v9fs_session_info *v9ses, struct p9_fid *fid, ...@@ -136,7 +169,7 @@ v9fs_inode_from_fid_dotl(struct v9fs_session_info *v9ses, struct p9_fid *fid,
struct p9_stat_dotl *st; struct p9_stat_dotl *st;
struct inode *inode = NULL; struct inode *inode = NULL;
st = p9_client_getattr_dotl(fid, P9_STATS_BASIC); st = p9_client_getattr_dotl(fid, P9_STATS_BASIC | P9_STATS_GEN);
if (IS_ERR(st)) if (IS_ERR(st))
return ERR_CAST(st); return ERR_CAST(st);
...@@ -547,7 +580,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) ...@@ -547,7 +580,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode)
inode->i_blocks = stat->st_blocks; inode->i_blocks = stat->st_blocks;
} }
if (stat->st_result_mask & P9_STATS_GEN) if (stat->st_result_mask & P9_STATS_GEN)
inode->i_generation = stat->st_gen; inode->i_generation = stat->st_gen;
/* Currently we don't support P9_STATS_BTIME and P9_STATS_DATA_VERSION /* Currently we don't support P9_STATS_BTIME and P9_STATS_DATA_VERSION
* because the inode structure does not have fields for them. * because the inode structure does not have fields for them.
......
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