From: bfields@fieldses.org (J. Bruce Fields)
To: Olga Kornievskaia <olga.kornievskaia@gmail.com>
Cc: bfields@redhat.com, linux-nfs@vger.kernel.org
Subject: Re: [PATCH v4 2/8] NFSD add ca_source_server<> to COPY
Date: Wed, 17 Jul 2019 17:40:36 -0400 [thread overview]
Message-ID: <20190717214036.GN24608@fieldses.org> (raw)
In-Reply-To: <20190708192352.12614-3-olga.kornievskaia@gmail.com>
On Mon, Jul 08, 2019 at 03:23:46PM -0400, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
>
> Decode the ca_source_server list that's sent but only use the
> first one. Presence of non-zero list indicates an "inter" copy.
>
> Signed-off-by: Andy Adamson <andros@netapp.com>
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
> fs/nfsd/nfs4xdr.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
> fs/nfsd/xdr4.h | 12 +++++----
> 2 files changed, 80 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 52c4f6d..15f53bb 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -40,6 +40,7 @@
> #include <linux/utsname.h>
> #include <linux/pagemap.h>
> #include <linux/sunrpc/svcauth_gss.h>
> +#include <linux/sunrpc/addr.h>
>
> #include "idmap.h"
> #include "acl.h"
> @@ -1744,11 +1745,58 @@ static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, str
> DECODE_TAIL;
> }
>
> +static __be32 nfsd4_decode_nl4_server(struct nfsd4_compoundargs *argp,
> + struct nl4_server *ns)
> +{
> + DECODE_HEAD;
> + struct nfs42_netaddr *naddr;
> +
> + READ_BUF(4);
> + ns->nl4_type = be32_to_cpup(p++);
> +
> + /* currently support for 1 inter-server source server */
> + switch (ns->nl4_type) {
> + case NL4_NAME:
> + case NL4_URL:
> + READ_BUF(4);
> + ns->u.nl4_str_sz = be32_to_cpup(p++);
> + if (ns->u.nl4_str_sz > NFS4_OPAQUE_LIMIT)
> + goto xdr_error;
> +
> + READ_BUF(ns->u.nl4_str_sz);
> + COPYMEM(ns->u.nl4_str,
> + ns->u.nl4_str_sz);
> + break;
Do we actually have plans to use this case? If not, it's probably not
worth saving these fields.
--b.
> + case NL4_NETADDR:
> + naddr = &ns->u.nl4_addr;
> +
> + READ_BUF(4);
> + naddr->netid_len = be32_to_cpup(p++);
> + if (naddr->netid_len > RPCBIND_MAXNETIDLEN)
> + goto xdr_error;
> +
> + READ_BUF(naddr->netid_len + 4); /* 4 for uaddr len */
> + COPYMEM(naddr->netid, naddr->netid_len);
> +
> + naddr->addr_len = be32_to_cpup(p++);
> + if (naddr->addr_len > RPCBIND_MAXUADDRLEN)
> + goto xdr_error;
> +
> + READ_BUF(naddr->addr_len);
> + COPYMEM(naddr->addr, naddr->addr_len);
> + break;
> + default:
> + goto xdr_error;
> + }
> + DECODE_TAIL;
> +}
> +
> static __be32
> nfsd4_decode_copy(struct nfsd4_compoundargs *argp, struct nfsd4_copy *copy)
> {
> DECODE_HEAD;
> - unsigned int tmp;
> + struct nl4_server *ns_dummy;
> + int i, count;
>
> status = nfsd4_decode_stateid(argp, ©->cp_src_stateid);
> if (status)
> @@ -1763,8 +1811,31 @@ static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, str
> p = xdr_decode_hyper(p, ©->cp_count);
> p++; /* ca_consecutive: we always do consecutive copies */
> copy->cp_synchronous = be32_to_cpup(p++);
> - tmp = be32_to_cpup(p); /* Source server list not supported */
> + count = be32_to_cpup(p++);
>
> + copy->cp_intra = false;
> + if (count == 0) { /* intra-server copy */
> + copy->cp_intra = true;
> + goto intra;
> + }
> +
> + /* decode all the supplied server addresses but use first */
> + status = nfsd4_decode_nl4_server(argp, ©->cp_src);
> + if (status)
> + return status;
> +
> + ns_dummy = kmalloc(sizeof(struct nl4_server), GFP_KERNEL);
> + if (ns_dummy == NULL)
> + return nfserrno(-ENOMEM);
> + for (i = 0; i < count - 1; i++) {
> + status = nfsd4_decode_nl4_server(argp, ns_dummy);
> + if (status) {
> + kfree(ns_dummy);
> + return status;
> + }
> + }
> + kfree(ns_dummy);
> +intra:
> DECODE_TAIL;
> }
>
> diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> index feeb6d4..513c9ff 100644
> --- a/fs/nfsd/xdr4.h
> +++ b/fs/nfsd/xdr4.h
> @@ -516,11 +516,13 @@ struct nfsd42_write_res {
>
> struct nfsd4_copy {
> /* request */
> - stateid_t cp_src_stateid;
> - stateid_t cp_dst_stateid;
> - u64 cp_src_pos;
> - u64 cp_dst_pos;
> - u64 cp_count;
> + stateid_t cp_src_stateid;
> + stateid_t cp_dst_stateid;
> + u64 cp_src_pos;
> + u64 cp_dst_pos;
> + u64 cp_count;
> + struct nl4_server cp_src;
> + bool cp_intra;
>
> /* both */
> bool cp_synchronous;
> --
> 1.8.3.1
next prev parent reply other threads:[~2019-07-17 21:40 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 19:23 [PATCH v4 0/8] server-side support for "inter" SSC copy Olga Kornievskaia
2019-07-08 19:23 ` [PATCH v4 1/8] NFSD fill-in netloc4 structure Olga Kornievskaia
2019-07-17 21:13 ` J. Bruce Fields
2019-07-22 19:59 ` Olga Kornievskaia
2019-07-30 15:48 ` Olga Kornievskaia
2019-07-30 15:51 ` J. Bruce Fields
2019-07-08 19:23 ` [PATCH v4 2/8] NFSD add ca_source_server<> to COPY Olga Kornievskaia
2019-07-17 21:40 ` J. Bruce Fields [this message]
2019-07-22 20:00 ` Olga Kornievskaia
2019-07-08 19:23 ` [PATCH v4 3/8] NFSD return nfs4_stid in nfs4_preprocess_stateid_op Olga Kornievskaia
2019-07-08 19:23 ` [PATCH v4 4/8] NFSD add COPY_NOTIFY operation Olga Kornievskaia
2019-07-09 12:34 ` Anna Schumaker
2019-07-09 15:51 ` Olga Kornievskaia
2019-07-17 22:12 ` J. Bruce Fields
2019-07-17 22:15 ` J. Bruce Fields
2019-07-22 20:03 ` Olga Kornievskaia
2019-07-17 23:07 ` J. Bruce Fields
2019-07-22 20:17 ` Olga Kornievskaia
2019-07-23 20:45 ` J. Bruce Fields
2019-07-30 15:48 ` Olga Kornievskaia
2019-07-30 15:55 ` J. Bruce Fields
2019-07-30 16:13 ` Olga Kornievskaia
2019-07-30 17:10 ` Olga Kornievskaia
2019-07-08 19:23 ` [PATCH v4 5/8] NFSD check stateids against copy stateids Olga Kornievskaia
2019-07-19 22:01 ` J. Bruce Fields
2019-07-22 20:24 ` Olga Kornievskaia
2019-07-23 20:58 ` J. Bruce Fields
2019-07-30 16:03 ` Olga Kornievskaia
2019-07-31 21:10 ` Olga Kornievskaia
2019-07-31 21:51 ` J. Bruce Fields
2019-08-01 14:12 ` Olga Kornievskaia
2019-08-01 15:12 ` J. Bruce Fields
2019-08-01 15:41 ` Olga Kornievskaia
2019-08-01 18:06 ` Olga Kornievskaia
2019-08-01 18:11 ` J. Bruce Fields
2019-08-01 18:24 ` Olga Kornievskaia
2019-08-01 19:36 ` J. Bruce Fields
2019-08-07 16:02 ` Olga Kornievskaia
2019-08-07 16:08 ` J. Bruce Fields
2019-08-07 16:42 ` Olga Kornievskaia
2019-08-08 11:25 ` J. Bruce Fields
2019-07-08 19:23 ` [PATCH v4 6/8] NFSD generalize nfsd4_compound_state flag names Olga Kornievskaia
2019-07-08 19:23 ` [PATCH v4 7/8] NFSD: allow inter server COPY to have a STALE source server fh Olga Kornievskaia
2019-07-23 21:35 ` J. Bruce Fields
2019-07-30 15:48 ` Olga Kornievskaia
2019-07-08 19:23 ` [PATCH v4 8/8] NFSD add nfs4 inter ssc to nfsd4_copy Olga Kornievskaia
2019-07-09 12:43 ` Anna Schumaker
2019-07-09 15:53 ` Olga Kornievskaia
2019-07-09 3:53 ` [PATCH v4 0/8] server-side support for "inter" SSC copy J. Bruce Fields
2019-07-09 15:47 ` Olga Kornievskaia
2019-07-17 18:05 ` Olga Kornievskaia
-- strict thread matches above, loose matches on Subject: below --
2017-09-28 17:29 [PATCH v4 0/8] NFSD support for "inter" server-to-server COPY Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 2/8] NFSD add ca_source_server<> to COPY Olga Kornievskaia
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=20190717214036.GN24608@fieldses.org \
--to=bfields@fieldses.org \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.com \
/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.