linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dai Ngo <dai.ngo@oracle.com>
To: chuck.lever@oracle.com, bfields@fieldses.org
Cc: jlayton@redhat.com, viro@zeniv.linux.org.uk,
	linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH RFC v16 02/11] NFSD: Add client flags, macro and spinlock to support courteous server
Date: Fri, 11 Mar 2022 18:13:26 -0800	[thread overview]
Message-ID: <1647051215-2873-3-git-send-email-dai.ngo@oracle.com> (raw)
In-Reply-To: <1647051215-2873-1-git-send-email-dai.ngo@oracle.com>

Add flags to track a client's lease state after the client fails to
renew its lease. Add macro for courtesy client expire time. Add spinlock
to synchronize access to these flags. Modify alloc_client to initialize
these fields.

Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
---
 fs/nfsd/nfs4state.c | 2 ++
 fs/nfsd/nfsd.h      | 1 +
 fs/nfsd/state.h     | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 234e852fcdfa..a65d59510681 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2009,12 +2009,14 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)
 	INIT_LIST_HEAD(&clp->cl_delegations);
 	INIT_LIST_HEAD(&clp->cl_lru);
 	INIT_LIST_HEAD(&clp->cl_revoked);
+	INIT_LIST_HEAD(&clp->cl_cs_list);
 #ifdef CONFIG_NFSD_PNFS
 	INIT_LIST_HEAD(&clp->cl_lo_states);
 #endif
 	INIT_LIST_HEAD(&clp->async_copies);
 	spin_lock_init(&clp->async_lock);
 	spin_lock_init(&clp->cl_lock);
+	spin_lock_init(&clp->cl_cs_lock);
 	rpc_init_wait_queue(&clp->cl_cb_waitq, "Backchannel slot table");
 	return clp;
 err_no_hashtbl:
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 4fc1fd639527..23996c6ca75e 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -336,6 +336,7 @@ void		nfsd_lockd_shutdown(void);
 #define COMPOUND_ERR_SLACK_SPACE	16     /* OP_SETATTR */
 
 #define NFSD_LAUNDROMAT_MINTIMEOUT      1   /* seconds */
+#define	NFSD_COURTESY_CLIENT_TIMEOUT	(24 * 60 * 60)	/* seconds */
 
 /*
  * The following attributes are currently not supported by the NFSv4 server:
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 95457cfd37fc..8cbd3b69a584 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -343,6 +343,9 @@ struct nfs4_client {
 #define NFSD4_CLIENT_RECLAIM_COMPLETE	(3)	/* reclaim_complete done */
 #define NFSD4_CLIENT_CONFIRMED		(4)	/* client is confirmed */
 #define NFSD4_CLIENT_UPCALL_LOCK	(5)	/* upcall serialization */
+#define	NFSD4_CLIENT_COURTESY		(6)
+#define	NFSD4_CLIENT_EXPIRED		(7)
+#define	NFSD4_CLIENT_RECONNECTED	(8)
 #define NFSD4_CLIENT_CB_FLAG_MASK	(1 << NFSD4_CLIENT_CB_UPDATE | \
 					 1 << NFSD4_CLIENT_CB_KILL)
 	unsigned long		cl_flags;
@@ -385,6 +388,9 @@ struct nfs4_client {
 	struct list_head	async_copies;	/* list of async copies */
 	spinlock_t		async_lock;	/* lock for async copies */
 	atomic_t		cl_cb_inflight;	/* Outstanding callbacks */
+
+	spinlock_t		cl_cs_lock;
+	struct list_head	cl_cs_list;
 };
 
 /* struct nfs4_client_reset
-- 
2.9.5


  parent reply	other threads:[~2022-03-12  2:14 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-12  2:13 [PATCH RFC v16 0/11] NFSD: Initial implementation of NFSv4 Courteous Server Dai Ngo
2022-03-12  2:13 ` [PATCH RFC v16 01/11] fs/lock: add helper locks_owner_has_blockers to check for blockers Dai Ngo
2022-03-16 14:27   ` Chuck Lever III
2022-03-16 17:46     ` dai.ngo
2022-03-12  2:13 ` Dai Ngo [this message]
2022-03-12  2:13 ` [PATCH RFC v16 03/11] NFSD: Add lm_lock_expired call out Dai Ngo
2022-03-15 15:02   ` J. Bruce Fields
2022-03-15 16:26     ` dai.ngo
2022-03-15 17:20       ` J. Bruce Fields
2022-03-15 17:30         ` dai.ngo
2022-03-15 17:39       ` Chuck Lever III
2022-03-15 18:56         ` dai.ngo
2022-03-12  2:13 ` [PATCH RFC v16 04/11] NFSD: Update nfsd_breaker_owns_lease() to handle courtesy clients Dai Ngo
2022-03-13 16:04   ` Chuck Lever III
2022-03-15 15:13     ` Bruce Fields
2022-03-15 16:27       ` dai.ngo
2022-03-12  2:13 ` [PATCH RFC v16 05/11] NFSD: Update nfs4_get_vfs_file() " Dai Ngo
2022-03-15 15:39   ` J. Bruce Fields
2022-03-16  6:29     ` dai.ngo
2022-03-12  2:13 ` [PATCH RFC v16 06/11] NFSD: Update find_clp_in_name_tree() " Dai Ngo
2022-03-12  2:13 ` [PATCH RFC v16 07/11] NFSD: Update find_in_sessionid_hashtbl() " Dai Ngo
2022-03-12  2:13 ` [PATCH RFC v16 08/11] NFSD: Update find_client_in_id_table() " Dai Ngo
2022-03-12  2:13 ` [PATCH RFC v16 09/11] NFSD: Refactor nfsd4_laundromat() Dai Ngo
2022-03-12  2:13 ` [PATCH RFC v16 10/11] NFSD: Update laundromat to handle courtesy clients Dai Ngo
2022-03-12  2:13 ` [PATCH RFC v16 11/11] NFSD: Show state of courtesy clients in client info Dai Ngo

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=1647051215-2873-3-git-send-email-dai.ngo@oracle.com \
    --to=dai.ngo@oracle.com \
    --cc=bfields@fieldses.org \
    --cc=chuck.lever@oracle.com \
    --cc=jlayton@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).