Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4627742pxj; Wed, 12 May 2021 09:33:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhtXTlg4DXYYYMqAMWhEqMAqjn3EzSCkRqPleU+2kQJCZkaK24/EBZVIPEaXDnYGeB62Y1 X-Received: by 2002:aca:1e0d:: with SMTP id m13mr2274732oic.51.1620837190598; Wed, 12 May 2021 09:33:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620837190; cv=none; d=google.com; s=arc-20160816; b=UIbIt24EHbzk7j9Y1mbGUuIgpaxVagiRG+F1q3wYoDC1rqMEHcbOxYUiP9bAHqyb50 CMKt9kAH4qNr1Gpg/Ch9afLcxVcgy0YYCkoSeolPu3ZmVFp4yGURwDiTwspqgsmg2hpW eRIayZ/zi7VbilHDPgdKKhXdFttD+wbxmAEUSpvjsv28K5qsbEecT5KwItcTWPnbsty7 pDoh/dEnmeDrq8NJsQF0IIFTpWinAE7+xgM3NbroQS3126xlsu13wQbtpgjKlS2Qbgnh jmi9IQhJmkbS6qDIZahaoyuMZvcSeMCrBXA2pyhlkV2Qkx7CSZHF6AVcQ+M//Zrq4toV fn9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=DXFrTRA0z+/HWITR43lK2C0uvWOgguM9eKsOXv0EZk0=; b=q6gEYaaYEG1mugAxMzPIdCWJj0P7QRpO4vlsWPA5mrDAwyA7fA38aI+zi/24826xcV 02inK5Cc5RwJ76+jDPXIJP2U8LjGWaqYw2A+ILm+Rg+SIIDrAQ/ZMXOXDw0eoD0UVIzS Rk1BuWFuZkBNF8OzXg6GBRE6qlYuPZJalTZvLQIRSOTwedyOWc0AXfzTi7u1GljJU1/M 0FXqIK/Tu2Fsf0DwiXgrp+G7gMdS7jEvQdcqSEZgRMyEPES2QJGReoG56OqOmroRmQie 17Eb/CA6CyiXEMhfD8fYXgjAzGsVNta8gIIxpNVK2BGVTJC0fDwY3IUo7d/8uvYug9HY G4Ag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h5si314226oti.40.2021.05.12.09.32.54; Wed, 12 May 2021 09:33:10 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237581AbhELQcq (ORCPT + 99 others); Wed, 12 May 2021 12:32:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:36284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239073AbhELQHP (ORCPT ); Wed, 12 May 2021 12:07:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id DE0726198B; Wed, 12 May 2021 15:35:55 +0000 (UTC) Subject: [PATCH v2 09/25] NFSD: Add a couple more nfsd_clid_expired call sites From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: dwysocha@redhat.com, bfields@fieldses.org, rostedt@goodmis.org Date: Wed, 12 May 2021 11:35:55 -0400 Message-ID: <162083375498.3108.14242612463783055564.stgit@klimt.1015granger.net> In-Reply-To: <162083366966.3108.12581818416105328952.stgit@klimt.1015granger.net> References: <162083366966.3108.12581818416105328952.stgit@klimt.1015granger.net> User-Agent: StGit/1.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Improve observation of NFSv4 lease expiry. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4state.c | 3 +++ 1 file changed, 3 insertions(+) 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 = net_generic(clp->net, nfsd_net_id); bool already_expired; + trace_nfsd_clid_expired(&clp->cl_clientid); + spin_lock(&clp->cl_lock); clp->cl_time = 0; spin_unlock(&clp->cl_lock); @@ -4075,6 +4077,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, goto out; status = mark_client_expired_locked(old); if (status) { + trace_nfsd_clid_expired(&old->cl_clientid); old = NULL; goto out; }