mirror of
https://github.com/torvalds/linux
synced 2024-10-16 08:19:01 +00:00
8154ef2776
Move common code in NFSD's legacy NFS WRITE decoders into a helper. The immediate benefit is reduction of code duplication and some nice micro-optimizations (see below). In the long term, this helper can perform a per-transport call-out to fill the rq_vec (say, using RDMA Reads). The legacy WRITE decoders and procs are changed to work like NFSv4, which constructs the rq_vec just before it is about to call vfs_writev. Why? Calling a transport call-out from the proc instead of the XDR decoder means that the incoming FH can be resolved to a particular filesystem and file. This would allow pages from the backing file to be presented to the transport to be filled, rather than presenting anonymous pages and copying or flipping them into the file's page cache later. I also prefer using the pages in rq_arg.pages, instead of pulling the data pages directly out of the rqstp::rq_pages array. This is currently the way the NFSv3 write decoder works, but the other two do not seem to take this approach. Fixing this removes the only reference to rq_pages found in NFSD, eliminating an NFSD assumption about how transports use the pages in rq_pages. Lastly, avoid setting up the first element of rq_vec as a zero- length buffer. This happens with an RDMA transport when a normal Read chunk is present because the data payload is in rq_arg's page list (none of it is in the head buffer). Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
165 lines
3.5 KiB
C
165 lines
3.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* XDR types for nfsd. This is mainly a typing exercise. */
|
|
|
|
#ifndef LINUX_NFSD_H
|
|
#define LINUX_NFSD_H
|
|
|
|
#include <linux/vfs.h>
|
|
#include "nfsd.h"
|
|
#include "nfsfh.h"
|
|
|
|
struct nfsd_fhandle {
|
|
struct svc_fh fh;
|
|
};
|
|
|
|
struct nfsd_sattrargs {
|
|
struct svc_fh fh;
|
|
struct iattr attrs;
|
|
};
|
|
|
|
struct nfsd_diropargs {
|
|
struct svc_fh fh;
|
|
char * name;
|
|
unsigned int len;
|
|
};
|
|
|
|
struct nfsd_readargs {
|
|
struct svc_fh fh;
|
|
__u32 offset;
|
|
__u32 count;
|
|
int vlen;
|
|
};
|
|
|
|
struct nfsd_writeargs {
|
|
svc_fh fh;
|
|
__u32 offset;
|
|
int len;
|
|
struct kvec first;
|
|
};
|
|
|
|
struct nfsd_createargs {
|
|
struct svc_fh fh;
|
|
char * name;
|
|
unsigned int len;
|
|
struct iattr attrs;
|
|
};
|
|
|
|
struct nfsd_renameargs {
|
|
struct svc_fh ffh;
|
|
char * fname;
|
|
unsigned int flen;
|
|
struct svc_fh tfh;
|
|
char * tname;
|
|
unsigned int tlen;
|
|
};
|
|
|
|
struct nfsd_readlinkargs {
|
|
struct svc_fh fh;
|
|
char * buffer;
|
|
};
|
|
|
|
struct nfsd_linkargs {
|
|
struct svc_fh ffh;
|
|
struct svc_fh tfh;
|
|
char * tname;
|
|
unsigned int tlen;
|
|
};
|
|
|
|
struct nfsd_symlinkargs {
|
|
struct svc_fh ffh;
|
|
char * fname;
|
|
unsigned int flen;
|
|
char * tname;
|
|
unsigned int tlen;
|
|
struct iattr attrs;
|
|
};
|
|
|
|
struct nfsd_readdirargs {
|
|
struct svc_fh fh;
|
|
__u32 cookie;
|
|
__u32 count;
|
|
__be32 * buffer;
|
|
};
|
|
|
|
struct nfsd_attrstat {
|
|
struct svc_fh fh;
|
|
struct kstat stat;
|
|
};
|
|
|
|
struct nfsd_diropres {
|
|
struct svc_fh fh;
|
|
struct kstat stat;
|
|
};
|
|
|
|
struct nfsd_readlinkres {
|
|
int len;
|
|
};
|
|
|
|
struct nfsd_readres {
|
|
struct svc_fh fh;
|
|
unsigned long count;
|
|
struct kstat stat;
|
|
};
|
|
|
|
struct nfsd_readdirres {
|
|
int count;
|
|
|
|
struct readdir_cd common;
|
|
__be32 * buffer;
|
|
int buflen;
|
|
__be32 * offset;
|
|
};
|
|
|
|
struct nfsd_statfsres {
|
|
struct kstatfs stats;
|
|
};
|
|
|
|
/*
|
|
* Storage requirements for XDR arguments and results.
|
|
*/
|
|
union nfsd_xdrstore {
|
|
struct nfsd_sattrargs sattr;
|
|
struct nfsd_diropargs dirop;
|
|
struct nfsd_readargs read;
|
|
struct nfsd_writeargs write;
|
|
struct nfsd_createargs create;
|
|
struct nfsd_renameargs rename;
|
|
struct nfsd_linkargs link;
|
|
struct nfsd_symlinkargs symlink;
|
|
struct nfsd_readdirargs readdir;
|
|
};
|
|
|
|
#define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore)
|
|
|
|
|
|
int nfssvc_decode_void(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_fhandle(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_readargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_writeargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_createargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_renameargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_readlinkargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_linkargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_symlinkargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_decode_readdirargs(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_void(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_attrstat(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_diropres(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_readlinkres(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_readres(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *);
|
|
int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *);
|
|
|
|
int nfssvc_encode_entry(void *, const char *name,
|
|
int namlen, loff_t offset, u64 ino, unsigned int);
|
|
|
|
void nfssvc_release_fhandle(struct svc_rqst *);
|
|
|
|
/* Helper functions for NFSv2 ACL code */
|
|
__be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, struct kstat *stat);
|
|
__be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp);
|
|
|
|
#endif /* LINUX_NFSD_H */
|