Skip to content

L
linux
Commit cb596708 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi:
 "This fixes a regression in the latest fuse update plus a fix for a
  rather theoretical memory ordering issue"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add memory barrier to INIT
  fuse: fix LOOKUP vs INIT compat handling
parents 0b6212e0 9759bd51
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 29 deletions
fs/fuse/dev.c
View file @ cb596708
...@@ -131,6 +131,13 @@ static void fuse_req_init_context(struct fuse_req *req) ...@@ -131,6 +131,13 @@ static void fuse_req_init_context(struct fuse_req *req)
req->in.h.pid = current->pid; req->in.h.pid = current->pid;
} }
void fuse_set_initialized(struct fuse_conn *fc)
{
/* Make sure stores before this are seen on another CPU */
smp_wmb();
fc->initialized = 1;
}
static bool fuse_block_alloc(struct fuse_conn *fc, bool for_background) static bool fuse_block_alloc(struct fuse_conn *fc, bool for_background)
{ {
return !fc->initialized || (for_background && fc->blocked); return !fc->initialized || (for_background && fc->blocked);
...@@ -155,6 +162,8 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages, ...@@ -155,6 +162,8 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages,
if (intr) if (intr)
goto out; goto out;
} }
/* Matches smp_wmb() in fuse_set_initialized() */
smp_rmb();
err = -ENOTCONN; err = -ENOTCONN;
if (!fc->connected) if (!fc->connected)
...@@ -253,6 +262,8 @@ struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc, ...@@ -253,6 +262,8 @@ struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc,
atomic_inc(&fc->num_waiting); atomic_inc(&fc->num_waiting);
wait_event(fc->blocked_waitq, fc->initialized); wait_event(fc->blocked_waitq, fc->initialized);
/* Matches smp_wmb() in fuse_set_initialized() */
smp_rmb();
req = fuse_request_alloc(0); req = fuse_request_alloc(0);
if (!req) if (!req)
req = get_reserved_req(fc, file); req = get_reserved_req(fc, file);
...@@ -511,6 +522,39 @@ void fuse_request_send(struct fuse_conn *fc, struct fuse_req *req) ...@@ -511,6 +522,39 @@ void fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)
} }
EXPORT_SYMBOL_GPL(fuse_request_send); EXPORT_SYMBOL_GPL(fuse_request_send);
static void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args)
{
if (fc->minor < 4 && args->in.h.opcode == FUSE_STATFS)
args->out.args[0].size = FUSE_COMPAT_STATFS_SIZE;
if (fc->minor < 9) {
switch (args->in.h.opcode) {
case FUSE_LOOKUP:
case FUSE_CREATE:
case FUSE_MKNOD:
case FUSE_MKDIR:
case FUSE_SYMLINK:
case FUSE_LINK:
args->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
break;
case FUSE_GETATTR:
case FUSE_SETATTR:
args->out.args[0].size = FUSE_COMPAT_ATTR_OUT_SIZE;
break;
}
}
if (fc->minor < 12) {
switch (args->in.h.opcode) {
case FUSE_CREATE:
args->in.args[0].size = sizeof(struct fuse_open_in);
break;
case FUSE_MKNOD:
args->in.args[0].size = FUSE_COMPAT_MKNOD_IN_SIZE;
break;
}
}
}
ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args) ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
{ {
struct fuse_req *req; struct fuse_req *req;
...@@ -520,6 +564,9 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args) ...@@ -520,6 +564,9 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
if (IS_ERR(req)) if (IS_ERR(req))
return PTR_ERR(req); return PTR_ERR(req);
/* Needs to be done after fuse_get_req() so that fc->minor is valid */
fuse_adjust_compat(fc, args);
req->in.h.opcode = args->in.h.opcode; req->in.h.opcode = args->in.h.opcode;
req->in.h.nodeid = args->in.h.nodeid; req->in.h.nodeid = args->in.h.nodeid;
req->in.numargs = args->in.numargs; req->in.numargs = args->in.numargs;
...@@ -2127,7 +2174,7 @@ void fuse_abort_conn(struct fuse_conn *fc) ...@@ -2127,7 +2174,7 @@ void fuse_abort_conn(struct fuse_conn *fc)
if (fc->connected) { if (fc->connected) {
fc->connected = 0; fc->connected = 0;
fc->blocked = 0; fc->blocked = 0;
fc->initialized = 1; fuse_set_initialized(fc);
end_io_requests(fc); end_io_requests(fc);
end_queued_requests(fc); end_queued_requests(fc);
end_polls(fc); end_polls(fc);
...@@ -2146,7 +2193,7 @@ int fuse_dev_release(struct inode *inode, struct file *file) ...@@ -2146,7 +2193,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)
spin_lock(&fc->lock); spin_lock(&fc->lock);
fc->connected = 0; fc->connected = 0;
fc->blocked = 0; fc->blocked = 0;
fc->initialized = 1; fuse_set_initialized(fc);
end_queued_requests(fc); end_queued_requests(fc);
end_polls(fc); end_polls(fc);
wake_up_all(&fc->blocked_waitq); wake_up_all(&fc->blocked_waitq);
......
fs/fuse/dir.c
View file @ cb596708
...@@ -156,9 +156,6 @@ static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args, ...@@ -156,9 +156,6 @@ static void fuse_lookup_init(struct fuse_conn *fc, struct fuse_args *args,
args->in.args[0].size = name->len + 1; args->in.args[0].size = name->len + 1;
args->in.args[0].value = name->name; args->in.args[0].value = name->name;
args->out.numargs = 1; args->out.numargs = 1;
if (fc->minor < 9)
args->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
else
args->out.args[0].size = sizeof(struct fuse_entry_out); args->out.args[0].size = sizeof(struct fuse_entry_out);
args->out.args[0].value = outarg; args->out.args[0].value = outarg;
} }
...@@ -422,15 +419,11 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, ...@@ -422,15 +419,11 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
args.in.h.opcode = FUSE_CREATE; args.in.h.opcode = FUSE_CREATE;
args.in.h.nodeid = get_node_id(dir); args.in.h.nodeid = get_node_id(dir);
args.in.numargs = 2; args.in.numargs = 2;
args.in.args[0].size = fc->minor < 12 ? sizeof(struct fuse_open_in) : args.in.args[0].size = sizeof(inarg);
sizeof(inarg);
args.in.args[0].value = &inarg; args.in.args[0].value = &inarg;
args.in.args[1].size = entry->d_name.len + 1; args.in.args[1].size = entry->d_name.len + 1;
args.in.args[1].value = entry->d_name.name; args.in.args[1].value = entry->d_name.name;
args.out.numargs = 2; args.out.numargs = 2;
if (fc->minor < 9)
args.out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
else
args.out.args[0].size = sizeof(outentry); args.out.args[0].size = sizeof(outentry);
args.out.args[0].value = &outentry; args.out.args[0].value = &outentry;
args.out.args[1].size = sizeof(outopen); args.out.args[1].size = sizeof(outopen);
...@@ -539,9 +532,6 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_args *args, ...@@ -539,9 +532,6 @@ static int create_new_entry(struct fuse_conn *fc, struct fuse_args *args,
memset(&outarg, 0, sizeof(outarg)); memset(&outarg, 0, sizeof(outarg));
args->in.h.nodeid = get_node_id(dir); args->in.h.nodeid = get_node_id(dir);
args->out.numargs = 1; args->out.numargs = 1;
if (fc->minor < 9)
args->out.args[0].size = FUSE_COMPAT_ENTRY_OUT_SIZE;
else
args->out.args[0].size = sizeof(outarg); args->out.args[0].size = sizeof(outarg);
args->out.args[0].value = &outarg; args->out.args[0].value = &outarg;
err = fuse_simple_request(fc, args); err = fuse_simple_request(fc, args);
...@@ -592,8 +582,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, umode_t mode, ...@@ -592,8 +582,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, umode_t mode,
inarg.umask = current_umask(); inarg.umask = current_umask();
args.in.h.opcode = FUSE_MKNOD; args.in.h.opcode = FUSE_MKNOD;
args.in.numargs = 2; args.in.numargs = 2;
args.in.args[0].size = fc->minor < 12 ? FUSE_COMPAT_MKNOD_IN_SIZE : args.in.args[0].size = sizeof(inarg);
sizeof(inarg);
args.in.args[0].value = &inarg; args.in.args[0].value = &inarg;
args.in.args[1].size = entry->d_name.len + 1; args.in.args[1].size = entry->d_name.len + 1;
args.in.args[1].value = entry->d_name.name; args.in.args[1].value = entry->d_name.name;
...@@ -899,9 +888,6 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat, ...@@ -899,9 +888,6 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
args.in.args[0].size = sizeof(inarg); args.in.args[0].size = sizeof(inarg);
args.in.args[0].value = &inarg; args.in.args[0].value = &inarg;
args.out.numargs = 1; args.out.numargs = 1;
if (fc->minor < 9)
args.out.args[0].size = FUSE_COMPAT_ATTR_OUT_SIZE;
else
args.out.args[0].size = sizeof(outarg); args.out.args[0].size = sizeof(outarg);
args.out.args[0].value = &outarg; args.out.args[0].value = &outarg;
err = fuse_simple_request(fc, &args); err = fuse_simple_request(fc, &args);
...@@ -1574,9 +1560,6 @@ static void fuse_setattr_fill(struct fuse_conn *fc, struct fuse_args *args, ...@@ -1574,9 +1560,6 @@ static void fuse_setattr_fill(struct fuse_conn *fc, struct fuse_args *args,
args->in.args[0].size = sizeof(*inarg_p); args->in.args[0].size = sizeof(*inarg_p);
args->in.args[0].value = inarg_p; args->in.args[0].value = inarg_p;
args->out.numargs = 1; args->out.numargs = 1;
if (fc->minor < 9)
args->out.args[0].size = FUSE_COMPAT_ATTR_OUT_SIZE;
else
args->out.args[0].size = sizeof(*outarg_p); args->out.args[0].size = sizeof(*outarg_p);
args->out.args[0].value = outarg_p; args->out.args[0].value = outarg_p;
} }
......
fs/fuse/fuse_i.h
View file @ cb596708
...@@ -906,4 +906,6 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc); ...@@ -906,4 +906,6 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc);
int fuse_do_setattr(struct inode *inode, struct iattr *attr, int fuse_do_setattr(struct inode *inode, struct iattr *attr,
struct file *file); struct file *file);
void fuse_set_initialized(struct fuse_conn *fc);
#endif /* _FS_FUSE_I_H */ #endif /* _FS_FUSE_I_H */
fs/fuse/inode.c
View file @ cb596708
...@@ -424,8 +424,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf) ...@@ -424,8 +424,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
args.in.h.opcode = FUSE_STATFS; args.in.h.opcode = FUSE_STATFS;
args.in.h.nodeid = get_node_id(dentry->d_inode); args.in.h.nodeid = get_node_id(dentry->d_inode);
args.out.numargs = 1; args.out.numargs = 1;
args.out.args[0].size = args.out.args[0].size = sizeof(outarg);
fc->minor < 4 ? FUSE_COMPAT_STATFS_SIZE : sizeof(outarg);
args.out.args[0].value = &outarg; args.out.args[0].value = &outarg;
err = fuse_simple_request(fc, &args); err = fuse_simple_request(fc, &args);
if (!err) if (!err)
...@@ -898,7 +897,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req) ...@@ -898,7 +897,7 @@ static void process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
fc->max_write = max_t(unsigned, 4096, fc->max_write); fc->max_write = max_t(unsigned, 4096, fc->max_write);
fc->conn_init = 1; fc->conn_init = 1;
} }
fc->initialized = 1; fuse_set_initialized(fc);
wake_up_all(&fc->blocked_waitq); wake_up_all(&fc->blocked_waitq);
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7