Return-Path: Received: from mx141.netapp.com ([216.240.21.12]:2138 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932689AbbIDRaF (ORCPT ); Fri, 4 Sep 2015 13:30:05 -0400 From: To: CC: , , , Andy Adamson Subject: [PATCH Version 2 13/16] NFSD add nfs4 inter ssc to nfsd4_copy Date: Fri, 4 Sep 2015 13:29:35 -0400 Message-ID: <1441387778-16465-14-git-send-email-andros@netapp.com> In-Reply-To: <1441387778-16465-1-git-send-email-andros@netapp.com> References: <1441387778-16465-1-git-send-email-andros@netapp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson Given a universal address, mount the source server from the destination server. Use an internal mount. Call the NFS client nfs42_ssc_open to obtain the NFS struct file suitable for nfsd_copy_range. Add Kconfig dependencies for inter server to server copy Signed-off-by: Andy Adamson --- fs/nfsd/Kconfig | 10 ++ fs/nfsd/nfs4proc.c | 268 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 269 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig index a0b77fc..f25a736 100644 --- a/fs/nfsd/Kconfig +++ b/fs/nfsd/Kconfig @@ -93,6 +93,16 @@ config NFSD_PNFS If unsure, say N. +config NFSD_V4_2_INTER_SSC + bool "NFSv4.2 inter server to server COPY" + depends on NFSD_V4 && NFS_V4_1 && NFS_V4_2 + help + This option enables support for NFSv4.2 inter server to + server copy where the destination server calls the NFSv4.2 + client to read the data to copy from the source server. + + If unsure, say N. + config NFSD_V4_SECURITY_LABEL bool "Provide Security Label support for NFSv4 server" depends on NFSD_V4 && SECURITY diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index b759cd3..4d3b37d 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1061,23 +1061,271 @@ nfsd4_verify_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; } +#ifdef CONFIG_NFSD_V4_2_INTER_SSC + +#define NFSD42_INTERSSC_RAWDATA "minorversion=1,vers=4,addr=%s,clientaddr=%s" + +/** + * Support one copy source server for now. + */ +static struct nfs42_inter_ssc * +nfsd4_interssc_connect(struct nfsd4_copy *copy, struct svc_rqst *rqstp) +{ + struct file_system_type *type; + struct nfs42_inter_ssc *isp; + struct nfs42_netaddr *naddr = ©->cp_src[0].u.nl4_addr; + struct sockaddr_storage tmp_addr; + size_t tmp_addrlen, match_netid_len = 3; + char *startsep = "", *endsep = "", *match_netid = "tcp"; + char *ipaddr, *ipaddr2, *raw_data; + int len, raw_len, status = -EINVAL; + + tmp_addrlen = rpc_uaddr2sockaddr(SVC_NET(rqstp), naddr->na_uaddr, + naddr->na_uaddr_len, + (struct sockaddr *)&tmp_addr, + sizeof(tmp_addr)); + if (tmp_addrlen == 0) + goto out; + + if (tmp_addr.ss_family == AF_INET6) { + startsep = "["; + endsep = "]"; + match_netid = "tcp6"; + match_netid_len = 4; + } + + if (naddr->na_netid_len != match_netid_len || + strncmp(naddr->na_netid, match_netid, naddr->na_netid_len)) + goto out; + + /* Freed in nfsd4_interssc_disconnect */ + status = -ENOMEM; + isp = kzalloc(sizeof(*isp), GFP_KERNEL); + if (unlikely(!isp)) + goto out; + + /* Construct the raw data for the vfs_kern_mount call */ + len = RPC_MAX_ADDRBUFLEN + 1; + ipaddr = kzalloc(len, GFP_KERNEL); + if (!ipaddr) + goto out_free_isp; + + rpc_ntop((struct sockaddr *)&tmp_addr, ipaddr, len); + + /* 2 for ipv6 endsep and startsep. 3 for ":/" and trailing '/0'*/ + ipaddr2 = kzalloc(len + 5, GFP_KERNEL); + if (!ipaddr2) + goto out_free_ipaddr; + + rpc_ntop((struct sockaddr *)&rqstp->rq_daddr, ipaddr2, len + 5); + + raw_len = strlen(NFSD42_INTERSSC_RAWDATA) + strlen(ipaddr) + + strlen(ipaddr2); + raw_data = kzalloc(raw_len, GFP_KERNEL); + if (!raw_data) + goto out_free_ipaddr2; + + snprintf(raw_data, raw_len, NFSD42_INTERSSC_RAWDATA, ipaddr, + ipaddr2); + + status = -ENODEV; + type = get_fs_type("nfs"); + if (!type) + goto out_free_rawdata; + + /* Set the server: for the vfs_kerne_mount call */ + memset(ipaddr2, 0, len + 5); + snprintf(ipaddr2, len + 5, "%s%s%s:/", startsep, ipaddr, endsep); + + dprintk("%s Raw mount data: %s server:export %s\n", __func__, + raw_data, ipaddr2); + + /* Use an 'internal' mount: MS_KERNMOUNT -> MNT_INTERNAL */ + isp->sc_root_mnt = vfs_kern_mount(type, MS_KERNMOUNT, ipaddr2, + raw_data); + if (IS_ERR(isp->sc_root_mnt)) { + status = PTR_ERR(isp->sc_root_mnt); + goto out_free_rawdata; + } + + isp->sc_mnt_dentry = isp->sc_root_mnt->mnt_root; + + kfree(raw_data); + kfree(ipaddr2); + kfree(ipaddr); + + return isp; + +out_free_rawdata: + kfree(raw_data); +out_free_ipaddr2: + kfree(ipaddr2); +out_free_ipaddr: + kfree(ipaddr); +out_free_isp: + kfree(isp); +out: + dprintk("--> %s ERROR %d\n", __func__, status); + return ERR_PTR(status); +} + +static void +nfsd4_interssc_disconnect(struct nfs42_inter_ssc *ssc) +{ + struct super_block *sb = ssc->sc_mnt_dentry->d_inode->i_sb; + + mntput(ssc->sc_root_mnt); + deactivate_super(sb); + + /* Allocated in nfsd4_interssc_connect */ + kfree(ssc); +} + +/** + * nfsd4_setup_inter_ssc + * + * Verify stateid. + * Connect to the source server with NFSv4.1. + * Create the source struct file for nfsd_copy_range. + * + * Returns errno (not nfserrxxx) + */ +static struct nfs42_inter_ssc * +nfsd4_setup_inter_ssc(struct svc_rqst *rqstp, + struct nfsd4_compound_state *cstate, + struct nfsd4_copy *copy, struct file **src, + struct file **dst) +{ + struct svc_fh *s_fh = NULL; + stateid_t *s_stid = ©->cp_src_stateid; + struct nfs_fh fh; + nfs4_stateid stateid; + struct file *filp; + struct nfs42_inter_ssc *sclp; + __be32 status; + + /* Verify the destination stateid and set dst struct file*/ + status = nfs4_preprocess_stateid_op(rqstp, cstate, + &cstate->current_fh, + ©->cp_dst_stateid, + WR_STATE, dst, NULL); + if (status) { + sclp = ERR_PTR(be32_to_cpu(status)); + goto out; + } + + /* Inter copy source fh is always stale */ + CLEAR_CSTATE_FLAG(cstate, IS_STALE_FH); + + /* Currently support for one NL4_NETADDR source server */ + if (copy->cp_src[0].nl4_type != NL4_NETADDR) { + WARN(copy->cp_src[0].nl4_type != NL4_NETADDR, + "nfsd4_copy src server not NL4_NETADDR\n"); + sclp = ERR_PTR(-EINVAL); + goto out; + } + + sclp = nfsd4_interssc_connect(copy, rqstp); + if (IS_ERR(sclp)) + goto out; + + s_fh = &cstate->save_fh; + + fh.size = s_fh->fh_handle.fh_size; + memcpy(fh.data, &s_fh->fh_handle.fh_base, fh.size); + stateid.seqid = s_stid->si_generation; + memcpy(stateid.other, (void *)&s_stid->si_opaque, + sizeof(stateid_opaque_t)); + + filp = nfs42_ssc_open(sclp, &fh, &stateid); + if (IS_ERR(filp)) { + nfsd4_interssc_disconnect(sclp); + return ERR_CAST(filp); + } + *src = filp; +out: + return sclp; +} + +static void +nfsd4_cleanup_inter_ssc(struct nfs42_inter_ssc *sclp, struct file *src) +{ + /* "close" the file. One dput for the READ */ + dput(src->f_path.dentry); + src->f_op->release(src->f_inode, src); + + nfsd4_interssc_disconnect(sclp); + +} + +#else /* CONFIG_NFSD_V4_2_INTER_SSC */ + +static struct nfs42_inter_ssc * +nfsd4_setup_inter_ssc(struct svc_rqst *rqstp, + struct nfsd4_compound_state *cstate, + struct nfsd4_copy *copy, struct file **src, + struct file **dst) +{ + return ERR_PTR(-EINVAL); +} + +static void +nfsd4_cleanup_inter_ssc(struct nfs42_inter_ssc *sclp, struct file *src) +{ +} + +#endif /* CONFIG_NFSD_V4_2_INTER_SSC */ +/** + * nfsd4_setup_intra_ssc + * + * Verify source and destination stateids. + */ static __be32 -nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, - struct nfsd4_copy *copy) +nfsd4_setup_intra_ssc(struct svc_rqst *rqstp, + struct nfsd4_compound_state *cstate, + struct nfsd4_copy *copy, struct file **src, + struct file **dst) { - ssize_t bytes; __be32 status; - struct file *src = NULL, *dst = NULL; - status = nfsd4_verify_copy(rqstp, cstate, copy, &src, &dst); + status = nfsd4_verify_copy(rqstp, cstate, copy, src, dst); if (status) return status; - /* Intra copy source fh is stale */ + /* Intra copy source fh is stale, PUTFH will fail with ESTALE */ if (HAS_CSTATE_FLAG(cstate, IS_STALE_FH)) { CLEAR_CSTATE_FLAG(cstate, IS_STALE_FH); cstate->status = nfserr_copy_stalefh; - goto out; + } + return status; +} + +static void +nfsd4_cleanup_intra_ssc(struct file *src, struct file *dst) +{ + fput(src); + fput(dst); +} + +static __be32 +nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, + struct nfsd4_copy *copy) +{ + ssize_t bytes; + __be32 status; + struct file *src = NULL, *dst = NULL; + struct nfs42_inter_ssc *sclp = NULL; + + if (copy->cp_nsrc > 0) { /* Inter server SSC */ + sclp = nfsd4_setup_inter_ssc(rqstp, cstate, copy, &src, &dst); + if (IS_ERR(sclp)) { + status = nfserrno(PTR_ERR(sclp)); + goto out; + } + } else { + status = nfsd4_setup_intra_ssc(rqstp, cstate, copy, &src, &dst); + if (status) + goto out; } bytes = nfsd_copy_range(src, copy->cp_src_pos, @@ -1095,8 +1343,10 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, status = nfs_ok; } - fput(src); - fput(dst); + if (copy->cp_nsrc > 0) /* Inter server SSC */ + nfsd4_cleanup_inter_ssc(sclp, src); + else + nfsd4_cleanup_intra_ssc(src, dst); out: return status; } -- 1.8.3.1