[Devel,vz7,33/46] fuse: pqueue locking

Submitted by Maxim Patlasov on March 25, 2017, 2:25 a.m.

Details

Message ID 149040872651.25341.11783402507205415186.stgit@maxim-thinkpad
State New
Series "fuse: add multi-threading support"
Headers show

Commit Message

Maxim Patlasov March 25, 2017, 2:25 a.m.
Backport from ml:

commit 45a91cb1a4fd9bb0e53c95e3dc9185dd5b5ba245
Author: Miklos Szeredi <mszeredi@suse.cz>
Date:   Wed Jul 1 16:26:06 2015 +0200

    fuse: pqueue locking

    Add a fpq->lock for protecting members of struct fuse_pqueue and FR_LOCKED
    request flag.

    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Reviewed-by: Ashish Samant <ashish.samant@oracle.com>

Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com>
---
 fs/fuse/dev.c    |   19 +++++++++++++++++--
 fs/fuse/fuse_i.h |    3 +++
 fs/fuse/inode.c  |    1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 0191c17..4b69221 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1256,7 +1256,9 @@  static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
 		request_end(fc, req);
 		goto restart;
 	}
+	spin_lock(&fpq->lock);
 	list_add(&req->list, &fpq->io);
+	spin_unlock(&fpq->lock);
 	spin_unlock(&fc->lock);
 	cs->req = req;
 	err = fuse_copy_one(cs, &in->h, sizeof(in->h));
@@ -1265,6 +1267,7 @@  static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
 				     (struct fuse_arg *) in->args, 0);
 	fuse_copy_finish(cs);
 	spin_lock(&fc->lock);
+	spin_lock(&fpq->lock);
 	clear_bit(FR_LOCKED, &req->flags);
 	if (!fpq->connected) {
 		err = -ENODEV;
@@ -1279,6 +1282,7 @@  static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
 		goto out_end;
 	}
 	list_move_tail(&req->list, &fpq->processing);
+	spin_unlock(&fpq->lock);
 	set_bit(FR_SENT, &req->flags);
 	/* matches barrier in request_wait_answer() */
 	smp_mb__after_atomic();
@@ -1290,6 +1294,7 @@  static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
 
 out_end:
 	list_del_init(&req->list);
+	spin_unlock(&fpq->lock);
 	request_end(fc, req);
 	return err;
 
@@ -1890,16 +1895,19 @@  static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
 		goto err_finish;
 
 	spin_lock(&fc->lock);
+	spin_lock(&fpq->lock);
 	err = -ENOENT;
 	if (!fpq->connected)
-		goto err_unlock;
+		goto err_unlock_pq;
 
 	req = request_find(fpq, oh.unique);
 	if (!req)
-		goto err_unlock;
+		goto err_unlock_pq;
 
 	/* Is it an interrupt reply? */
 	if (req->intr_unique == oh.unique) {
+		spin_unlock(&fpq->lock);
+
 		err = -EINVAL;
 		if (nbytes != sizeof(struct fuse_out_header))
 			goto err_unlock;
@@ -1918,6 +1926,7 @@  static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
 	list_move(&req->list, &fpq->io);
 	req->out.h = oh;
 	set_bit(FR_LOCKED, &req->flags);
+	spin_unlock(&fpq->lock);
 	cs->req = req;
 	if (!req->out.page_replace)
 		cs->move_pages = 0;
@@ -1927,16 +1936,20 @@  static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
 	fuse_copy_finish(cs);
 
 	spin_lock(&fc->lock);
+	spin_lock(&fpq->lock);
 	clear_bit(FR_LOCKED, &req->flags);
 	if (!fpq->connected)
 		err = -ENOENT;
 	else if (err)
 		req->out.h.error = -EIO;
 	list_del_init(&req->list);
+	spin_unlock(&fpq->lock);
 	request_end(fc, req);
 
 	return err ? err : nbytes;
 
+ err_unlock_pq:
+	spin_unlock(&fpq->lock);
  err_unlock:
 	spin_unlock(&fc->lock);
  err_finish:
@@ -2124,6 +2137,7 @@  void fuse_abort_conn(struct fuse_conn *fc)
 		fc->connected = 0;
 		fc->blocked = 0;
 		fuse_set_initialized(fc);
+		spin_lock(&fpq->lock);
 		fpq->connected = 0;
 		list_for_each_entry_safe(req, next, &fpq->io, list) {
 			req->out.h.error = -ECONNABORTED;
@@ -2134,6 +2148,7 @@  void fuse_abort_conn(struct fuse_conn *fc)
 			spin_unlock(&req->waitq.lock);
 		}
 		list_splice_init(&fpq->processing, &to_end2);
+		spin_unlock(&fpq->lock);
 		fc->max_background = UINT_MAX;
 		flush_bg_queue(fc);
 
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index cabe549..98bdb56 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -438,6 +438,9 @@  struct fuse_pqueue {
 	/** Connection established */
 	unsigned connected;
 
+	/** Lock protecting accessess to  members of this structure */
+	spinlock_t lock;
+
 	/** The list of requests being processed */
 	struct list_head processing;
 
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index c95418d..c9bbd56 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -700,6 +700,7 @@  static void fuse_iqueue_init(struct fuse_iqueue *fiq)
 static void fuse_pqueue_init(struct fuse_pqueue *fpq)
 {
 	memset(fpq, 0, sizeof(struct fuse_pqueue));
+	spin_lock_init(&fpq->lock);
 	INIT_LIST_HEAD(&fpq->processing);
 	INIT_LIST_HEAD(&fpq->io);
 	fpq->connected = 1;