Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.com,
	bfields@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v8 05/20] NFS: skip recovery of copy open on dest server
Date: Thu, 10 Oct 2019 08:46:07 -0400
Message-ID: <20191010124622.27812-6-olga.kornievskaia@gmail.com> (raw)
In-Reply-To: <20191010124622.27812-1-olga.kornievskaia@gmail.com>

From: Olga Kornievskaia <kolga@netapp.com>

Mark the open created for the source file on the destination
server. Then if this open is going thru a recovery, then fail
the recovery as we don't need to be recoving a "fake" open.
We need to fail the ongoing READs and vfs_copy_file_range().

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
 fs/nfs/nfs4_fs.h   |  1 +
 fs/nfs/nfs4file.c  |  1 +
 fs/nfs/nfs4state.c | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 5f27942..814674f 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -168,6 +168,7 @@ enum {
 	NFS_STATE_CHANGE_WAIT,		/* A state changing operation is outstanding */
 #ifdef CONFIG_NFS_V4_2
 	NFS_CLNT_DST_SSC_COPY_STATE,    /* dst server open state on client*/
+	NFS_SRV_SSC_COPY_STATE,		/* ssc state on the dst server */
 #endif /* CONFIG_NFS_V4_2 */
 };
 
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 1898262a..a932fc9 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -352,6 +352,7 @@ struct file *
 	if (ctx->state == NULL)
 		goto out_stateowner;
 
+	set_bit(NFS_SRV_SSC_COPY_STATE, &ctx->state->flags);
 	set_bit(NFS_OPEN_STATE, &ctx->state->flags);
 	memcpy(&ctx->state->open_stateid.other, &stateid->other,
 	       NFS4_STATEID_OTHER_SIZE);
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 0c6d53d..c45b300 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1609,6 +1609,9 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
 	struct nfs4_state *state;
 	unsigned int loop = 0;
 	int status = 0;
+#ifdef CONFIG_NFS_V4_2
+	bool found_ssc_copy_state = false;
+#endif /* CONFIG_NFS_V4_2 */
 
 	/* Note: we rely on the sp->so_states list being ordered 
 	 * so that we always reclaim open(O_RDWR) and/or open(O_WRITE)
@@ -1628,6 +1631,13 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
 			continue;
 		if (state->state == 0)
 			continue;
+#ifdef CONFIG_NFS_V4_2
+		if (test_bit(NFS_SRV_SSC_COPY_STATE, &state->flags)) {
+			nfs4_state_mark_recovery_failed(state, -EIO);
+			found_ssc_copy_state = true;
+			continue;
+		}
+#endif /* CONFIG_NFS_V4_2 */
 		refcount_inc(&state->count);
 		spin_unlock(&sp->so_lock);
 		status = __nfs4_reclaim_open_state(sp, state, ops);
@@ -1682,6 +1692,10 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
 	}
 	raw_write_seqcount_end(&sp->so_reclaim_seqcount);
 	spin_unlock(&sp->so_lock);
+#ifdef CONFIG_NFS_V4_2
+	if (found_ssc_copy_state)
+		return -EIO;
+#endif /* CONFIG_NFS_V4_2 */
 	return 0;
 out_err:
 	nfs4_put_open_state(state);
-- 
1.8.3.1


  parent reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-10 12:46 [PATCH v8 00/20] client and server support for "inter" SSC copy Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 01/20] NFS NFSD: defining nl4_servers structure needed by both Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 02/20] NFS: add COPY_NOTIFY operation Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 03/20] NFS: add ca_source_server<> to COPY Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 04/20] NFS: inter ssc open Olga Kornievskaia
2019-10-10 12:46 ` Olga Kornievskaia [this message]
2019-10-10 12:46 ` [PATCH v8 06/20] NFS: for "inter" copy treat ESTALE as ENOTSUPP Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 07/20] NFS: COPY handle ERR_OFFLOAD_DENIED Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 08/20] NFS: also send OFFLOAD_CANCEL to source server Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 09/20] NFS handle NFS4ERR_PARTNER_NO_AUTH error Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 10/20] NFS: handle source server reboot Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 11/20] NFS based on file size issue sync copy or fallback to generic copy offload Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 12/20] NFS: replace cross device check in copy_file_range Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 13/20] NFSD fill-in netloc4 structure Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 14/20] NFSD add ca_source_server<> to COPY Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 15/20] NFSD COPY_NOTIFY xdr Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 16/20] NFSD add COPY_NOTIFY operation Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 17/20] NFSD check stateids against copy stateids Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 18/20] NFSD generalize nfsd4_compound_state flag names Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 19/20] NFSD: allow inter server COPY to have a STALE source server fh Olga Kornievskaia
2019-10-10 12:46 ` [PATCH v8 20/20] NFSD add nfs4 inter ssc to nfsd4_copy Olga Kornievskaia

Reply instructions:

You may reply publically 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=20191010124622.27812-6-olga.kornievskaia@gmail.com \
    --to=olga.kornievskaia@gmail.com \
    --cc=anna.schumaker@netapp.com \
    --cc=bfields@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@hammerspace.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

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org
	public-inbox-index linux-nfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git