cifs: Use netfslib and fscache rewrite
Subsystems (2)
RFC PATCH 1/1 cifs: Use netfslib and fscache rewrite
Hi Steve, Shyam,
Here's an updated patch to make cifs use netfslib for reading. It's built on top of my fscache-rewrite branch. It seems to work - at least for ordinary unencrypted reads.
The xarray iov_iter is passed from cifs_req_issue_op(), which is called by netfslib, down to sock_recvmsg() rather than populating the page array and using readpages_fill_pages().
cifs_readpages_copy_into_pages() is more problematic - and I haven't fixed it yet. The problem is that I have two iterators and I need to simply copy data from one to the other, but there's no convenient way to do that as yet.
David
--- fs/cifs/Kconfig | 1 fs/cifs/cifsglob.h | 2 fs/cifs/cifsproto.h | 3 fs/cifs/cifssmb.c | 16 + fs/cifs/connect.c | 18 + fs/cifs/file.c | 582 ++++++++++++++-------------------------------------- fs/cifs/fscache.c | 35 --- fs/cifs/fscache.h | 52 ---- fs/cifs/smb2pdu.c | 10 9 files changed, 201 insertions(+), 518 deletions(-)
fs/cifs/Kconfig +1 -0
@@ -2,6 +2,7 @@ config CIFS tristate "SMB3 and CIFS support (advanced network filesystem)" depends on INET + select NETFS_SUPPORT select NLS select CRYPTO select CRYPTO_MD5
fs/cifs/cifsglob.h +2 -0
@@ -1320,6 +1320,7 @@ struct cifs_aio_ctx {/* asynchronous read support */ struct cifs_readdata { +struct netfs_read_subrequest *subreq;struct kref refcount;struct list_head list;struct completion done;
@@ -1338,6 +1339,7 @@ struct cifs_readdata {int (*copy_into_pages)(struct TCP_Server_Info *server,struct cifs_readdata *rdata,struct iov_iter *iter); +struct iov_iter iter;struct kvec iov[2 ];struct TCP_Server_Info *server;#ifdef CONFIG_CIFS_SMB_DIRECT
fs/cifs/cifsproto.h +3 -0
@@ -237,6 +237,9 @@ extern int cifs_read_page_from_socket(struct TCP_Server_Info *server,unsigned int page_offset, unsigned int to_read);extern int cifs_setup_cifs_sb (struct cifs_sb_info *cifs_sb); +extern int cifs_read_iter_from_socket (struct TCP_Server_Info *server, +struct iov_iter *iter, +unsigned int to_read);extern int cifs_match_super (struct super_block *,void *);extern int cifs_mount (struct cifs_sb_info *cifs_sb,struct smb3_fs_context *ctx);extern void cifs_umount (struct cifs_sb_info *);
fs/cifs/cifssmb.c +12 -4
@@ -23,6 +23,7 @@#include <linux/swap.h> #include <linux/task_io_accounting_ops.h> #include <linux/uaccess.h> +#include <linux/netfs.h> #include "cifspdu.h" #include "cifsglob.h" #include "cifsacl.h"
@@ -1332,11 +1333,11 @@ int cifs_discard_remaining_data(struct TCP_Server_Info *server) {unsigned int rfclen = server->pdu_size; -int remaining = rfclen + server->vals->header_preamble_size - +size_t remaining = rfclen + server->vals->header_preamble_size - server->total_read;while (remaining >0 ) { -int length; +ssize_t length; length = cifs_discard_from_socket(server, min_t(size_t, remaining,
@@ -1551,7 +1552,15 @@ cifs_readv_callback(struct mid_q_entry *mid) rdata->result = -EIO ; } -queue_work (cifsiod_wq, &rdata->work); +if (rdata->subreq) { +netfs_subreq_terminated (rdata->subreq, + (rdata->result ==0 || rdata->result == -EAGAIN ) ? + rdata->got_bytes : rdata->result, + false); +kref_put (&rdata->refcount, cifs_readdata_release); + }else { +queue_work (cifsiod_wq, &rdata->work); + }DeleteMidQEntry (mid);add_credits (server, &credits,0 ); }
@@ -1996,7 +2005,6 @@ cifs_writev_complete(struct work_struct *work)else if (wdata->result <0 )SetPageError (page);end_page_writeback (page); -cifs_readpage_to_fscache (inode, page);put_page (page); }if (wdata->result != -EAGAIN )
fs/cifs/connect.c +17 -1
@@ -162,7 +162,7 @@ static void cifs_resolve_server(struct work_struct *work)mutex_unlock (&server->srv_mutex); } -/** +/* * Mark all sessions and tcons for reconnect. * * @server needs to be previously set to CifsNeedReconnect.
@@ -656,6 +656,22 @@ cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page,return cifs_readv_from_socket (server, &smb_msg); } +int +cifs_read_iter_from_socket (struct TCP_Server_Info *server,struct iov_iter *iter, +unsigned int to_read) +{ +struct msghdr smb_msg; +int ret; + + smb_msg.msg_iter = *iter; +if (smb_msg.msg_iter.count > to_read) + smb_msg.msg_iter.count = to_read; + ret =cifs_readv_from_socket (server, &smb_msg); +if (ret >0 ) +iov_iter_advance (iter, ret); +return ret; +} +static bool is_smb_response (struct TCP_Server_Info *server,unsigned char type) {
fs/cifs/file.c +157 -425
718 lines not on this page · raw message
fs/cifs/fscache.c +0 -35
@@ -133,38 +133,3 @@ void cifs_fscache_release_inode_cookie(struct inode *inode) cifsi->fscache =NULL ; } } - -/* -* Retrieve a page from FS-Cache -*/ -int __cifs_readpage_from_fscache (struct inode *inode,struct page *page) -{ -cifs_dbg (FYI ,"%s: (fsc:%p, p:%p, i:0x%p\n" , - __func__,CIFS_I (inode)->fscache, page, inode); -return -ENOBUFS ;// Needs conversion to using netfslib -} - -/* -* Retrieve a set of pages from FS-Cache -*/ -int __cifs_readpages_from_fscache (struct inode *inode, -struct address_space *mapping, -struct list_head *pages, -unsigned *nr_pages) -{ -cifs_dbg (FYI ,"%s: (0x%p/%u/0x%p)\n" , - __func__,CIFS_I (inode)->fscache, *nr_pages, inode); -return -ENOBUFS ;// Needs conversion to using netfslib -} - -void __cifs_readpage_to_fscache (struct inode *inode,struct page *page) -{ -struct cifsInodeInfo *cifsi =CIFS_I (inode); - -WARN_ON (!cifsi->fscache); - -cifs_dbg (FYI ,"%s: (fsc: %p, p: %p, i: %p)\n" , - __func__, cifsi->fscache, page, inode); - -// Needs conversion to using netfslib -}
fs/cifs/fscache.h +0 -52
69 lines not on this page · raw message
fs/cifs/smb2pdu.c +9 -1
@@ -23,6 +23,7 @@#include <linux/uuid.h> #include <linux/pagemap.h> #include <linux/xattr.h> +#include <linux/netfs.h> #include "cifsglob.h" #include "cifsacl.h" #include "cifsproto.h"
@@ -4084,7 +4085,14 @@ smb2_readv_callback(struct mid_q_entry *mid) tcon->tid, tcon->ses->Suid, rdata->offset, rdata->got_bytes); -queue_work (cifsiod_wq, &rdata->work); +if (rdata->subreq) { +netfs_subreq_terminated (rdata->subreq, + (rdata->result ==0 || rdata->result == -EAGAIN ) ? + rdata->got_bytes : rdata->result, false); +kref_put (&rdata->refcount, cifs_readdata_release); + }else { +queue_work (cifsiod_wq, &rdata->work); + }DeleteMidQEntry (mid);add_credits (server, &credits,0 ); }