From: Tom Haynes <thomas.haynes@primarydata.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH v5 04/51] nfs41: pull decode_ds_addr from file layout to generic pnfs
Date: Thu, 22 Jan 2015 15:35:36 -0800 [thread overview]
Message-ID: <1421969783-92997-5-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1421969783-92997-1-git-send-email-loghyr@primarydata.com>
From: Peng Tao <tao.peng@primarydata.com>
It can be reused by flexfile layout.
Reviewed-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
---
fs/nfs/filelayout/filelayoutdev.c | 152 +-------------------------------------
fs/nfs/pnfs.h | 3 +
fs/nfs/pnfs_nfs.c | 149 +++++++++++++++++++++++++++++++++++++
3 files changed, 154 insertions(+), 150 deletions(-)
diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c
index fbfbb70..c7f6041 100644
--- a/fs/nfs/filelayout/filelayoutdev.c
+++ b/fs/nfs/filelayout/filelayoutdev.c
@@ -31,7 +31,6 @@
#include <linux/nfs_fs.h>
#include <linux/vmalloc.h>
#include <linux/module.h>
-#include <linux/sunrpc/addr.h>
#include "../internal.h"
#include "../nfs4session.h"
@@ -104,153 +103,6 @@ nfs4_fl_free_deviceid(struct nfs4_file_layout_dsaddr *dsaddr)
kfree(dsaddr);
}
-/*
- * Currently only supports ipv4, ipv6 and one multi-path address.
- */
-static struct nfs4_pnfs_ds_addr *
-decode_ds_addr(struct net *net, struct xdr_stream *streamp, gfp_t gfp_flags)
-{
- struct nfs4_pnfs_ds_addr *da = NULL;
- char *buf, *portstr;
- __be16 port;
- int nlen, rlen;
- int tmp[2];
- __be32 *p;
- char *netid, *match_netid;
- size_t len, match_netid_len;
- char *startsep = "";
- char *endsep = "";
-
-
- /* r_netid */
- p = xdr_inline_decode(streamp, 4);
- if (unlikely(!p))
- goto out_err;
- nlen = be32_to_cpup(p++);
-
- p = xdr_inline_decode(streamp, nlen);
- if (unlikely(!p))
- goto out_err;
-
- netid = kmalloc(nlen+1, gfp_flags);
- if (unlikely(!netid))
- goto out_err;
-
- netid[nlen] = '\0';
- memcpy(netid, p, nlen);
-
- /* r_addr: ip/ip6addr with port in dec octets - see RFC 5665 */
- p = xdr_inline_decode(streamp, 4);
- if (unlikely(!p))
- goto out_free_netid;
- rlen = be32_to_cpup(p);
-
- p = xdr_inline_decode(streamp, rlen);
- if (unlikely(!p))
- goto out_free_netid;
-
- /* port is ".ABC.DEF", 8 chars max */
- if (rlen > INET6_ADDRSTRLEN + IPV6_SCOPE_ID_LEN + 8) {
- dprintk("%s: Invalid address, length %d\n", __func__,
- rlen);
- goto out_free_netid;
- }
- buf = kmalloc(rlen + 1, gfp_flags);
- if (!buf) {
- dprintk("%s: Not enough memory\n", __func__);
- goto out_free_netid;
- }
- buf[rlen] = '\0';
- memcpy(buf, p, rlen);
-
- /* replace port '.' with '-' */
- portstr = strrchr(buf, '.');
- if (!portstr) {
- dprintk("%s: Failed finding expected dot in port\n",
- __func__);
- goto out_free_buf;
- }
- *portstr = '-';
-
- /* find '.' between address and port */
- portstr = strrchr(buf, '.');
- if (!portstr) {
- dprintk("%s: Failed finding expected dot between address and "
- "port\n", __func__);
- goto out_free_buf;
- }
- *portstr = '\0';
-
- da = kzalloc(sizeof(*da), gfp_flags);
- if (unlikely(!da))
- goto out_free_buf;
-
- INIT_LIST_HEAD(&da->da_node);
-
- if (!rpc_pton(net, buf, portstr-buf, (struct sockaddr *)&da->da_addr,
- sizeof(da->da_addr))) {
- dprintk("%s: error parsing address %s\n", __func__, buf);
- goto out_free_da;
- }
-
- portstr++;
- sscanf(portstr, "%d-%d", &tmp[0], &tmp[1]);
- port = htons((tmp[0] << 8) | (tmp[1]));
-
- switch (da->da_addr.ss_family) {
- case AF_INET:
- ((struct sockaddr_in *)&da->da_addr)->sin_port = port;
- da->da_addrlen = sizeof(struct sockaddr_in);
- match_netid = "tcp";
- match_netid_len = 3;
- break;
-
- case AF_INET6:
- ((struct sockaddr_in6 *)&da->da_addr)->sin6_port = port;
- da->da_addrlen = sizeof(struct sockaddr_in6);
- match_netid = "tcp6";
- match_netid_len = 4;
- startsep = "[";
- endsep = "]";
- break;
-
- default:
- dprintk("%s: unsupported address family: %u\n",
- __func__, da->da_addr.ss_family);
- goto out_free_da;
- }
-
- if (nlen != match_netid_len || strncmp(netid, match_netid, nlen)) {
- dprintk("%s: ERROR: r_netid \"%s\" != \"%s\"\n",
- __func__, netid, match_netid);
- goto out_free_da;
- }
-
- /* save human readable address */
- len = strlen(startsep) + strlen(buf) + strlen(endsep) + 7;
- da->da_remotestr = kzalloc(len, gfp_flags);
-
- /* NULL is ok, only used for dprintk */
- if (da->da_remotestr)
- snprintf(da->da_remotestr, len, "%s%s%s:%u", startsep,
- buf, endsep, ntohs(port));
-
- dprintk("%s: Parsed DS addr %s\n", __func__, da->da_remotestr);
- kfree(buf);
- kfree(netid);
- return da;
-
-out_free_da:
- kfree(da);
-out_free_buf:
- dprintk("%s: Error parsing DS addr: %s\n", __func__, buf);
- kfree(buf);
-out_free_netid:
- kfree(netid);
-out_err:
- return NULL;
-}
-
/* Decode opaque device data and return the result */
struct nfs4_file_layout_dsaddr *
nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
@@ -353,8 +205,8 @@ nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
mp_count = be32_to_cpup(p); /* multipath count */
for (j = 0; j < mp_count; j++) {
- da = decode_ds_addr(server->nfs_client->cl_net,
- &stream, gfp_flags);
+ da = nfs4_decode_mp_ds_addr(server->nfs_client->cl_net,
+ &stream, gfp_flags);
if (da)
list_add_tail(&da->da_node, &dsaddrs);
}
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index b0168f1..403d7bb 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -312,6 +312,9 @@ void pnfs_generic_write_commit_done(struct rpc_task *task, void *data);
void nfs4_pnfs_ds_put(struct nfs4_pnfs_ds *ds);
struct nfs4_pnfs_ds *nfs4_pnfs_ds_add(struct list_head *dsaddrs,
gfp_t gfp_flags);
+struct nfs4_pnfs_ds_addr *nfs4_decode_mp_ds_addr(struct net *net,
+ struct xdr_stream *xdr,
+ gfp_t gfp_flags);
static inline struct nfs4_deviceid_node *
nfs4_get_deviceid(struct nfs4_deviceid_node *d)
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
index 3bb2b74..81ec449 100644
--- a/fs/nfs/pnfs_nfs.c
+++ b/fs/nfs/pnfs_nfs.c
@@ -9,6 +9,7 @@
#include <linux/nfs_fs.h>
#include <linux/nfs_page.h>
+#include <linux/sunrpc/addr.h>
#include "internal.h"
#include "pnfs.h"
@@ -532,3 +533,151 @@ out:
return ds;
}
EXPORT_SYMBOL_GPL(nfs4_pnfs_ds_add);
+
+/*
+ * Currently only supports ipv4, ipv6 and one multi-path address.
+ */
+struct nfs4_pnfs_ds_addr *
+nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)
+{
+ struct nfs4_pnfs_ds_addr *da = NULL;
+ char *buf, *portstr;
+ __be16 port;
+ int nlen, rlen;
+ int tmp[2];
+ __be32 *p;
+ char *netid, *match_netid;
+ size_t len, match_netid_len;
+ char *startsep = "";
+ char *endsep = "";
+
+
+ /* r_netid */
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(!p))
+ goto out_err;
+ nlen = be32_to_cpup(p++);
+
+ p = xdr_inline_decode(xdr, nlen);
+ if (unlikely(!p))
+ goto out_err;
+
+ netid = kmalloc(nlen+1, gfp_flags);
+ if (unlikely(!netid))
+ goto out_err;
+
+ netid[nlen] = '\0';
+ memcpy(netid, p, nlen);
+
+ /* r_addr: ip/ip6addr with port in dec octets - see RFC 5665 */
+ p = xdr_inline_decode(xdr, 4);
+ if (unlikely(!p))
+ goto out_free_netid;
+ rlen = be32_to_cpup(p);
+
+ p = xdr_inline_decode(xdr, rlen);
+ if (unlikely(!p))
+ goto out_free_netid;
+
+ /* port is ".ABC.DEF", 8 chars max */
+ if (rlen > INET6_ADDRSTRLEN + IPV6_SCOPE_ID_LEN + 8) {
+ dprintk("%s: Invalid address, length %d\n", __func__,
+ rlen);
+ goto out_free_netid;
+ }
+ buf = kmalloc(rlen + 1, gfp_flags);
+ if (!buf) {
+ dprintk("%s: Not enough memory\n", __func__);
+ goto out_free_netid;
+ }
+ buf[rlen] = '\0';
+ memcpy(buf, p, rlen);
+
+ /* replace port '.' with '-' */
+ portstr = strrchr(buf, '.');
+ if (!portstr) {
+ dprintk("%s: Failed finding expected dot in port\n",
+ __func__);
+ goto out_free_buf;
+ }
+ *portstr = '-';
+
+ /* find '.' between address and port */
+ portstr = strrchr(buf, '.');
+ if (!portstr) {
+ dprintk("%s: Failed finding expected dot between address and "
+ "port\n", __func__);
+ goto out_free_buf;
+ }
+ *portstr = '\0';
+
+ da = kzalloc(sizeof(*da), gfp_flags);
+ if (unlikely(!da))
+ goto out_free_buf;
+
+ INIT_LIST_HEAD(&da->da_node);
+
+ if (!rpc_pton(net, buf, portstr-buf, (struct sockaddr *)&da->da_addr,
+ sizeof(da->da_addr))) {
+ dprintk("%s: error parsing address %s\n", __func__, buf);
+ goto out_free_da;
+ }
+
+ portstr++;
+ sscanf(portstr, "%d-%d", &tmp[0], &tmp[1]);
+ port = htons((tmp[0] << 8) | (tmp[1]));
+
+ switch (da->da_addr.ss_family) {
+ case AF_INET:
+ ((struct sockaddr_in *)&da->da_addr)->sin_port = port;
+ da->da_addrlen = sizeof(struct sockaddr_in);
+ match_netid = "tcp";
+ match_netid_len = 3;
+ break;
+
+ case AF_INET6:
+ ((struct sockaddr_in6 *)&da->da_addr)->sin6_port = port;
+ da->da_addrlen = sizeof(struct sockaddr_in6);
+ match_netid = "tcp6";
+ match_netid_len = 4;
+ startsep = "[";
+ endsep = "]";
+ break;
+
+ default:
+ dprintk("%s: unsupported address family: %u\n",
+ __func__, da->da_addr.ss_family);
+ goto out_free_da;
+ }
+
+ if (nlen != match_netid_len || strncmp(netid, match_netid, nlen)) {
+ dprintk("%s: ERROR: r_netid \"%s\" != \"%s\"\n",
+ __func__, netid, match_netid);
+ goto out_free_da;
+ }
+
+ /* save human readable address */
+ len = strlen(startsep) + strlen(buf) + strlen(endsep) + 7;
+ da->da_remotestr = kzalloc(len, gfp_flags);
+
+ /* NULL is ok, only used for dprintk */
+ if (da->da_remotestr)
+ snprintf(da->da_remotestr, len, "%s%s%s:%u", startsep,
+ buf, endsep, ntohs(port));
+
+ dprintk("%s: Parsed DS addr %s\n", __func__, da->da_remotestr);
+ kfree(buf);
+ kfree(netid);
+ return da;
+
+out_free_da:
+ kfree(da);
+out_free_buf:
+ dprintk("%s: Error parsing DS addr: %s\n", __func__, buf);
+ kfree(buf);
+out_free_netid:
+ kfree(netid);
+out_err:
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(nfs4_decode_mp_ds_addr);
--
1.9.3
next prev parent reply other threads:[~2015-01-22 23:36 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-22 23:35 [PATCH v5 00/51] Add Flexfile Layout Module Tom Haynes
2015-01-22 23:35 ` [PATCH v5 01/51] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2015-01-22 23:35 ` [PATCH v5 02/51] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2015-01-22 23:35 ` [PATCH v5 03/51] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2015-01-22 23:35 ` Tom Haynes [this message]
2015-01-22 23:35 ` [PATCH v5 05/51] nfs41: pull nfs4_ds_connect " Tom Haynes
2015-01-22 23:35 ` [PATCH v5 06/51] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2015-01-22 23:35 ` [PATCH v5 07/51] nfs41: move file layout macros to generic pnfs Tom Haynes
2015-01-22 23:35 ` [PATCH v5 08/51] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2015-01-22 23:35 ` [PATCH v5 09/51] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2015-01-22 23:35 ` [PATCH v5 10/51] nfs41: create NFSv3 DS connection if specified Tom Haynes
2015-01-22 23:35 ` [PATCH v5 11/51] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2015-01-22 23:35 ` [PATCH v5 12/51] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2015-01-22 23:35 ` [PATCH v5 13/51] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2015-01-22 23:35 ` [PATCH v5 14/51] nfs4: export nfs4_sequence_done Tom Haynes
2015-01-22 23:35 ` [PATCH v5 15/51] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2015-01-22 23:35 ` [PATCH v5 16/51] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done() Tom Haynes
2015-01-22 23:35 ` [PATCH v5 17/51] sunrpc: add rpc_count_iostats_idx Tom Haynes
2015-01-22 23:35 ` [PATCH v5 18/51] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2015-01-22 23:35 ` [PATCH v5 19/51] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2015-01-22 23:35 ` [PATCH v5 20/51] nfs41: close a small race window when adding new layout to global list Tom Haynes
2015-01-22 23:35 ` [PATCH v5 21/51] nfs41: serialize first layoutget of a file Tom Haynes
2015-01-22 23:35 ` [PATCH v5 22/51] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2015-01-22 23:35 ` [PATCH v5 23/51] nfs41: pass iomode through layoutreturn args Tom Haynes
2015-01-22 23:35 ` [PATCH v5 24/51] nfs41: make a helper function to send layoutreturn Tom Haynes
2015-01-22 23:35 ` [PATCH v5 25/51] nfs41: add a helper to mark layout for return Tom Haynes
2015-01-22 23:35 ` [PATCH v5 26/51] nfs41: don't use a layout if it is marked for returning Tom Haynes
2015-01-22 23:35 ` [PATCH v5 27/51] nfs41: send layoutreturn in last put_lseg Tom Haynes
2015-01-22 23:36 ` [PATCH v5 28/51] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2015-01-22 23:36 ` [PATCH v5 29/51] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2015-01-22 23:36 ` [PATCH v5 30/51] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2015-01-22 23:36 ` [PATCH v5 31/51] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2015-01-22 23:36 ` [PATCH v5 32/51] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2015-01-22 23:36 ` [PATCH v5 33/51] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2015-01-22 23:36 ` [PATCH v5 34/51] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2015-01-22 23:36 ` [PATCH v5 35/51] nfs: add mirroring support to pgio layer Tom Haynes
2015-01-22 23:36 ` [PATCH v5 36/51] nfs: mirroring support for direct io Tom Haynes
2015-01-22 23:36 ` [PATCH v5 37/51] pnfs: fail comparison when bucket verifier not set Tom Haynes
2015-01-22 23:36 ` [PATCH v5 38/51] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2015-01-22 23:36 ` [PATCH v5 39/51] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2015-01-22 23:36 ` [PATCH v5 40/51] nfs: add nfs_pgio_current_mirror helper Tom Haynes
2015-01-22 23:36 ` [PATCH v5 41/51] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2015-01-22 23:36 ` [PATCH v5 42/51] nfs41: add range to layoutreturn args Tom Haynes
2015-01-22 23:36 ` [PATCH v5 43/51] nfs41: allow async version layoutreturn Tom Haynes
2015-01-22 23:36 ` [PATCH v5 44/51] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2015-01-22 23:36 ` [PATCH v5 45/51] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2015-01-22 23:36 ` [PATCH v5 46/51] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2015-01-22 23:36 ` [PATCH v5 47/51] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2015-01-22 23:36 ` [PATCH v5 48/51] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2015-01-22 23:36 ` [PATCH v5 49/51] nfs: count DIO good bytes correctly with mirroring Tom Haynes
2015-01-22 23:36 ` [PATCH v5 50/51] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2015-01-22 23:36 ` [PATCH v5 51/51] pnfs: Update documentation on the Layout Drivers Tom Haynes
2015-01-23 8:07 ` [PATCH v5 00/51] Add Flexfile Layout Module Christoph Hellwig
2015-01-23 8:27 ` Christoph Hellwig
2015-01-24 14:33 ` Hi Christoph, Peng Tao
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=1421969783-92997-5-git-send-email-loghyr@primarydata.com \
--to=thomas.haynes@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).