From patchwork Thu Mar 17 07:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dai Ngo X-Patchwork-Id: 12783630 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BE5EC433EF for ; Thu, 17 Mar 2022 07:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230362AbiCQHpS (ORCPT ); Thu, 17 Mar 2022 03:45:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229866AbiCQHpO (ORCPT ); Thu, 17 Mar 2022 03:45:14 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B62D0BF01A; Thu, 17 Mar 2022 00:43:57 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22H3aUjW006894; Thu, 17 Mar 2022 07:43:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2021-07-09; bh=Z0U8Ct3qv1nLuhMlKjSqu0rZX+wTACY54EfZ8SXiveo=; b=qbv5MQeRdNKUe52q6Y45bL2V/C8YLQia1KWnRo4BRapV07akYJWUwXTkcYQqXlxVBE64 HgKVD1koIVGow3KDT9/bhoHbzKwgRDvZ+ZSt7Mb/ytp+I1kc6cOU6UbIsJ7W5dDPVtRC ef3wwD7ScJc25DSXaOcs2b3yUFc9oJksZUrT1pJqi4WlcnANQpLjMuQ3l/6GJMk5F1az mO1fcI+YgOZCnaul4z6+lK4sFuid6NaQZQ9s35A+hooWdZaX7ovbs92LT7C1VdMFxHlg fh2rscwNmwAzbwhg8vZdis21M5045A6FkABX8+92PFjNVWWke7UXYem7WA5wPoKCfdy5 og== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com with ESMTP id 3et52q0exe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:43:54 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 22H7fnNj034962; Thu, 17 Mar 2022 07:43:53 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3erhy2wqwb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Mar 2022 07:43:53 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 22H7hoGf038783; Thu, 17 Mar 2022 07:43:52 GMT Received: from ca-common-hq.us.oracle.com (ca-common-hq.us.oracle.com [10.211.9.209]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3erhy2wqv5-3; Thu, 17 Mar 2022 07:43:52 +0000 From: Dai Ngo 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 v17 02/11] NFSD: Add courtesy client state, macro and spinlock to support courteous server Date: Thu, 17 Mar 2022 00:43:39 -0700 Message-Id: <1647503028-11966-3-git-send-email-dai.ngo@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1647503028-11966-1-git-send-email-dai.ngo@oracle.com> References: <1647503028-11966-1-git-send-email-dai.ngo@oracle.com> X-Proofpoint-GUID: j0XlBtfFfP6dFB11gePZ0cq56kgFHVp2 X-Proofpoint-ORIG-GUID: j0XlBtfFfP6dFB11gePZ0cq56kgFHVp2 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Update nfs4_client to add: . cl_cs_client_state: courtesy client state . cl_cs_lock: spinlock to synchronize access to cl_cs_client_state . cl_cs_list: list used by laundromat to process courtesy clients Modify alloc_client to initialize these fields. Signed-off-by: Dai Ngo --- fs/nfsd/nfs4state.c | 2 ++ fs/nfsd/nfsd.h | 1 + fs/nfsd/state.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 36 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..40e390abc842 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -283,6 +283,35 @@ struct nfsd4_sessionid { #define HEXDIR_LEN 33 /* hex version of 16 byte md5 of cl_name plus '\0' */ /* + * CLIENT_ CLIENT_ CLIENT_ + * COURTESY EXPIRED RECONNECTED Meaning Where set + * ----------------------------------------------------------------------------- + * | false | false | false | Confirmed, active | Default | + * |---------------------------------------------------------------------------| + * | true | false | false | Courtesy state. | nfs4_get_client_reaplist | + * | | | | Lease/lock/share | | + * | | | | reservation conflict | | + * | | | | can cause Courtesy | | + * | | | | client to be expired | | + * |---------------------------------------------------------------------------| + * | false | true | false | Courtesy client to be| nfs4_laundromat | + * | | | | expired by Laundromat| nfsd4_lm_lock_expired | + * | | | | due to conflict | nfsd4_discard_courtesy_clnt | + * | | | | | nfsd4_expire_courtesy_clnt | + * |---------------------------------------------------------------------------| + * | false | false | true | Courtesy client | nfsd4_courtesy_clnt_expired| + * | | | | reconnected, | | + * | | | | becoming active | | + * ----------------------------------------------------------------------------- + */ + +enum courtesy_client_state { + NFSD4_CLIENT_COURTESY = 1, + NFSD4_CLIENT_EXPIRED, + NFSD4_CLIENT_RECONNECTED, +}; + +/* * struct nfs4_client - one per client. Clientids live here. * * The initial object created by an NFS client using SETCLIENTID (for NFSv4.0) @@ -385,6 +414,10 @@ 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 */ + + enum courtesy_client_state cl_cs_client_state; + spinlock_t cl_cs_lock; + struct list_head cl_cs_list; }; /* struct nfs4_client_reset