From: "J. Bruce Fields" <bfields@redhat.com>
To: Olga Kornievskaia <kolga@netapp.com>
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH v4 02/10] NFSD OFFLOAD_STATUS xdr
Date: Thu, 28 Sep 2017 15:34:13 -0400 [thread overview]
Message-ID: <20170928193413.GO10182@parsley.fieldses.org> (raw)
In-Reply-To: <20170928172945.50780-3-kolga@netapp.com>
On Thu, Sep 28, 2017 at 01:29:37PM -0400, Olga Kornievskaia wrote:
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
> fs/nfsd/nfs4proc.c | 20 ++++++++++++++++++++
> fs/nfsd/nfs4xdr.c | 30 ++++++++++++++++++++++++++++--
> fs/nfsd/xdr4.h | 10 ++++++++++
> 3 files changed, 58 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 3c69db7..8601fc4 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1142,6 +1142,13 @@ static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write)
> fput(file);
> return status;
> }
> +static __be32
> +nfsd4_offload_status(struct svc_rqst *rqstp,
> + struct nfsd4_compound_state *cstate,
> + union nfsd4_op_u *u)
> +{
> + return nfserr_notsupp;
> +}
>
> static __be32
> nfsd4_allocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> @@ -2039,6 +2046,14 @@ static inline u32 nfsd4_copy_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> 1 /* cr_synchronous */) * sizeof(__be32);
> }
>
> +static inline u32 nfsd4_offload_status_rsize(struct svc_rqst *rqstp,
> + struct nfsd4_op *op)
> +{
> + return (op_encode_hdr_size +
> + 2 /* osr_count */ +
> + 1 /* osr_complete<1> optional 0 for now */) * sizeof(__be32);
> +}
> +
> #ifdef CONFIG_NFSD_PNFS
> static inline u32 nfsd4_getdeviceinfo_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> {
> @@ -2452,6 +2467,11 @@ static inline u32 nfsd4_seek_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> .op_name = "OP_SEEK",
> .op_rsize_bop = nfsd4_seek_rsize,
> },
> + [OP_OFFLOAD_STATUS] = {
> + .op_func = nfsd4_offload_status,
> + .op_name = "OP_OFFLOAD_STATUS",
> + .op_rsize_bop = nfsd4_offload_status_rsize,
> + },
> };
>
> /**
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 2c61c6b..ed8b61f 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -1768,6 +1768,13 @@ static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, str
> }
>
> static __be32
> +nfsd4_decode_offload_status(struct nfsd4_compoundargs *argp,
> + struct nfsd4_offload_status *os)
> +{
> + return nfsd4_decode_stateid(argp, &os->stateid);
> +}
> +
> +static __be32
> nfsd4_decode_seek(struct nfsd4_compoundargs *argp, struct nfsd4_seek *seek)
> {
> DECODE_HEAD;
> @@ -1874,7 +1881,7 @@ static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, str
> [OP_LAYOUTERROR] = (nfsd4_dec)nfsd4_decode_notsupp,
> [OP_LAYOUTSTATS] = (nfsd4_dec)nfsd4_decode_notsupp,
> [OP_OFFLOAD_CANCEL] = (nfsd4_dec)nfsd4_decode_notsupp,
> - [OP_OFFLOAD_STATUS] = (nfsd4_dec)nfsd4_decode_notsupp,
> + [OP_OFFLOAD_STATUS] = (nfsd4_dec)nfsd4_decode_offload_status,
> [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_notsupp,
> [OP_SEEK] = (nfsd4_dec)nfsd4_decode_seek,
> [OP_WRITE_SAME] = (nfsd4_dec)nfsd4_decode_notsupp,
> @@ -4216,6 +4223,25 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
> }
>
> static __be32
> +nfsd4_encode_offload_status(struct nfsd4_compoundres *resp, __be32 nfserr,
> + struct nfsd4_offload_status *os)
> +{
> + struct xdr_stream *xdr = &resp->xdr;
> + __be32 *p;
> +
> + if (nfserr)
> + return nfserr;
Note you can skip this--see upstream bac966d60652 and b7571e4cd39a.
--b.
> +
> + p = xdr_reserve_space(xdr, 8 + 4);
> + if (!p)
> + return nfserr_resource;
> + p = xdr_encode_hyper(p, os->count);
> + *p++ = cpu_to_be32(0);
> +
> + return nfserr;
> +}
> +
> +static __be32
> nfsd4_encode_seek(struct nfsd4_compoundres *resp, __be32 nfserr,
> struct nfsd4_seek *seek)
> {
> @@ -4318,7 +4344,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
> [OP_LAYOUTERROR] = (nfsd4_enc)nfsd4_encode_noop,
> [OP_LAYOUTSTATS] = (nfsd4_enc)nfsd4_encode_noop,
> [OP_OFFLOAD_CANCEL] = (nfsd4_enc)nfsd4_encode_noop,
> - [OP_OFFLOAD_STATUS] = (nfsd4_enc)nfsd4_encode_noop,
> + [OP_OFFLOAD_STATUS] = (nfsd4_enc)nfsd4_encode_offload_status,
> [OP_READ_PLUS] = (nfsd4_enc)nfsd4_encode_noop,
> [OP_SEEK] = (nfsd4_enc)nfsd4_encode_seek,
> [OP_WRITE_SAME] = (nfsd4_enc)nfsd4_encode_noop,
> diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> index 4ac2676..9b0c099 100644
> --- a/fs/nfsd/xdr4.h
> +++ b/fs/nfsd/xdr4.h
> @@ -542,6 +542,15 @@ struct nfsd4_seek {
> loff_t seek_pos;
> };
>
> +struct nfsd4_offload_status {
> + /* request */
> + stateid_t stateid;
> +
> + /* response */
> + u64 count;
> + u32 status;
> +};
> +
> struct nfsd4_op {
> int opnum;
> const struct nfsd4_operation * opdesc;
> @@ -600,6 +609,7 @@ struct nfsd4_op {
> struct nfsd4_fallocate deallocate;
> struct nfsd4_clone clone;
> struct nfsd4_copy copy;
> + struct nfsd4_offload_status offload_status;
> struct nfsd4_seek seek;
> } u;
> struct nfs4_replay * replay;
> --
> 1.8.3.1
>
next prev parent reply other threads:[~2017-09-28 19:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 17:29 [PATCH v4 00/10] NFSD support for asynchronous COPY Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 01/10] NFSD CB_OFFLOAD xdr Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 02/10] NFSD OFFLOAD_STATUS xdr Olga Kornievskaia
2017-09-28 19:34 ` J. Bruce Fields [this message]
2017-09-28 17:29 ` [PATCH v4 03/10] NFSD OFFLOAD_CANCEL xdr Olga Kornievskaia
2017-09-28 19:34 ` J. Bruce Fields
2017-09-28 19:40 ` Olga Kornievskaia
2017-09-28 19:44 ` J. Bruce Fields
2017-09-28 17:29 ` [PATCH v4 04/10] NFSD xdr callback stateid in async COPY reply Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 05/10] NFSD first draft of async copy Olga Kornievskaia
2017-09-28 18:07 ` J. Bruce Fields
2017-09-28 18:44 ` Olga Kornievskaia
2017-09-28 18:55 ` J. Bruce Fields
[not found] ` <805B49AE-1DB0-4FB1-BEEB-84A7740E9B09@netapp.com>
2017-09-28 19:07 ` J. Bruce Fields
2017-09-28 19:11 ` Olga Kornievskaia
2017-09-29 21:51 ` Olga Kornievskaia
2017-10-02 16:10 ` J. Bruce Fields
2017-09-28 18:16 ` J. Bruce Fields
2017-09-28 17:29 ` [PATCH v4 06/10] NFSD return nfs4_stid in nfs4_preprocess_stateid_op Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 07/10] NFSD create new stateid for async copy Olga Kornievskaia
2017-09-28 19:12 ` J. Bruce Fields
2017-09-28 19:21 ` Olga Kornievskaia
2017-09-28 19:24 ` J. Bruce Fields
2017-09-28 17:29 ` [PATCH v4 08/10] NFSD handle OFFLOAD_CANCEL op Olga Kornievskaia
2017-09-28 18:38 ` J. Bruce Fields
2017-10-09 14:53 ` Olga Kornievskaia
2017-10-09 15:58 ` J. Bruce Fields
2017-10-10 21:14 ` Olga Kornievskaia
2017-10-11 14:07 ` J. Bruce Fields
2017-10-11 15:02 ` Olga Kornievskaia
2017-10-11 15:19 ` J. Bruce Fields
2017-10-11 16:08 ` Olga Kornievskaia
2017-10-12 10:56 ` Jeff Layton
2017-09-28 17:29 ` [PATCH v4 09/10] NFSD support OFFLOAD_STATUS Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 10/10] NFSD stop queued async copies on client shutdown Olga Kornievskaia
2017-09-28 19:21 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170928193413.GO10182@parsley.fieldses.org \
--to=bfields@redhat.com \
--cc=kolga@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.