Previously dst copy stateid was used as reply to the asynchronous
copy. Instead, generate a new stateid and the destination server
will keep a list of the stateids. If it receives a cancel, it can
decide to forego sending the CB_OFFLOAD.
Signed-off-by: Olga Kornievskaia <kolga@xxxxxxxxxx>
---
fs/nfsd/nfs4proc.c | 71 ++++++++++++++++++++++++++++++++++++++----------------
fs/nfsd/state.h | 3 +++
fs/nfsd/xdr4.h | 2 ++
3 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index d26d720..f07eae1 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1039,7 +1039,8 @@ static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write)
static __be32
nfsd4_verify_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
stateid_t *src_stateid, struct file **src,
- stateid_t *dst_stateid, struct file **dst)
+ stateid_t *dst_stateid, struct file **dst,
+ struct nfs4_stid **stid)
{
__be32 status;
@@ -1053,7 +1054,7 @@ static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write)
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
dst_stateid, WR_STATE, dst, NULL,
- NULL);
+ stid);
if (status) {
dprintk("NFSD: %s: couldn't process dst stateid!\n", __func__);
goto out_put_src;
@@ -1083,7 +1084,7 @@ static int fill_in_write_vector(struct kvec *vec, struct nfsd4_write *write)
__be32 status;
status = nfsd4_verify_copy(rqstp, cstate, &clone->cl_src_stateid, &src,
- &clone->cl_dst_stateid, &dst);
+ &clone->cl_dst_stateid, &dst, NULL);
if (status)
goto out;
@@ -1252,7 +1253,8 @@ extern struct file *nfs42_ssc_open(struct vfsmount *ss_mnt,
/* Verify the destination stateid and set dst struct file*/
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
©->cp_dst_stateid,
- WR_STATE, ©->fh_dst, NULL, NULL);
+ WR_STATE, ©->fh_dst, NULL,
+ ©->stid);
if (status) {
ss_mnt = ERR_PTR(be32_to_cpu(status));
goto out;
@@ -1322,7 +1324,7 @@ extern struct file *nfs42_ssc_open(struct vfsmount *ss_mnt,
status = nfsd4_verify_copy(rqstp, cstate, ©->cp_src_stateid,
©->fh_src, ©->cp_dst_stateid,
- ©->fh_dst);
+ ©->fh_dst, ©->stid);
if (status)
goto out;
@@ -1362,8 +1364,6 @@ static int nfsd4_cb_offload_done(struct nfsd4_callback *cb,
static int nfsd4_init_copy_res(struct nfsd4_copy *copy, bool sync)
{
- memcpy(©->cp_res.cb_stateid, ©->cp_dst_stateid,
- sizeof(copy->cp_dst_stateid));
copy->cp_res.wr_stable_how = NFS_UNSTABLE;
copy->cp_consecutive = 1;
copy->cp_synchronous = sync;
@@ -1378,7 +1378,7 @@ static int _nfsd_copy_file_range(struct nfsd4_copy *copy)
size_t bytes_total = copy->cp_count;
u64 src_pos = copy->cp_src_pos;
u64 dst_pos = copy->cp_dst_pos;
-
+ bool cancelled = false;
do {
bytes_copied = nfsd_copy_file_range(copy->fh_src, src_pos,
copy->fh_dst, dst_pos, bytes_total);
@@ -1388,7 +1388,10 @@ static int _nfsd_copy_file_range(struct nfsd4_copy *copy)
copy->cp_res.wr_bytes_written += bytes_copied;
src_pos += bytes_copied;
dst_pos += bytes_copied;
- } while (bytes_total > 0);
+ spin_lock(©->cps->cp_lock);
+ cancelled = copy->cps->cp_cancelled;
+ spin_unlock(©->cps->cp_lock);
+ } while (bytes_total > 0 && !cancelled);
return bytes_copied;
}
@@ -1431,6 +1434,8 @@ static void dup_copy_fields(struct nfsd4_copy *src, struct nfsd4_copy *dst)
dst->fh_dst = src->fh_dst;
dst->ss_mnt = src->ss_mnt;
dst->net = src->net;
+ dst->stid = src->stid;
+ dst->cps = src->cps;
}
static void nfsd4_do_async_copy(struct work_struct *work)
@@ -1443,17 +1448,20 @@ static void nfsd4_do_async_copy(struct work_struct *work)
return;
copy->nfserr = nfsd4_do_copy(copy, 0);
- cb_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL);
- if (!cb_copy)
- goto out;
- memcpy(&cb_copy->cp_res, ©->cp_res, sizeof(copy->cp_res));
- cb_copy->cp_clp = copy->cp_clp;
- cb_copy->nfserr = copy->nfserr;
- memcpy(&cb_copy->fh, ©->fh, sizeof(copy->fh));
- nfsd4_init_cb(&cb_copy->cp_cb, cb_copy->cp_clp,
+ if (!copy->cps->cp_cancelled) {
+ cb_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL);
+ if (!cb_copy)
+ goto out;
+ memcpy(&cb_copy->cp_res, ©->cp_res, sizeof(copy->cp_res));
+ cb_copy->cp_clp = copy->cp_clp;
+ cb_copy->nfserr = copy->nfserr;
+ memcpy(&cb_copy->fh, ©->fh, sizeof(copy->fh));
+ nfsd4_init_cb(&cb_copy->cp_cb, cb_copy->cp_clp,
&nfsd4_cb_offload_ops, NFSPROC4_CLNT_CB_OFFLOAD);
- nfsd4_run_cb(&cb_copy->cp_cb);
+ nfsd4_run_cb(&cb_copy->cp_cb);
+ }
out:
+ nfs4_put_stid(copy->stid);
kfree(copy);
}
@@ -1480,15 +1488,26 @@ static void nfsd4_do_async_copy(struct work_struct *work)
sizeof(struct knfsd_fh));
copy->net = SVC_NET(rqstp);
if (!copy->cp_synchronous) {
+ struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
struct nfsd4_copy *async_copy;
status = nfsd4_init_copy_res(copy, 0);
async_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL);
if (!async_copy)
goto out_err;
+ copy->cps = nfs4_alloc_init_cp_state(nn, nn->nfsd4_lease,
+ copy->stid);
+ if (!copy->cps)
+ goto out_err;
+ /* take a reference on the parent stateid so it's not
+ * not freed by the copy compound
+ */
+ atomic_inc(©->stid->sc_count);
+ copy->cps->cp_dst_async = true;
+ spin_lock_init(©->cps->cp_lock);
+ memcpy(©->cp_res.cb_stateid, ©->cps->cp_stateid,
+ sizeof(copy->cps->cp_stateid));
dup_copy_fields(copy, async_copy);
- memcpy(©->cp_res.cb_stateid, ©->cp_dst_stateid,
- sizeof(copy->cp_dst_stateid));
INIT_WORK(&async_copy->cp_work, nfsd4_do_async_copy);
queue_work(copy_wq, &async_copy->cp_work);
} else {
@@ -1625,7 +1644,17 @@ static void nfsd4_do_async_copy(struct work_struct *work)
struct nfs4_cp_state *state = NULL;
status = find_cp_state(nn, &os->stateid, &state);
- if (!status) {
+ /* on the source server, remove stateid from list of acceptable
+ * stateid to force reads to fail. on the destination server,
+ * callback offload stateids shouldn't be removed and instead
+ * mark the offload copy state to be cancelled.
+ */
+ if (state) {
+ spin_lock(&state->cp_lock);
+ state->cp_cancelled = true;
+ spin_unlock(&state->cp_lock);
+ }
+ if (!status && !state->cp_dst_async) {
list_del(&state->cp_list);
nfs4_free_cp_state(state);
}
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index fa749763..70ee3fe 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -114,6 +114,9 @@ struct nfs4_cp_state {
struct nfs4_stid *cp_p_stid; /* pointer to parent */
bool cp_active; /* has the copy started */
unsigned long cp_timeout; /* copy timeout */
+ bool cp_dst_async; /* async copy on dst server */
+ bool cp_cancelled; /* copy cancelled */
+ spinlock_t cp_lock;
};
/*
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index d5b6b40..c6b8e596 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -544,6 +544,8 @@ struct nfsd4_copy {
struct file *fh_dst;
struct vfsmount *ss_mnt;
struct net *net;
+ struct nfs4_stid *stid;
+ struct nfs4_cp_state *cps;
};
struct nfsd4_seek {
--
1.8.3.1
--
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
