Unverified Commit e2bc9f6c authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge branch 'cifs-netfs' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs 

Pull cifs netfs updates from David Howells:

This ports cifs over to use the netfs library.

* 'cifs-netfs' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

:
  cifs: Enable large folio support
  cifs: Remove some code that's no longer used, part 3
  cifs: Remove some code that's no longer used, part 2
  cifs: Remove some code that's no longer used, part 1
  cifs: Cut over to using netfslib
  cifs: Implement netfslib hooks
  cifs: Make add_credits_and_wake_if() clear deducted credits
  cifs: Add mempools for cifs_io_request and cifs_io_subrequest structs
  cifs: Set zero_point in the copy_file_range() and remap_file_range()
  cifs: Move cifs_loose_read_iter() and cifs_file_write_iter() to file.c
  cifs: Replace the writedata replay bool with a netfs sreq flag
  cifs: Make wait_mtu_credits take size_t args
  cifs: Use more fields from netfs_io_subrequest
  cifs: Replace cifs_writedata with a wrapper around netfs_io_subrequest
  cifs: Replace cifs_readdata with a wrapper around netfs_io_subrequest
  cifs: Use alternative invalidation to using launder_folio

Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents 3931e678 7c1ac894

fs/netfs/buffered_write.c

+6 −0
Original line number Diff line number Diff line
@@ -405,6 +405,9 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter, 
	} while (iov_iter_count(iter));



out:

	if (likely(written) && ctx->ops->post_modify)

		ctx->ops->post_modify(inode);



	if (unlikely(wreq)) {

		ret2 = netfs_end_writethrough(wreq, &wbc, writethrough);

		wbc_detach_inode(&wbc);
@@ -521,6 +524,7 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr 
	struct folio *folio = page_folio(vmf->page);

	struct file *file = vmf->vma->vm_file;

	struct inode *inode = file_inode(file);

	struct netfs_inode *ictx = netfs_inode(inode);

	vm_fault_t ret = VM_FAULT_RETRY;

	int err;
@@ -567,6 +571,8 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr 
		trace_netfs_folio(folio, netfs_folio_trace_mkwrite);

	netfs_set_group(folio, netfs_group);

	file_update_time(file);

	if (ictx->ops->post_modify)

		ictx->ops->post_modify(inode);

	ret = VM_FAULT_LOCKED;

out:

	sb_end_pagefault(inode->i_sb);

fs/netfs/io.c

+6 −1
Original line number Diff line number Diff line
@@ -213,8 +213,13 @@ static void netfs_rreq_assess_dio(struct netfs_io_request *rreq) 
	unsigned int i;

	size_t transferred = 0;



	for (i = 0; i < rreq->direct_bv_count; i++)

	for (i = 0; i < rreq->direct_bv_count; i++) {

		flush_dcache_page(rreq->direct_bv[i].bv_page);

		// TODO: cifs marks pages in the destination buffer

		// dirty under some circumstances after a read.  Do we

		// need to do that too?

		set_page_dirty(rreq->direct_bv[i].bv_page);

	}



	list_for_each_entry(subreq, &rreq->subrequests, rreq_link) {

		if (subreq->error || subreq->transferred == 0)

fs/smb/client/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config CIFS

	tristate "SMB3 and CIFS support (advanced network filesystem)"

	depends on INET

	select NETFS_SUPPORT

	select NLS

	select NLS_UCS2_UTILS

	select CRYPTO

fs/smb/client/cifsfs.c

+64 −60
Original line number Diff line number Diff line
@@ -371,9 +371,13 @@ static struct kmem_cache *cifs_inode_cachep; 
static struct kmem_cache *cifs_req_cachep;

static struct kmem_cache *cifs_mid_cachep;

static struct kmem_cache *cifs_sm_req_cachep;

static struct kmem_cache *cifs_io_request_cachep;

static struct kmem_cache *cifs_io_subrequest_cachep;

mempool_t *cifs_sm_req_poolp;

mempool_t *cifs_req_poolp;

mempool_t *cifs_mid_poolp;

mempool_t cifs_io_request_pool;

mempool_t cifs_io_subrequest_pool;



static struct inode *

cifs_alloc_inode(struct super_block *sb)
@@ -986,61 +990,6 @@ cifs_smb3_do_mount(struct file_system_type *fs_type, 
	return root;

}





static ssize_t

cifs_loose_read_iter(struct kiocb *iocb, struct iov_iter *iter)

{

	ssize_t rc;

	struct inode *inode = file_inode(iocb->ki_filp);



	if (iocb->ki_flags & IOCB_DIRECT)

		return cifs_user_readv(iocb, iter);



	rc = cifs_revalidate_mapping(inode);

	if (rc)

		return rc;



	return generic_file_read_iter(iocb, iter);

}



static ssize_t cifs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)

{

	struct inode *inode = file_inode(iocb->ki_filp);

	struct cifsInodeInfo *cinode = CIFS_I(inode);

	ssize_t written;

	int rc;



	if (iocb->ki_filp->f_flags & O_DIRECT) {

		written = cifs_user_writev(iocb, from);

		if (written > 0 && CIFS_CACHE_READ(cinode)) {

			cifs_zap_mapping(inode);

			cifs_dbg(FYI,

				 "Set no oplock for inode=%p after a write operation\n",

				 inode);

			cinode->oplock = 0;

		}

		return written;

	}



	written = cifs_get_writer(cinode);

	if (written)

		return written;



	written = generic_file_write_iter(iocb, from);



	if (CIFS_CACHE_WRITE(CIFS_I(inode)))

		goto out;



	rc = filemap_fdatawrite(inode->i_mapping);

	if (rc)

		cifs_dbg(FYI, "cifs_file_write_iter: %d rc on %p inode\n",

			 rc, inode);



out:

	cifs_put_writer(cinode);

	return written;

}



static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)

{

	struct cifsFileInfo *cfile = file->private_data;
@@ -1342,6 +1291,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, 
	rc = cifs_flush_folio(target_inode, destend, &fstart, &fend, false);

	if (rc)

		goto unlock;

	if (fend > target_cifsi->netfs.zero_point)

		target_cifsi->netfs.zero_point = fend + 1;



	/* Discard all the folios that overlap the destination region. */

	cifs_dbg(FYI, "about to discard pages %llx-%llx\n", fstart, fend);
@@ -1360,6 +1311,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off, 
			fscache_resize_cookie(cifs_inode_cookie(target_inode),

					      new_size);

		}

		if (rc == 0 && new_size > target_cifsi->netfs.zero_point)

			target_cifsi->netfs.zero_point = new_size;

	}



	/* force revalidate of size and timestamps of target file now
@@ -1451,6 +1404,8 @@ ssize_t cifs_file_copychunk_range(unsigned int xid, 
	rc = cifs_flush_folio(target_inode, destend, &fstart, &fend, false);

	if (rc)

		goto unlock;

	if (fend > target_cifsi->netfs.zero_point)

		target_cifsi->netfs.zero_point = fend + 1;



	/* Discard all the folios that overlap the destination region. */

	truncate_inode_pages_range(&target_inode->i_data, fstart, fend);
@@ -1567,8 +1522,8 @@ const struct file_operations cifs_file_strict_ops = { 
};



const struct file_operations cifs_file_direct_ops = {

	.read_iter = cifs_direct_readv,

	.write_iter = cifs_direct_writev,

	.read_iter = netfs_unbuffered_read_iter,

	.write_iter = netfs_file_write_iter,

	.open = cifs_open,

	.release = cifs_close,

	.lock = cifs_lock,
@@ -1623,8 +1578,8 @@ const struct file_operations cifs_file_strict_nobrl_ops = { 
};



const struct file_operations cifs_file_direct_nobrl_ops = {

	.read_iter = cifs_direct_readv,

	.write_iter = cifs_direct_writev,

	.read_iter = netfs_unbuffered_read_iter,

	.write_iter = netfs_file_write_iter,

	.open = cifs_open,

	.release = cifs_close,

	.fsync = cifs_fsync,
@@ -1799,6 +1754,48 @@ static void destroy_mids(void) 
	kmem_cache_destroy(cifs_mid_cachep);

}



static int cifs_init_netfs(void)

{

	cifs_io_request_cachep =

		kmem_cache_create("cifs_io_request",

				  sizeof(struct cifs_io_request), 0,

				  SLAB_HWCACHE_ALIGN, NULL);

	if (!cifs_io_request_cachep)

		goto nomem_req;



	if (mempool_init_slab_pool(&cifs_io_request_pool, 100, cifs_io_request_cachep) < 0)

		goto nomem_reqpool;



	cifs_io_subrequest_cachep =

		kmem_cache_create("cifs_io_subrequest",

				  sizeof(struct cifs_io_subrequest), 0,

				  SLAB_HWCACHE_ALIGN, NULL);

	if (!cifs_io_subrequest_cachep)

		goto nomem_subreq;



	if (mempool_init_slab_pool(&cifs_io_subrequest_pool, 100, cifs_io_subrequest_cachep) < 0)

		goto nomem_subreqpool;



	return 0;



nomem_subreqpool:

	kmem_cache_destroy(cifs_io_subrequest_cachep);

nomem_subreq:

	mempool_destroy(&cifs_io_request_pool);

nomem_reqpool:

	kmem_cache_destroy(cifs_io_request_cachep);

nomem_req:

	return -ENOMEM;

}



static void cifs_destroy_netfs(void)

{

	mempool_destroy(&cifs_io_subrequest_pool);

	kmem_cache_destroy(cifs_io_subrequest_cachep);

	mempool_destroy(&cifs_io_request_pool);

	kmem_cache_destroy(cifs_io_request_cachep);

}



static int __init

init_cifs(void)

{
@@ -1903,10 +1900,14 @@ init_cifs(void) 
	if (rc)

		goto out_destroy_deferredclose_wq;



	rc = init_mids();

	rc = cifs_init_netfs();

	if (rc)

		goto out_destroy_inodecache;



	rc = init_mids();

	if (rc)

		goto out_destroy_netfs;



	rc = cifs_init_request_bufs();

	if (rc)

		goto out_destroy_mids;
@@ -1961,6 +1962,8 @@ init_cifs(void) 
	cifs_destroy_request_bufs();

out_destroy_mids:

	destroy_mids();

out_destroy_netfs:

	cifs_destroy_netfs();

out_destroy_inodecache:

	cifs_destroy_inodecache();

out_destroy_deferredclose_wq:
@@ -1999,6 +2002,7 @@ exit_cifs(void) 
#endif

	cifs_destroy_request_bufs();

	destroy_mids();

	cifs_destroy_netfs();

	cifs_destroy_inodecache();

	destroy_workqueue(deferredclose_wq);

	destroy_workqueue(cifsoplockd_wq);

fs/smb/client/cifsfs.h

+3 −8
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ extern int cifs_revalidate_file_attr(struct file *filp); 
extern int cifs_revalidate_dentry_attr(struct dentry *);

extern int cifs_revalidate_file(struct file *filp);

extern int cifs_revalidate_dentry(struct dentry *);

extern int cifs_invalidate_mapping(struct inode *inode);

extern int cifs_revalidate_mapping(struct inode *inode);

extern int cifs_zap_mapping(struct inode *inode);

extern int cifs_getattr(struct mnt_idmap *, const struct path *,
@@ -85,6 +84,7 @@ extern const struct inode_operations cifs_namespace_inode_operations; 




/* Functions related to files and directories */

extern const struct netfs_request_ops cifs_req_ops;

extern const struct file_operations cifs_file_ops;

extern const struct file_operations cifs_file_direct_ops; /* if directio mnt */

extern const struct file_operations cifs_file_strict_ops; /* if strictio mnt */
@@ -94,12 +94,10 @@ extern const struct file_operations cifs_file_strict_nobrl_ops; 
extern int cifs_open(struct inode *inode, struct file *file);

extern int cifs_close(struct inode *inode, struct file *file);

extern int cifs_closedir(struct inode *inode, struct file *file);

extern ssize_t cifs_user_readv(struct kiocb *iocb, struct iov_iter *to);

extern ssize_t cifs_direct_readv(struct kiocb *iocb, struct iov_iter *to);

extern ssize_t cifs_strict_readv(struct kiocb *iocb, struct iov_iter *to);

extern ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from);

extern ssize_t cifs_direct_writev(struct kiocb *iocb, struct iov_iter *from);

extern ssize_t cifs_strict_writev(struct kiocb *iocb, struct iov_iter *from);

ssize_t cifs_file_write_iter(struct kiocb *iocb, struct iov_iter *from);

ssize_t cifs_loose_read_iter(struct kiocb *iocb, struct iov_iter *iter);

extern int cifs_flock(struct file *pfile, int cmd, struct file_lock *plock);

extern int cifs_lock(struct file *, int, struct file_lock *);

extern int cifs_fsync(struct file *, loff_t, loff_t, int);
@@ -110,9 +108,6 @@ extern int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma); 
extern const struct file_operations cifs_dir_ops;

extern int cifs_dir_open(struct inode *inode, struct file *file);

extern int cifs_readdir(struct file *file, struct dir_context *ctx);

extern void cifs_pages_written_back(struct inode *inode, loff_t start, unsigned int len);

extern void cifs_pages_write_failed(struct inode *inode, loff_t start, unsigned int len);

extern void cifs_pages_write_redirty(struct inode *inode, loff_t start, unsigned int len);



/* Functions related to dir entries */

extern const struct dentry_operations cifs_dentry_ops;