From nobody Sun Feb 8 10:48:32 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 420E7172797; Fri, 5 Apr 2024 18:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712342462; cv=none; b=YEJOFJMlJ31GK6ex9NwAynR/HexvBh41OG83m4o1v/eXjMknIHcHrM8M2l1rryV+7flELEh4SoiGhYBVBIpJqwO0vRpap9kbdrGUPxsaGqDE/pXZQIlw2JTxx61hIfWT+KUnkb33HvN+vHn/Mn2L0Sc4Wq5xayfgMeEl9o1SeWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712342462; c=relaxed/simple; bh=HF5bdhmfNax8fSTda8C+ZW8NUjHRSdiQ478T8ES3kGo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uDUuPS3WjvENvWaR/XaqgXfrFuvcfRIdt2hYa5xz3WIT5bjyQYxNmvrXk+1onx58aDFP/D2z9JaSPnx4Cdfz705Ahx9utB/KVUTP4NQMj3opIIHlZu6kt6O2hPFo32+aqYx3ibkB9MgUHHz/qeu8tuVe2MtchLSmr7q1XyCwoY8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pb4Uix5Y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pb4Uix5Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E270C433C7; Fri, 5 Apr 2024 18:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712342461; bh=HF5bdhmfNax8fSTda8C+ZW8NUjHRSdiQ478T8ES3kGo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pb4Uix5Y5Zg55BEe3Mw+PcKtJOYs7lfOlp7CKr9KNTnDdh/yvpZXMNB2rj7Q6YBIu H7oDRGEfBiKjoIb2KJjanBUUE+DqXro9C+5rHaOAa1uOiejEiCBd2VlonFPMBh0rbY zpNp6tPvomHZ5zBQX1uPO0ipi32OUf1X+EiwQhKrSiHaAr/pFHkXXi9mDtlQ9e0qiX tLBy4Mse9b4joKZn2NBI0H89yCW0JCbBjERepEfaO2ZE221TaIdI10+WK8kF5xveiO CNnm/QD8Sww6/e9xpHjlxq5HVxP2mW7jM7dBhQNVAcxxTDE3/DvoEWzApaPFr/Pr+c dAdS1ZabTmuvQ== From: Jeff Layton Date: Fri, 05 Apr 2024 14:40:49 -0400 Subject: [PATCH 1/3] nfsd: drop extraneous newline from nfsd tracepoints Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240405-nfsd-fixes-v1-1-e017bfe9a783@kernel.org> References: <20240405-nfsd-fixes-v1-0-e017bfe9a783@kernel.org> In-Reply-To: <20240405-nfsd-fixes-v1-0-e017bfe9a783@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1351; i=jlayton@kernel.org; h=from:subject:message-id; bh=HF5bdhmfNax8fSTda8C+ZW8NUjHRSdiQ478T8ES3kGo=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBmEEW7Leu3f4qXrkadpej2z8m7xpWp8OFoetsdY qYaPwuu+YyJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZhBFuwAKCRAADmhBGVaC FaRXD/4yfcIphXyP9uyfMr5iMUh6n5GUSqwMP4uOB7GYGDxK8eoGVqzY8kTFhi/mL4QuogG4lRN TD1YvlTFVL6grj/bYfUNsL6+4sMSr9vAD/qsnXBgaCaCq86qr4KSpqPeH+61vDBZU647dRCOQ4G LkejjX2BeE9SxhP4q9MNYkR9lBTIB2DQJ6coalsK2gg4EWCXOeVJK7+S7yvr65C+iY9Ckhxc/U8 PiLrPDwmT46DL0CmVD8kX+20bwLRITQzKsa05lnVwaBkiJxua5VLrzjmeF4hIZBtNuMNM2dZdR3 ZFWfDLtTlEjfn7tiktPANfgQiQGLj2AoK5yL3KYLwgLhGHZHsRVAmRtkXTXAhPf6sp+FWpJb1cK /LybaHRpG5JBcyGajmXu/yrdcvKLkx7Mw2JoZ5oEpAsSCxI0dp+d7gA2N3sdFRAbjOhngnUP99c ja6mZ/FFQAlbwGdAMDR04xhzAzahOOcpgLZiR73ewELQ/TdcW+QPyX2R2PLTbPlMMUpVIt0ZEQE 0ufe0cULL+hHOzIQ7PPB4f7/JLlF8FHfebb5M8Bgw6FmL3zsHlwHdu70PajiSRbj4VVudTmoZDJ BctKPM48Ba59ELkiLJ90kpVldLHQqOUUxqPjCKbMLWVCURfNY/h4wKoKDPaJp7IACya6ce1v0Dz zEfyMOA9nbC+QZw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 We never want a newline in tracepoint output. Signed-off-by: Jeff Layton --- fs/nfsd/trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index e545e92c4408..7f1a6d568bdb 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -1534,7 +1534,7 @@ TRACE_EVENT(nfsd_cb_seq_status, __entry->seq_status =3D cb->cb_seq_status; ), TP_printk(SUNRPC_TRACE_TASK_SPECIFIER - " sessionid=3D%08x:%08x:%08x:%08x tk_status=3D%d seq_status=3D%d\n", + " sessionid=3D%08x:%08x:%08x:%08x tk_status=3D%d seq_status=3D%d", __entry->task_id, __entry->client_id, __entry->cl_boot, __entry->cl_id, __entry->seqno, __entry->reserved, @@ -1573,7 +1573,7 @@ TRACE_EVENT(nfsd_cb_free_slot, __entry->slot_seqno =3D session->se_cb_seq_nr; ), TP_printk(SUNRPC_TRACE_TASK_SPECIFIER - " sessionid=3D%08x:%08x:%08x:%08x new slot seqno=3D%u\n", + " sessionid=3D%08x:%08x:%08x:%08x new slot seqno=3D%u", __entry->task_id, __entry->client_id, __entry->cl_boot, __entry->cl_id, __entry->seqno, __entry->reserved, @@ -1978,7 +1978,7 @@ TRACE_EVENT(nfsd_ctl_time, __entry->time =3D time; __assign_str_len(name, name, namelen); ), - TP_printk("file=3D%s time=3D%d\n", + TP_printk("file=3D%s time=3D%d", __get_str(name), __entry->time ) ); --=20 2.44.0 From nobody Sun Feb 8 10:48:32 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C096172BAD; Fri, 5 Apr 2024 18:41:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712342463; cv=none; b=HS2FqnqynYJFvaKKbpHWxmDLVHRRyvhpY1HC4m+UOqBa9di/q7KhQvGr2MzDPwP0HlgYM0R5UGFEAL893fbJkx8b6ZEBani2m1jF5UkGDS8Ox420ivHrz2rKqG2DRJ/g3f+vK8dZpLu7viYMjGcuI5zuZBAq9yESqONFKWfQbs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712342463; c=relaxed/simple; bh=rQwjRf05WXQlBMs/WtRYxy6v/FNdP0cw9aIf47YxhnM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QiNEBgkDXEQFoVbmv8AqRZnj8q8Z/IWox9dBKy6qLTpSL0YtCP/vLuDVjFyk2INDGt/R5spev0lkhJVihKG10I/fMntgLBYuQv1lV4Caa4cc0AJvqKZ0s3RPqjOint6UBfdWZXgAuojoZujmY1PMsCjaSUTYudbilJpIqL5HwVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r43JJnJS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r43JJnJS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E581C433A6; Fri, 5 Apr 2024 18:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712342462; bh=rQwjRf05WXQlBMs/WtRYxy6v/FNdP0cw9aIf47YxhnM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=r43JJnJSyrN6RFOhELqb8qsMzuFs1dKAD7gtvKQqH1Qx2d9U4fsUr6JvH2L1Xheyk ImddD7IkmtB5uogUE++viuwAL5d++/2BHy0Z5K3YbP0ZBU5jbJP/m7gAVxHIJuNDrr RcQshFdhmzEtJXKXMz6Jn6N1x7nRgxNx79JNfbfjMvVNTt8r53vwR1ZRFw5t/zoYnU gXjTLMe+2mg60jsbwQLTKVyEaN3fVZbctoiqVifXMhuCbzYpZyQHCmR3qFEpWhdR4X 0QQXwz+9bkARbxvLDk7Jj66Y43gjzL0qRh+2Tk8J+L9SuXLe9IEQSLCrHcVOGXigBX GIbrjw5kj2qCg== From: Jeff Layton Date: Fri, 05 Apr 2024 14:40:50 -0400 Subject: [PATCH 2/3] nfsd: new tracepoint for check_slot_seqid Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240405-nfsd-fixes-v1-2-e017bfe9a783@kernel.org> References: <20240405-nfsd-fixes-v1-0-e017bfe9a783@kernel.org> In-Reply-To: <20240405-nfsd-fixes-v1-0-e017bfe9a783@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton , Jeff Layton X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3299; i=jlayton@kernel.org; h=from:subject:message-id; bh=rQwjRf05WXQlBMs/WtRYxy6v/FNdP0cw9aIf47YxhnM=; b=kA0DAAgBAA5oQRlWghUByyZiAGYQRbugltUmiXpvYNW1qux1n7woBXkotb2EfOYgOWqHFDeZL YkCMwQAAQgAHRYhBEvA17JEcbKhhOr10wAOaEEZVoIVBQJmEEW7AAoJEAAOaEEZVoIVMSMQAIoE vIdc02UpvfeOcWveg/KPeeiFDhm6H0RytxV2WAlx5EfUxqHbz9AKhyMVyo0Qp4iFI45mE5bclTZ A/S0CWtceiNwBzqNVoEfy8n9J4UdSosmoAiYEFEYZUyn6NYXxnVemEOF/Zl4NRQI2cW5ceftvsY SlvbBb0YzVAlnod8pWgCsbLZS9DIuCxgDcBOa8Rrqcco8tbsEKrqM3xDMOJSIlM5Z+iwiIHLek/ K4oo2F9IqQ0VsftWNb4spE7tHEar8FktDJq59OjQKrjG/4VBC/DBChYFmSOhVjK1DnzDpQEBntG aFZsxSowQn5HqIKxpJNpZT8MQl3zvjvQ3nDxC8ypZz9c8Epop2Ob3WgwRX1aa7BEkt+6NtmUG0N 8v/i6LcuEtOPVD+XIt1EF8p259oUOo0Qzw8vVeia9Rs0b36fDSR/GQimOqoWR4C6tMMO1wPvQq9 JoSkMbqRVuNdqx5otSxX/yRCe6w5aDqwQy13riWw1kTUVctA4nVfL1niKyoZzdt3sndwo4OI5OO BVrrqnaBCkoUWXpWbNVdtPzM0QdOz26OiFXJF8xfkqkw0fergX4fwL0+qxn9aADiCXFRVt/+FoQ gQwx7Z3jVHOKJfAq7+zi70EdnhSZeEq7SC0rl3qC/D5XTOj6Ez2IxIdhLgw+pDIVHxfgYksDSZ0 AR2vy X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Replace a dprintk in check_slot_seqid with a new tracepoint. Add a nfs4_client argument to check_slot_seqid so that we can pass the appropriate info to the tracepoint. Signed-off-by: Jeffrey Layton --- fs/nfsd/nfs4state.c | 12 ++++++------ fs/nfsd/trace.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3cef81e196c6..5891bc3e2b0b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3642,10 +3642,9 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct nfs= d4_compound_state *cstate, } =20 static __be32 -check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse) +check_slot_seqid(struct nfs4_client *clp, u32 seqid, u32 slot_seqid, bool = slot_inuse) { - dprintk("%s enter. seqid %d slot_seqid %d\n", __func__, seqid, - slot_seqid); + trace_check_slot_seqid(clp, seqid, slot_seqid, slot_inuse); =20 /* The slot is in use, and no response has been sent. */ if (slot_inuse) { @@ -3827,7 +3826,8 @@ nfsd4_create_session(struct svc_rqst *rqstp, cs_slot =3D &conf->cl_cs_slot; else cs_slot =3D &unconf->cl_cs_slot; - status =3D check_slot_seqid(cr_ses->seqid, cs_slot->sl_seqid, 0); + status =3D check_slot_seqid(conf ? conf : unconf, cr_ses->seqid, + cs_slot->sl_seqid, false); switch (status) { case nfs_ok: cs_slot->sl_seqid++; @@ -4221,8 +4221,8 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_c= ompound_state *cstate, * sr_highest_slotid and the sr_target_slot id to maxslots */ seq->maxslots =3D session->se_fchannel.maxreqs; =20 - status =3D check_slot_seqid(seq->seqid, slot->sl_seqid, - slot->sl_flags & NFSD4_SLOT_INUSE); + status =3D check_slot_seqid(clp, seq->seqid, slot->sl_seqid, + slot->sl_flags & NFSD4_SLOT_INUSE); if (status =3D=3D nfserr_replay_cache) { status =3D nfserr_seq_misordered; if (!(slot->sl_flags & NFSD4_SLOT_INITIALIZED)) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 7f1a6d568bdb..ec00ca7ecfc8 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -1542,6 +1542,40 @@ TRACE_EVENT(nfsd_cb_seq_status, ) ); =20 +TRACE_EVENT(check_slot_seqid, + TP_PROTO( + const struct nfs4_client *clp, + u32 seqid, + u32 slot_seqid, + bool inuse + ), + TP_ARGS(clp, seqid, slot_seqid, inuse), + TP_STRUCT__entry( + __field(u32, seqid) + __field(u32, slot_seqid) + __field(u32, cl_boot) + __field(u32, cl_id) + __sockaddr(addr, clp->cl_cb_conn.cb_addrlen) + __field(bool, conf) + __field(bool, inuse) + ), + TP_fast_assign( + __entry->cl_boot =3D clp->cl_clientid.cl_boot; + __entry->cl_id =3D clp->cl_clientid.cl_id; + __assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr, + clp->cl_cb_conn.cb_addrlen); + __entry->seqid =3D seqid; + __entry->slot_seqid =3D slot_seqid; + __entry->conf =3D test_bit(NFSD4_CLIENT_CONFIRMED, &clp->cl_flags); + __entry->inuse =3D inuse; + ), + TP_printk("addr=3D%pISpc %s client %08x:%08x seqid=3D%u slot_seqid=3D%u i= nuse=3D%d", + __get_sockaddr(addr), __entry->conf ? "conf" : "unconf", + __entry->cl_boot, __entry->cl_id, + __entry->seqid, __entry->slot_seqid, __entry->inuse + ) +); + TRACE_EVENT(nfsd_cb_free_slot, TP_PROTO( const struct rpc_task *task, --=20 2.44.0 From nobody Sun Feb 8 10:48:32 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3427C172BCE; Fri, 5 Apr 2024 18:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712342464; cv=none; b=mb95Yoy4Kyun9EmJutbQGpgm185zlYHG2Enqp/I58uZwK0JfuGDoMPW9H1P0PySjfsUBAMqC/EiX82SU4V65wGL6FkOFk/YpavYf1g/md3zfb6wJuKqP5SOranAlRLVxwdB3ewksetL1f8fgwb8FE/WSd00LZIBTDDLMYgoeM5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712342464; c=relaxed/simple; bh=1Pi5PIFKWzOHDFMVv16vL3HB67cVIN7Y+lJtjE4ssfE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tO9YT7KnUt4ccnNKdyZbA3DSr9SusHxtOJ+IJEaVdvCsLQ/53iBMEIKgd5UPQg62CD2kJzCVwRuJzTwGleRP45iyFmy3eIzTWAFBV+V8JSigaIIF7DgnhU0qCxJQ0vxo5vmYj9TRZSn8tDiycMwrHzfC9Ih7DlJuqeQoB/kG1Rs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mT46KpkE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mT46KpkE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D956C4166C; Fri, 5 Apr 2024 18:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712342463; bh=1Pi5PIFKWzOHDFMVv16vL3HB67cVIN7Y+lJtjE4ssfE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mT46KpkEDRoMkbW7ty3vb6LL9KcuNG3LLV2IF2AxpZO4RcVf/Bu+rL/0Z9CP0lrQg buEXmW3jpS358YrzDzvDc+1Axi5QuJiBt0SbjHo2mKmeJpomnZoLJDhUAaayfLfq4L Q8Cofnh0Xxp9XqMt9z4qUfHmH2Mvg8eedD9fdYwLaw5UP7tIfpdqho0qfPX2Gzxdwo /3io6CEvcOaqOQArSbfy430Zq2nUXrba8RAoUh1ab1QVMulaNpSofvtJax+tmW1zOT PFKqieyGZKL/yEo3IjMS4GuGFRjOF6FrYelq6cuTl/7yfq6SrsY5+G8IWiWDo18tG+ bGmtr0J/v9/dQ== From: Jeff Layton Date: Fri, 05 Apr 2024 14:40:51 -0400 Subject: [PATCH 3/3] nfsd: add tracepoint in mark_client_expired_locked Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240405-nfsd-fixes-v1-3-e017bfe9a783@kernel.org> References: <20240405-nfsd-fixes-v1-0-e017bfe9a783@kernel.org> In-Reply-To: <20240405-nfsd-fixes-v1-0-e017bfe9a783@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1863; i=jlayton@kernel.org; h=from:subject:message-id; bh=1Pi5PIFKWzOHDFMVv16vL3HB67cVIN7Y+lJtjE4ssfE=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBmEEW75SjWy1aDQNBXHYSBcZlz91tWhCKwzax8x 9ciP6k6H1GJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZhBFuwAKCRAADmhBGVaC FeEdD/43xhDGNY39uWy/9tVuzu+E2f47ecY7C9qqmJFImxRJXJhBEEiQNNaF8i3+RTUXRhjn6MT LSGNfVp0lyk9SRmx7UXRjiwSe3a0k/Una9UAHI2DThnERxSyOGmX+NNCpfDf5e/xZ2bWDyzmKgd xIHIEN3vQyYqVcuzpLvdtofkzDo2y+GCV4dHjvC6tvAnsh0TwD36TjNSa4oq/1Rdts4azGXhvoN KX/0LbTtjloH9qP4bGNqtA8nn3hxVD7bdg8FXKERNUCEQYgGYVcspI++EipiMrNYMOPnpEUNKzu n3+ITqUHClpX39CqxUV4s6/hZe/WJ7w6Tw08LbsAIMyqXUlXN1ZusWzYK/qIjBz6eoEn0G42uOg IGK6TpSi/n5lGd9Ir+yFMBonH6F/A9WfXJDmK2zEWvMlTYT1edC8zUXf3obyFGGxTva35faXb3V aQ8BJ5ujKYmCibMw8cwnR8j90RgoD8X9P4sMVTx0uV0qrXjNsU7R3c25SE9as3WVVVyXK419bo0 v3PTLw36klCAVWpFiPAmpZKna81syGMgMV1TGeqnIY3lmWlz47idtz6maR+rR3ojA8eO8KMneBs 4+Un0ibPa3rlBQgcM+jEzgnIGTakuQI+HVg/eelUCb6OKhUp4kmgskUuZONeUsPOk+nOYcP5Gou lOBmFN1CS+ygq1Q== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Show client info alongside the number of cl_rpc_users. If that's elevated, then we can infer that this function returned nfserr_jukebox. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 6 +++++- fs/nfsd/trace.h | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5891bc3e2b0b..2b5dadeed8c9 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2352,7 +2352,11 @@ unhash_client(struct nfs4_client *clp) =20 static __be32 mark_client_expired_locked(struct nfs4_client *clp) { - if (atomic_read(&clp->cl_rpc_users)) + int users =3D atomic_read(&clp->cl_rpc_users); + + trace_mark_client_expired_locked(clp, users); + + if (users) return nfserr_jukebox; unhash_client_locked(clp); return nfs_ok; diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index ec00ca7ecfc8..b50d6a71c7d9 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -1576,6 +1576,30 @@ TRACE_EVENT(check_slot_seqid, ) ); =20 +TRACE_EVENT(mark_client_expired_locked, + TP_PROTO( + const struct nfs4_client *clp, + int cl_rpc_users + ), + TP_ARGS(clp, cl_rpc_users), + TP_STRUCT__entry( + __field(int, cl_rpc_users) + __field(u32, cl_boot) + __field(u32, cl_id) + __sockaddr(addr, clp->cl_cb_conn.cb_addrlen) + ), + TP_fast_assign( + __entry->cl_rpc_users =3D cl_rpc_users; + __entry->cl_boot =3D clp->cl_clientid.cl_boot; + __entry->cl_id =3D clp->cl_clientid.cl_id; + __assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr, + clp->cl_cb_conn.cb_addrlen) + ), + TP_printk("addr=3D%pISpc client %08x:%08x cl_rpc_users=3D%d", + __get_sockaddr(addr), __entry->cl_boot, __entry->cl_id, + __entry->cl_rpc_users) +); + TRACE_EVENT(nfsd_cb_free_slot, TP_PROTO( const struct rpc_task *task, --=20 2.44.0