SUNRPC: Add generic helpers for xdr_stream encode/decode
Subsystems (2)
PATCH 1/4 SUNRPC: Add generic helpers for xdr_stream encode/decode
Add some generic helpers for encoding/decoding opaque structures and basic u32/u64.
Signed-off-by Trond Myklebust <[email protected]>
--- include/linux/sunrpc/xdr.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+)
include/linux/sunrpc/xdr.h +93 -0
@@ -242,6 +242,99 @@ extern unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len);extern void xdr_enter_page (struct xdr_stream *xdr,unsigned int len);extern int xdr_process_buf (struct xdr_buf *buf,unsigned int offset,unsigned int len,int (*actor)(struct scatterlist *,void *),void *data); +static inline size_t +xdr_align_size (size_t n) +{ +const size_t mask =sizeof (__u32) -1 ; + +return (n + mask) & ~mask; +} + +static inline ssize_t +xdr_stream_encode_u32 (struct xdr_stream *xdr,__u32 n) +{ +const size_t len =sizeof (n); +__be32 *p =xdr_reserve_space (xdr, len); + +if (unlikely (!p)) +return -ENOBUFS ; + *p =cpu_to_be32 (n); +return len; +} + +static inline ssize_t +xdr_stream_encode_u64 (struct xdr_stream *xdr,__u64 n) +{ +const size_t len =sizeof (n); +__be32 *p =xdr_reserve_space (xdr, len); + +if (unlikely (!p)) +return -ENOBUFS ; +xdr_encode_hyper (p, n); +return len; +} + +static inline ssize_t +xdr_stream_encode_opaque_fixed (struct xdr_stream *xdr,const void *ptr,size_t len) +{ +__be32 *p =xdr_reserve_space (xdr, len); + +if (unlikely (!p)) +return -ENOBUFS ; +xdr_encode_opaque_fixed (p, ptr, len); +return xdr_align_size (len); +} + +static inline ssize_t +xdr_stream_encode_opaque (struct xdr_stream *xdr,const void *ptr,size_t len) +{ +__be32 *p =xdr_reserve_space (xdr, len); + +if (unlikely (!p)) +return -ENOBUFS ; +xdr_encode_opaque (p, ptr, len); +return xdr_align_size (len); +} + +static inline ssize_t +xdr_stream_decode_u32 (struct xdr_stream *xdr,__u32 *n) +{ +const size_t len =sizeof (*n); +__be32 *p =xdr_inline_decode (xdr, len); +if (unlikely (!p)) +return -ENOBUFS ; + *n =be32_to_cpup (p); +return len; +} + +static inline ssize_t +xdr_stream_decode_opaque_fixed (struct xdr_stream *xdr,void *ptr,size_t len) +{ +__be32 *p =xdr_inline_decode (xdr, len); + +if (unlikely (!p)) +return -ENOBUFS ; +xdr_decode_opaque_fixed (p, ptr, len); +return len; +} + +static inline ssize_t +xdr_stream_decode_opaque_inline (struct xdr_stream *xdr,void **ptr) +{ +__be32 *p; +__u32 len; + +if (unlikely (xdr_stream_decode_u32 (xdr, &len) <0 )) +return -ENOBUFS ; +if (len !=0 ) { + p =xdr_inline_decode (xdr, len); +if (unlikely (!p)) +return -ENOBUFS ; + *ptr = p; + }else + *ptr =NULL ; +return len; +}#endif /* __KERNEL__ */ #endif /* _SUNRPC_XDR_H_ */
Signature · 1 line
2.9.3
PATCH 2/4 NFSv4: Replace ad-hoc xdr encode/decode helpers with xdr_stream_* generics
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/callback_xdr.c | 8 ++---- fs/nfs/flexfilelayout/flexfilelayout.c | 5 +--- fs/nfs/nfs4xdr.c | 52 ++++++++++------------------------ 3 files changed, 18 insertions(+), 47 deletions(-)
fs/nfs/callback_xdr.c +2 -6
@@ -582,12 +582,8 @@ static __be32 decode_notify_lock_args(struct svc_rqst *rqstp, struct xdr_streamstatic __be32 encode_string (struct xdr_stream *xdr,unsigned int len,const char *str) { -__be32 *p; - - p =xdr_reserve_space (xdr,4 + len); -if (unlikely (p ==NULL )) -return htonl (NFS4ERR_RESOURCE ); -xdr_encode_opaque (p, str, len); +if (unlikely (xdr_stream_encode_opaque (xdr, str, len) <0 )) +return cpu_to_be32 (NFS4ERR_RESOURCE );return 0 ; }
fs/nfs/flexfilelayout/flexfilelayout.c +1 -4
@@ -1966,10 +1966,7 @@ static int ff_layout_encode_ioerr(struct xdr_stream *xdr,static void encode_opaque_fixed (struct xdr_stream *xdr,const void *buf,size_t len) { -__be32 *p; - - p =xdr_reserve_space (xdr, len); -xdr_encode_opaque_fixed (p, buf, len); +WARN_ON_ONCE (xdr_stream_encode_opaque_fixed (xdr, buf, len) <0 ); } static void
fs/nfs/nfs4xdr.c +15 -37
84 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH 3/4 NFSv4: Fix the underestimation of delegation XDR space reservation
Account for the "space_limit" field in struct open_write_delegation4.
Fixes 2cebf82883f4 ("NFSv4: Fix the underestimate of NFSv4 open request size")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs4xdr.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/nfs4xdr.c +2 -0
@@ -169,8 +169,10 @@ static int nfs4_stat_to_errno(int); open_owner_id_maxsz + \ encode_opentype_maxsz + \ encode_claim_null_maxsz) +#define decode_space_limit_maxsz (3)#define decode_ace_maxsz (3 + nfs4_owner_maxsz)#define decode_delegation_maxsz (1 + decode_stateid_maxsz + 1 + \ + decode_space_limit_maxsz + \ decode_ace_maxsz)#define decode_change_info_maxsz (5)#define decode_open_maxsz (op_decode_hdr_maxsz + \
Signature · 1 line
2.9.3
PATCH 4/4 NFSv4: Remove bogus "struct nfs_client" argument from decode_ace()
We shouldn't need to force callers to carry an unused argument.
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs4xdr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs4xdr.c +2 -2
@@ -3125,7 +3125,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) }/* Dummy routine */ -static int decode_ace (struct xdr_stream *xdr,void *ace,struct nfs_client *clp) +static int decode_ace (struct xdr_stream *xdr,void *ace) {__be32 *p;unsigned int strlen;
@@ -5073,7 +5073,7 @@ static int decode_rw_delegation(struct xdr_stream *xdr,if (decode_space_limit (xdr, &res->pagemod_limit) <0 )return -EIO ; } -return decode_ace (xdr,NULL , res->server->nfs_client); +return decode_ace (xdr,NULL ); out_overflow:print_overflow_msg (__func__, xdr);return -EIO ;
Signature · 1 line
2.9.3