Return-Path: Received: from mx143.netapp.com ([216.240.21.24]:6053 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472AbdI1RaM (ORCPT ); Thu, 28 Sep 2017 13:30:12 -0400 From: Olga Kornievskaia To: CC: Subject: [PATCH v4 08/10] NFSD handle OFFLOAD_CANCEL op Date: Thu, 28 Sep 2017 13:29:43 -0400 Message-ID: <20170928172945.50780-9-kolga@netapp.com> In-Reply-To: <20170928172945.50780-1-kolga@netapp.com> References: <20170928172945.50780-1-kolga@netapp.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: Upon receiving OFFLOAD_CANCEL search the list of copy stateids, if found mark it cancelled. If copy has more interations to call vfs_copy_file_range, it'll stop it. Server won't be sending CB_OFFLOAD to the client since it received a cancel. Signed-off-by: Olga Kornievskaia --- fs/nfsd/nfs4proc.c | 26 ++++++++++++++++++++++++-- fs/nfsd/nfs4state.c | 16 ++++++++++++++++ fs/nfsd/state.h | 4 ++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 3cddebb..f4f3d93 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1139,6 +1139,7 @@ static int _nfsd_copy_file_range(struct nfsd4_copy *copy) size_t bytes_to_copy; u64 src_pos = copy->cp_src_pos; u64 dst_pos = copy->cp_dst_pos; + bool cancelled = false; do { bytes_to_copy = min_t(u64, bytes_total, MAX_RW_COUNT); @@ -1150,7 +1151,12 @@ 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 && !copy->cp_synchronous); + if (!copy->cp_synchronous) { + spin_lock(©->cps->cp_lock); + cancelled = copy->cps->cp_cancelled; + spin_unlock(©->cps->cp_lock); + } + } while (bytes_total > 0 && !copy->cp_synchronous && !cancelled); return bytes_copied; } @@ -1198,6 +1204,10 @@ static void nfsd4_do_async_copy(struct work_struct *work) struct nfsd4_copy *cb_copy; copy->nfserr = nfsd4_do_copy(copy, 0); + + if (copy->cps->cp_cancelled) + goto out; + cb_copy = kzalloc(sizeof(struct nfsd4_copy), GFP_KERNEL); if (!cb_copy) goto out; @@ -1269,7 +1279,19 @@ static void nfsd4_do_async_copy(struct work_struct *work) struct nfsd4_compound_state *cstate, union nfsd4_op_u *u) { - return 0; + struct nfsd4_offload_status *os = &u->offload_status; + struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); + __be32 status; + struct nfs4_cp_state *state = NULL; + + status = find_cp_state(nn, &os->stateid, &state); + if (state) { + spin_lock(&state->cp_lock); + state->cp_cancelled = true; + spin_unlock(&state->cp_lock); + } + + return status; } static __be32 diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index be59baf..97ab3f8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -752,6 +752,22 @@ static void nfs4_free_deleg(struct nfs4_stid *stid) atomic_long_dec(&num_delegations); } +__be32 find_cp_state(struct nfsd_net *nn, stateid_t *st, + struct nfs4_cp_state **cps) +{ + struct nfs4_cp_state *state = NULL; + + if (st->si_opaque.so_clid.cl_id != nn->s2s_cp_cl_id) + return nfserr_bad_stateid; + spin_lock(&nn->s2s_cp_lock); + state = idr_find(&nn->s2s_cp_stateids, st->si_opaque.so_id); + spin_unlock(&nn->s2s_cp_lock); + if (!state) + return nfserr_bad_stateid; + *cps = state; + return 0; +} + /* * When we recall a delegation, we should be careful not to hand it * out again straight away. diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 8724955..7a070d5 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -111,6 +111,8 @@ struct nfs4_cp_state { stateid_t cp_stateid; struct list_head cp_list; /* per parent nfs4_stid */ struct nfs4_stid *cp_p_stid; /* pointer to parent */ + bool cp_cancelled; /* copy cancelled */ + spinlock_t cp_lock; }; /* @@ -647,6 +649,8 @@ extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(const char *name, extern bool nfs4_has_reclaimed_state(const char *name, struct nfsd_net *nn); extern int nfsd4_create_copy_queue(void); extern void nfsd4_destroy_copy_queue(void); +extern __be32 find_cp_state(struct nfsd_net *nn, stateid_t *st, + struct nfs4_cp_state **cps); struct nfs4_file *find_file(struct knfsd_fh *fh); void put_nfs4_file(struct nfs4_file *fi); -- 1.8.3.1