Commit a7ba4bf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fuse updates from Miklos Szeredi:
 "This is the start of improving fuse scalability.

  An input queue and a processing queue is split out from the monolithic
  fuse connection, each of those having their own spinlock.  The end of
  the patchset adds the ability to clone a fuse connection.  This means,
  that instead of having to read/write requests/answers on a single fuse
  device fd, the fuse daemon can have multiple distinct file descriptors
  open.  Each of those can be used to receive requests and send answers,
  currently the only constraint is that a request must be answered on
  the same fd as it was read from.

  This can be extended further to allow binding a device clone to a
  specific CPU or NUMA node.

  Based on a patchset by Srinivas Eeda and Ashish Samant.  Thanks to
  Ashish for the review of this series"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (40 commits)
  fuse: update MAINTAINERS entry
  fuse: separate pqueue for clones
  fuse: introduce per-instance fuse_dev structure
  fuse: device fd clone
  fuse: abort: no fc->lock needed for request ending
  fuse: no fc->lock for pqueue parts
  fuse: no fc->lock in request_end()
  fuse: cleanup request_end()
  fuse: request_end(): do once
  fuse: add req flag for private list
  fuse: pqueue locking
  fuse: abort: group pqueue accesses
  fuse: cleanup fuse_dev_do_read()
  fuse: move list_del_init() from request_end() into callers
  fuse: duplicate ->connected in pqueue
  fuse: separate out processing queue
  fuse: simplify request_wait()
  fuse: no fc->lock for iqueue parts
  fuse: allow interrupt queuing without fc->lock
  fuse: iqueue locking
  ...
parents a611fb75 0a30f612

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ Code Seq#(hex) Include File Comments 
0xDB	00-0F	drivers/char/mwave/mwavepub.h

0xDD	00-3F	ZFCP device driver	see drivers/s390/scsi/

					<mailto:aherrman@de.ibm.com>

0xE5	00-3F	linux/fuse.h

0xEC	00-01	drivers/platform/chrome/cros_ec_dev.h	ChromeOS EC driver

0xF3	00-3F	drivers/usb/misc/sisusbvga/sisusb.h	sisfb (in development)

					<mailto:thomas@winischhofer.net>

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -4430,9 +4430,11 @@ FUSE: FILESYSTEM IN USERSPACE 
M:	Miklos Szeredi <miklos@szeredi.hu>

L:	fuse-devel@lists.sourceforge.net

W:	http://fuse.sourceforge.net/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git

S:	Maintained

F:	fs/fuse/

F:	include/uapi/linux/fuse.h

F:	Documentation/filesystems/fuse.txt



FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)

M:	Rik Faith <faith@cs.unc.edu>

fs/fuse/cuse.c

+11 −4
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ static void cuse_fc_release(struct fuse_conn *fc) 
 */

static int cuse_channel_open(struct inode *inode, struct file *file)

{

	struct fuse_dev *fud;

	struct cuse_conn *cc;

	int rc;
@@ -499,17 +500,22 @@ static int cuse_channel_open(struct inode *inode, struct file *file) 


	fuse_conn_init(&cc->fc);



	fud = fuse_dev_alloc(&cc->fc);

	if (!fud) {

		kfree(cc);

		return -ENOMEM;

	}



	INIT_LIST_HEAD(&cc->list);

	cc->fc.release = cuse_fc_release;



	cc->fc.connected = 1;

	cc->fc.initialized = 1;

	rc = cuse_send_init(cc);

	if (rc) {

		fuse_conn_put(&cc->fc);

		fuse_dev_free(fud);

		return rc;

	}

	file->private_data = &cc->fc;	/* channel owns base reference to cc */

	file->private_data = fud;



	return 0;

}
@@ -527,7 +533,8 @@ static int cuse_channel_open(struct inode *inode, struct file *file) 
 */

static int cuse_channel_release(struct inode *inode, struct file *file)

{

	struct cuse_conn *cc = fc_to_cc(file->private_data);

	struct fuse_dev *fud = file->private_data;

	struct cuse_conn *cc = fc_to_cc(fud->fc);

	int rc;



	/* remove from the conntbl, no more access from this point on */

fs/fuse/dev.c

+431 −394

File changed.

Preview size limit exceeded, changes collapsed.

fs/fuse/file.c

+10 −10
Original line number Diff line number Diff line
@@ -96,17 +96,17 @@ static void fuse_file_put(struct fuse_file *ff, bool sync) 
			 * Drop the release request when client does not

			 * implement 'open'

			 */

			req->background = 0;

			__clear_bit(FR_BACKGROUND, &req->flags);

			iput(req->misc.release.inode);

			fuse_put_request(ff->fc, req);

		} else if (sync) {

			req->background = 0;

			__clear_bit(FR_BACKGROUND, &req->flags);

			fuse_request_send(ff->fc, req);

			iput(req->misc.release.inode);

			fuse_put_request(ff->fc, req);

		} else {

			req->end = fuse_release_end;

			req->background = 1;

			__set_bit(FR_BACKGROUND, &req->flags);

			fuse_request_send_background(ff->fc, req);

		}

		kfree(ff);
@@ -299,8 +299,8 @@ void fuse_sync_release(struct fuse_file *ff, int flags) 
{

	WARN_ON(atomic_read(&ff->count) > 1);

	fuse_prepare_release(ff, flags, FUSE_RELEASE);

	ff->reserved_req->force = 1;

	ff->reserved_req->background = 0;

	__set_bit(FR_FORCE, &ff->reserved_req->flags);

	__clear_bit(FR_BACKGROUND, &ff->reserved_req->flags);

	fuse_request_send(ff->fc, ff->reserved_req);

	fuse_put_request(ff->fc, ff->reserved_req);

	kfree(ff);
@@ -426,7 +426,7 @@ static int fuse_flush(struct file *file, fl_owner_t id) 
	req->in.numargs = 1;

	req->in.args[0].size = sizeof(inarg);

	req->in.args[0].value = &inarg;

	req->force = 1;

	__set_bit(FR_FORCE, &req->flags);

	fuse_request_send(fc, req);

	err = req->out.h.error;

	fuse_put_request(fc, req);
@@ -1611,7 +1611,8 @@ static int fuse_writepage_locked(struct page *page) 
	if (!req)

		goto err;



	req->background = 1; /* writeback always goes to bg_queue */

	/* writeback always goes to bg_queue */

	__set_bit(FR_BACKGROUND, &req->flags);

	tmp_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);

	if (!tmp_page)

		goto err_free;
@@ -1742,8 +1743,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, 
		}

	}



	if (old_req->num_pages == 1 && (old_req->state == FUSE_REQ_INIT ||

					old_req->state == FUSE_REQ_PENDING)) {

	if (old_req->num_pages == 1 && test_bit(FR_PENDING, &old_req->flags)) {

		struct backing_dev_info *bdi = inode_to_bdi(page->mapping->host);



		copy_highpage(old_req->pages[0], page);
@@ -1830,7 +1830,7 @@ static int fuse_writepages_fill(struct page *page, 
		req->misc.write.in.write_flags |= FUSE_WRITE_CACHE;

		req->misc.write.next = NULL;

		req->in.argpages = 1;

		req->background = 1;

		__set_bit(FR_BACKGROUND, &req->flags);

		req->num_pages = 0;

		req->end = fuse_writepage_end;

		req->inode = inode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE