From: Olga Kornievskaia <kolga@netapp.com>
To: <bfields@redhat.com>
Cc: <linux-nfs@vger.kernel.org>
Subject: [PATCH v4 08/10] NFSD handle OFFLOAD_CANCEL op
Date: Thu, 28 Sep 2017 13:29:43 -0400 [thread overview]
Message-ID: <20170928172945.50780-9-kolga@netapp.com> (raw)
In-Reply-To: <20170928172945.50780-1-kolga@netapp.com>
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 <kolga@netapp.com>
---
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
next prev parent reply other threads:[~2017-09-28 17:30 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 17:29 [PATCH v4 00/10] NFSD support for asynchronous COPY Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 01/10] NFSD CB_OFFLOAD xdr Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 02/10] NFSD OFFLOAD_STATUS xdr Olga Kornievskaia
2017-09-28 19:34 ` J. Bruce Fields
2017-09-28 17:29 ` [PATCH v4 03/10] NFSD OFFLOAD_CANCEL xdr Olga Kornievskaia
2017-09-28 19:34 ` J. Bruce Fields
2017-09-28 19:40 ` Olga Kornievskaia
2017-09-28 19:44 ` J. Bruce Fields
2017-09-28 17:29 ` [PATCH v4 04/10] NFSD xdr callback stateid in async COPY reply Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 05/10] NFSD first draft of async copy Olga Kornievskaia
2017-09-28 18:07 ` J. Bruce Fields
2017-09-28 18:44 ` Olga Kornievskaia
2017-09-28 18:55 ` J. Bruce Fields
[not found] ` <805B49AE-1DB0-4FB1-BEEB-84A7740E9B09@netapp.com>
2017-09-28 19:07 ` J. Bruce Fields
2017-09-28 19:11 ` Olga Kornievskaia
2017-09-29 21:51 ` Olga Kornievskaia
2017-10-02 16:10 ` J. Bruce Fields
2017-09-28 18:16 ` J. Bruce Fields
2017-09-28 17:29 ` [PATCH v4 06/10] NFSD return nfs4_stid in nfs4_preprocess_stateid_op Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 07/10] NFSD create new stateid for async copy Olga Kornievskaia
2017-09-28 19:12 ` J. Bruce Fields
2017-09-28 19:21 ` Olga Kornievskaia
2017-09-28 19:24 ` J. Bruce Fields
2017-09-28 17:29 ` Olga Kornievskaia [this message]
2017-09-28 18:38 ` [PATCH v4 08/10] NFSD handle OFFLOAD_CANCEL op J. Bruce Fields
2017-10-09 14:53 ` Olga Kornievskaia
2017-10-09 15:58 ` J. Bruce Fields
2017-10-10 21:14 ` Olga Kornievskaia
2017-10-11 14:07 ` J. Bruce Fields
2017-10-11 15:02 ` Olga Kornievskaia
2017-10-11 15:19 ` J. Bruce Fields
2017-10-11 16:08 ` Olga Kornievskaia
2017-10-12 10:56 ` Jeff Layton
2017-09-28 17:29 ` [PATCH v4 09/10] NFSD support OFFLOAD_STATUS Olga Kornievskaia
2017-09-28 17:29 ` [PATCH v4 10/10] NFSD stop queued async copies on client shutdown Olga Kornievskaia
2017-09-28 19:21 ` J. Bruce Fields
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=20170928172945.50780-9-kolga@netapp.com \
--to=kolga@netapp.com \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/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.