From: dai.ngo@oracle.com
To: Bruce Fields <bfields@fieldses.org>,
Chuck Lever III <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@redhat.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH RFC v16 04/11] NFSD: Update nfsd_breaker_owns_lease() to handle courtesy clients
Date: Tue, 15 Mar 2022 09:27:22 -0700 [thread overview]
Message-ID: <8a4fe0f5-f011-e944-e4ab-cd250971dc7b@oracle.com> (raw)
In-Reply-To: <20220315151323.GB19168@fieldses.org>
On 3/15/22 8:13 AM, Bruce Fields wrote:
> On Sun, Mar 13, 2022 at 04:04:21PM +0000, Chuck Lever III wrote:
>>
>>> On Mar 11, 2022, at 9:13 PM, Dai Ngo <dai.ngo@oracle.com> wrote:
>>>
>>> Update nfsd_breaker_owns_lease() to handle delegation conflict
>>> with courtesy clients. If conflict was caused by courtesy client
>>> then discard the courtesy client by setting CLIENT_EXPIRED and
>>> return conflict resolved. Client with CLIENT_EXPIRED is expired
>>> by the laundromat.
>>>
>>> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
>>> ---
>>> fs/nfsd/nfs4state.c | 26 ++++++++++++++++++++++++++
>>> 1 file changed, 26 insertions(+)
>>>
>>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>>> index 583ac807e98d..2beb0972de88 100644
>>> --- a/fs/nfsd/nfs4state.c
>>> +++ b/fs/nfsd/nfs4state.c
>>> @@ -4713,6 +4713,28 @@ nfsd_break_deleg_cb(struct file_lock *fl)
>>> return ret;
>>> }
>>>
>>> +static bool
>>> +nfs4_check_and_expire_courtesy_client(struct nfs4_client *clp)
>>> +{
>>> + /*
>>> + * need to sync with courtesy client trying to reconnect using
>>> + * the cl_cs_lock, nn->client_lock can not be used since this
>>> + * function is called with the fl_lck held.
>>> + */
>>> + spin_lock(&clp->cl_cs_lock);
>>> + if (test_bit(NFSD4_CLIENT_EXPIRED, &clp->cl_flags)) {
>>> + spin_unlock(&clp->cl_cs_lock);
>>> + return true;
>>> + }
>>> + if (test_bit(NFSD4_CLIENT_COURTESY, &clp->cl_flags)) {
>>> + set_bit(NFSD4_CLIENT_EXPIRED, &clp->cl_flags);
>>> + spin_unlock(&clp->cl_cs_lock);
>>> + return true;
>>> + }
>>> + spin_unlock(&clp->cl_cs_lock);
> Same comment as on the previous patch. ALso, this is the second time
> we've used this logic, please define a
>
> static bool expire_client_if_courtesy(struct nfs4_client *clp)
>
> and call it from both places.
I will replace the similar code in nfsd4_lm_lock_expired with
a call to nfs4_check_and_expire_courtesy_client.
>
>>> + return false;
>>> +}
>>> +
>>> /**
>>> * nfsd_breaker_owns_lease - Check if lease conflict was resolved
>>> * @fl: Lock state to check
>>> @@ -4727,6 +4749,10 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl)
>>> struct svc_rqst *rqst;
>>> struct nfs4_client *clp;
>>>
>>> + clp = dl->dl_stid.sc_client;
>>> + if (nfs4_check_and_expire_courtesy_client(clp))
>> Since you'll need to fix the kernel robot issue in 1/11, when you
>> repost, can you also just pass dl->dl_stid.sc_client directly to
>> nfs4_check_and_expire_courtesy_client() here?
> Agreed.
>
> This client is quite different from the one we look up from the task a
> little later, and I'd just rather not have both represented by the same
> variable.
fix in v17.
-Dai
>
> --b.
next prev parent reply other threads:[~2022-03-15 16:27 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 ` [PATCH RFC v16 02/11] NFSD: Add client flags, macro and spinlock to support courteous server Dai Ngo
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 [this message]
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=8a4fe0f5-f011-e944-e4ab-cd250971dc7b@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