Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     David Wysochanski <dwysocha@redhat.com>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Bruce Fields <bfields@fieldses.org>,
        "rostedt@goodmis.org" <rostedt@goodmis.org>
Subject: Re: [PATCH v2 09/25] NFSD: Add a couple more nfsd_clid_expired call
 sites
Thread-Topic: [PATCH v2 09/25] NFSD: Add a couple more nfsd_clid_expired call
 sites
Thread-Index: AQHXR0+IZmMB/l0dykSHJqvNU5T0Rarhn1eAgAAGUQA=
Date:   Thu, 13 May 2021 17:05:15 +0000
Message-ID: <46366046-7B94-4B26-A0BC-6B58F8CA5BE1@oracle.com>
References: <162083366966.3108.12581818416105328952.stgit@klimt.1015granger.net>
 <162083375498.3108.14242612463783055564.stgit@klimt.1015granger.net>
 <CALF+zOkZYg7RzayueKGwFaE-8sHKTB6g4q_Ej-+u=MkH35Dnqw@mail.gmail.com>
In-Reply-To: <CALF+zOkZYg7RzayueKGwFaE-8sHKTB6g4q_Ej-+u=MkH35Dnqw@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <68C53F1C180F7949BCB1B2A245591B49@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: ce8abf35-1bfb-448a-04ff-08d916314734
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 May 2021 17:05:15.2689
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: bD6o8dJdH6e5iXIPLQABeH3r6qriqCJ0b88SQgbTkhbBwL0pC7deR/pQdIUx+6yF1KwJTk6k3ngTBSVQIhg+Mw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4655
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9983 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 suspectscore=0
 malwarescore=0 mlxlogscore=999 spamscore=0 adultscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2105130118
X-Proofpoint-GUID: 7Me71tauIKr7DK3Qb_7zSi6YiM6m_63s
X-Proofpoint-ORIG-GUID: 7Me71tauIKr7DK3Qb_7zSi6YiM6m_63s
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9983 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 bulkscore=0
 adultscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0
 impostorscore=0 mlxlogscore=999 mlxscore=0 clxscore=1015 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000
 definitions=main-2105130118
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On May 13, 2021, at 12:42 PM, David Wysochanski <dwysocha@redhat.com> wro=
te:
>=20
> On Wed, May 12, 2021 at 11:36 AM Chuck Lever <chuck.lever@oracle.com> wro=
te:
>>=20
>> Improve observation of NFSv4 lease expiry.
>>=20
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>> ---
>> fs/nfsd/nfs4state.c |    3 +++
>> 1 file changed, 3 insertions(+)
>>=20
>=20
> How about adding a parameter to explain the location of the expiry to
> make it more slightly more readable?
> Below is an attempt at the two added here, I think there's one more
> not shown though in nfs4_laundromat, which you could just use
> "laundromat".

The usual idiom is to create a trace class, and then create a uniquely
named tracepoint for each call site. We already have nfsd_clientid_class
so half the work is already done! I'll look into it splitting
clid_expired into several tracecpoints.


>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>> index 08ff643e96fb..7fa90a3177fa 100644
>> --- a/fs/nfsd/nfs4state.c
>> +++ b/fs/nfsd/nfs4state.c
>> @@ -2665,6 +2665,8 @@ static void force_expire_client(struct nfs4_client=
 *clp)
>>        struct nfsd_net *nn =3D net_generic(clp->net, nfsd_net_id);
>>        bool already_expired;
>>=20
>> +       trace_nfsd_clid_expired(&clp->cl_clientid);
>> +
>=20
> trace_nfsd_clid_expired(..., "admin forced");
>=20
>>        spin_lock(&clp->cl_lock);
>>        clp->cl_time =3D 0;
>>        spin_unlock(&clp->cl_lock);
>> @@ -4075,6 +4077,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
>>                                goto out;
>>                        status =3D mark_client_expired_locked(old);
>>                        if (status) {
>> +                               trace_nfsd_clid_expired(&old->cl_clienti=
d);
>=20
> trace_nfsd_clid_expired(..., "setclientid_confirm existing"); /* found
> an existing confirmed clientid by name */
>=20
>>                                old =3D NULL;
>>                                goto out;
>>                        }
>>=20
>>=20
>=20

--
Chuck Lever