NFS: readdir with vmapped pages
Subsystems (2)
PATCH 6/6 NFS: readdir with vmapped pages
NFS readdir with vmapped pages
We can use vmapped pages to read more information from the network at once. This will reduce the number of calls needed to complete a readdir.
Signed-off-by Bryan Schumaker <[email protected]>
---
fs/nfs/client.c +2 -2
@@ -901,8 +901,8 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, struct nfs_fsinfo * server->wtmult =nfs_block_bits (fsinfo->wtmult,NULL ); server->dtsize =nfs_block_size (fsinfo->dtpref,NULL ); -if (server->dtsize >PAGE_CACHE_SIZE ) - server->dtsize =PAGE_CACHE_SIZE ; +if (server->dtsize >PAGE_CACHE_SIZE *NFS_MAX_READDIR_PAGES ) + server->dtsize =PAGE_CACHE_SIZE *NFS_MAX_READDIR_PAGES ;if (server->dtsize > server->rsize) server->dtsize = server->rsize;
fs/nfs/dir.c +43 -11
103 lines not on this page · raw message
fs/nfs/internal.h +6 -0
@@ -63,6 +63,12 @@ struct nfs_clone_mount {#define NFS_UNSPEC_PORT (-1)/* +* Maximum number of pages that readdir can use for creating +* a vmapped array of pages. +*/ +#define NFS_MAX_READDIR_PAGES 8 + +/* * In-kernel mount arguments */ struct nfs_parsed_mount_data {
fs/nfs/nfs3proc.c +2 -2
@@ -611,7 +611,7 @@ out:*/ static int nfs3_proc_readdir (struct dentry *dentry,struct rpc_cred *cred, -u64 cookie,struct page *page,unsigned int count,int plus) +u64 cookie,struct page **pages,unsigned int count,int plus) {struct inode *dir = dentry->d_inode;__be32 *verf =NFS_COOKIEVERF (dir);
@@ -621,7 +621,7 @@ nfs3_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, .verf = {verf[0], verf[1]}, .plus = plus, .count = count, - .pages = &page + .pages = pages };struct nfs3_readdirres res = { .verf = verf,
fs/nfs/nfs4proc.c +4 -4
@@ -2896,12 +2896,12 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, }static int _nfs4_proc_readdir (struct dentry *dentry,struct rpc_cred *cred, -u64 cookie,struct page *page,unsigned int count,int plus) +u64 cookie,struct page **pages,unsigned int count,int plus) {struct inode *dir = dentry->d_inode;struct nfs4_readdir_arg args = { .fh =NFS_FH (dir), - .pages = &page, + .pages = pages, .pgbase =0 , .count = count, .bitmask =NFS_SERVER (dentry->d_inode)->attr_bitmask,
@@ -2932,14 +2932,14 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, }static int nfs4_proc_readdir (struct dentry *dentry,struct rpc_cred *cred, -u64 cookie,struct page *page,unsigned int count,int plus) +u64 cookie,struct page **pages,unsigned int count,int plus) {struct nfs4_exception exception = { };int err;do { err =nfs4_handle_exception (NFS_SERVER (dentry->d_inode),_nfs4_proc_readdir (dentry, cred, cookie, - page, count, plus), + pages, count, plus), &exception); }while (exception.retry);return err;
fs/nfs/nfs4xdr.c +1 -1
@@ -4225,7 +4225,7 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n pglen = recvd;xdr_read_pages (xdr, pglen); -BUG_ON (pglen + readdir->pgbase >PAGE_CACHE_SIZE ); +BUG_ON (pglen + readdir->pgbase >PAGE_CACHE_SIZE *NFS_MAX_READDIR_PAGES ); kaddr = p =kmap_atomic (page,KM_USER0 ); end = p + ((pglen + readdir->pgbase) >>2 ); entry = p;
include/linux/nfs_xdr.h +1 -1
@@ -1044,7 +1044,7 @@ struct nfs_rpc_ops {int (*mkdir) (struct inode *,struct dentry *,struct iattr *);int (*rmdir) (struct inode *,struct qstr *);int (*readdir) (struct dentry *,struct rpc_cred *, -u64 ,struct page *,unsigned int ,int ); +u64 ,struct page **,unsigned int ,int );int (*mknod) (struct inode *,struct dentry *,struct iattr *,dev_t ); int (*statfs) (struct nfs_server *, struct nfs_fh *,