> On Feb 18, 2017, at 2:12 PM, Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> wrote:
>
> Add some generic helpers for encoding/decoding opaque structures and
> basic u32/u64.
I have some random-thoughts-slash-wacky-ideas.
I'm going to paint the garden shed a little since
these helpers appear to be broadly applicable.
Generally speaking I like the idea of building
"stream" versions of the traditional basic type
encoders and decoders.
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> ---
> include/linux/sunrpc/xdr.h | 173 +++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 173 insertions(+)
>
> diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
> index 56c48c884a24..37bf1be20b62 100644
> --- a/include/linux/sunrpc/xdr.h
> +++ b/include/linux/sunrpc/xdr.h
> @@ -242,6 +242,179 @@ 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);
>
> +/**
> + * xdr_align_size - Calculate padded size of an object
> + * @n: Size of an object being XDR encoded (in bytes)
> + *
> + * Return value:
> + * Size (in bytes) of the object including xdr padding
> + */
> +static inline size_t
> +xdr_align_size(size_t n)
> +{
> + const size_t mask = sizeof(__u32) - 1;
I know this doesn't make a functional difference, but
I'm wondering if this should be sizeof(__be32), since
it is actually the size of a wire object? Seems like
that is a common question wherever sizeof is used
below.
Is this a constant variable rather than an enum because
you want it to retain the type of size_t (matching the
type of the xdr_inline_{en,de}code() functions) ?
Since we see sizeof(yada) repeated elsewhere, did you
consider defining size constants in a scope where they
can be shared amongst all of the XDR functions?
For example, xdr_reserve_space itself could immediately
make use of a "sizeof(__be32) - 1" constant.
Is your intention to replace XDR_QUADLEN with this
function eventually?
> +
> + return (n + mask) & ~mask;
> +}
> +
> +/**
> + * xdr_stream_encode_u32 - Encode a 32-bit integer
> + * @xdr: pointer to xdr_stream
> + * @n: integer to encode
> + *
> + * Return values:
> + * On success, returns length in bytes of XDR buffer consumed
> + * %-ENOBUFS on XDR buffer overflow
I've never been crazy about these amplified return
types, though I know it's typical kernel coding style.
Here, though, I wonder if they are really necessary.
The returned length seems to be interesting only for
decoding variable-length objects (farther below). Maybe
those are the only functions that need to provide a
positive return value?
Perhaps the WARN_ON_ONCE calls added in later patches
should be in these helpers instead of in their callers.
Then the encoder helpers can return void.
> + */
> +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;
> +}
> +
> +/**
> + * xdr_stream_encode_u64 - Encode a 64-bit integer
> + * @xdr: pointer to xdr_stream
> + * @n: 64-bit integer to encode
> + *
> + * Return values:
> + * On success, returns length in bytes of XDR buffer consumed
> + * %-ENOBUFS on XDR buffer overflow
> + */
> +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;
> +}
> +
> +/**
> + * xdr_stream_encode_opaque_fixed - Encode fixed length opaque xdr data
> + * @xdr: pointer to xdr_stream
> + * @ptr: pointer to opaque data object
> + * @len: size of object pointed to by @ptr
> + *
> + * Return values:
> + * On success, returns length in bytes of XDR buffer consumed
> + * %-ENOBUFS on XDR buffer overflow
> + */
> +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);
Seems like the caller can use xdr_align_size() just as
easily as overloading the return value here, for example.
But I can't think of any fixed-size opaque XDR object
that is not already properly rounded up, or where the
length is not already known to the XDR layer (as a
defined macro constant).
> +}
> +
> +/**
> + * xdr_stream_encode_opaque - Encode variable length opaque xdr data
> + * @xdr: pointer to xdr_stream
> + * @ptr: pointer to opaque data object
> + * @len: size of object pointed to by @ptr
> + *
> + * Return values:
> + * On success, returns length in bytes of XDR buffer consumed
> + * %-ENOBUFS on XDR buffer overflow
> + */
> +static inline ssize_t
> +xdr_stream_encode_opaque(struct xdr_stream *xdr, const void *ptr, size_t len)
> +{
> + size_t count = sizeof(__u32) + xdr_align_size(len);
> + __be32 *p = xdr_reserve_space(xdr, count);
> +
> + if (unlikely(!p))
> + return -ENOBUFS;
> + xdr_encode_opaque(p, ptr, len);
> + return count;
These helpers already update the state of the passed
in xdr_stream, so a caller typically would not need
to care much about the bytes consumed by the encoded
opaque.
> +}
> +
> +/**
> + * xdr_stream_decode_u32 - Decode a 32-bit integer
> + * @xdr: pointer to xdr_stream
> + * @ptr: location to store integer
> + *
> + * Return values:
> + * %0 on success
> + * %-ENOBUFS on XDR buffer overflow
> + */
> +static inline ssize_t
> +xdr_stream_decode_u32(struct xdr_stream *xdr, __u32 *ptr)
> +{
> + const size_t count = sizeof(*ptr);
> + __be32 *p = xdr_inline_decode(xdr, count);
> +
> + if (unlikely(!p))
> + return -ENOBUFS;
> + *ptr = be32_to_cpup(p);
> + return 0;
No length returned here. The caller knows the length
of this object, clearly, and only cares about whether
decoding has overrun the XDR stream.
> +}
> +
> +/**
> + * xdr_stream_decode_opaque_fixed - Decode fixed length opaque xdr data
> + * @xdr: pointer to xdr_stream
> + * @ptr: location to store data
> + * @len: size of buffer pointed to by @ptr
> + *
> + * Return values:
> + * On success, returns size of object stored in @ptr
You're returning the passed-in length. Thus the caller
already knows the size of the object stored at @ptr.
> + * %-ENOBUFS on XDR buffer overflow
> + */
> +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;
> +}
> +
> +/**
> + * xdr_stream_decode_opaque_inline - Decode variable length opaque xdr data
> + * @xdr: pointer to xdr_stream
> + * @ptr: location to store pointer to opaque data
> + *
> + * Note: the pointer stored in @ptr cannot be assumed valid after the XDR
> + * buffer has been destroyed, or even after calling xdr_inline_decode()
> + * on @xdr. It is therefore expected that the object it points to should
> + * be processed immediately.
> + *
> + * Return values:
> + * On success, returns size of object stored in *@ptr
This seems to be the only function where the caller
might not already know the length of the object, but
might actually care. Since the object length can be
considered part of the object itself, maybe that
length should be returned via an output parameter
rather than as the function's return value.
> + * %-ENOBUFS on XDR buffer overflow
EINVAL is probably better: the caller didn't provide
the correct inputs. That's a nit, though.
However, as a matter of defensive coding, this errno
could leak up the stack if developers are not careful.
A boolean return value could be entirely adequate for
these decoders?
> + */
> +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_ */
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Chuck Lever
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
