From nobody Fri Dec 19 22:01:24 2025 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 D751827E7E3; Sat, 3 May 2025 19:59:42 +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=1746302382; cv=none; b=EAPbhfLAs7lpeonYF2QhY35fCw0m3WMsBsYfEFKVNcSUqWSDMX3oZodykzTLm0mY6ghJ3TQTlQ+HIp2zMKAHmNzrBubuGxPW5Sbs/X+WM9MNYnxUz6ykxpZQRyie3apqF0k4WgeB1xyUEeLJaW6L82+dLaXjV4vTTi/Xb8UL1Ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302382; c=relaxed/simple; bh=KJPgf046JQUt43qmgHzqKe/F6+epeQhsks3OVpFEwuQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c/pS7GT1PD/WwoJEn+rXE6J3YqE6KKhGsWZDD0wHroRljMf2XtAQf55txIHbthVmmJYB2lY7KsCj7F+C7U0Y7mdOqd/ccqur1dduYpN8MairGxyHFRpLkdL4gcUwBl+3jiqw+A+aEAvvBDIn1/D9dZEBSsiYmfPtmukHTtE1/yI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=disRDT4n; 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="disRDT4n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B0D9C4CEEE; Sat, 3 May 2025 19:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302382; bh=KJPgf046JQUt43qmgHzqKe/F6+epeQhsks3OVpFEwuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=disRDT4nDLWGR7Yxa4HCcDXsbiiOuoRv+3o4xek7RVJOiQ8iZBesZegN7S12g0o9s 4IrMhBCspxxaTznEYymZaOOxdmzqbHgN0Cpody0AJKpBQTMmCb6v1mEWCoRFK47Vaj 0cwTJ5nRGwBkIh01Zz8cNbgqu1usdH+fLpI3NaSN3ZjUDeia3uMaa2LzPYLIuPfhYw u0N5Ji22nLbT2T+qPDdzY3dsWY5kWHFKTBasZNemZo4U/UDq+guWjEAYpxDhXzoSWA e9VqP6Mt2yMW6nOI7PExiroEmGiQ0mUSvCv1vgP78OB6px5YZx9X6/C54hHDljcYnD pYM8lWfeP4pxw== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , , Chuck Lever Subject: [PATCH v4 01/18] NFSD: Use sockaddr instead of a generic array Date: Sat, 3 May 2025 15:59:19 -0400 Message-ID: <20250503195936.5083-2-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chuck Lever Record and emit presentation addresses using tracing helpers designed for the task. Signed-off-by: Chuck Lever Reviewed-by: Jeff Layton --- fs/nfsd/trace.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 0d49fc064f72..f67ab3d1b506 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -18,22 +18,23 @@ #include "nfsfh.h" #include "xdr4.h" =20 -#define NFSD_TRACE_PROC_RES_FIELDS \ +#define NFSD_TRACE_PROC_RES_FIELDS(r) \ __field(unsigned int, netns_ino) \ __field(u32, xid) \ __field(unsigned long, status) \ - __array(unsigned char, server, sizeof(struct sockaddr_in6)) \ - __array(unsigned char, client, sizeof(struct sockaddr_in6)) + __sockaddr(server, (r)->rq_xprt->xpt_locallen) \ + __sockaddr(client, (r)->rq_xprt->xpt_remotelen) =20 -#define NFSD_TRACE_PROC_RES_ASSIGNMENTS(error) \ +#define NFSD_TRACE_PROC_RES_ASSIGNMENTS(r, error) \ do { \ - __entry->netns_ino =3D SVC_NET(rqstp)->ns.inum; \ - __entry->xid =3D be32_to_cpu(rqstp->rq_xid); \ + struct svc_xprt *xprt =3D (r)->rq_xprt; \ + __entry->netns_ino =3D SVC_NET(r)->ns.inum; \ + __entry->xid =3D be32_to_cpu((r)->rq_xid); \ __entry->status =3D be32_to_cpu(error); \ - memcpy(__entry->server, &rqstp->rq_xprt->xpt_local, \ - rqstp->rq_xprt->xpt_locallen); \ - memcpy(__entry->client, &rqstp->rq_xprt->xpt_remote, \ - rqstp->rq_xprt->xpt_remotelen); \ + __assign_sockaddr(server, &xprt->xpt_local, \ + xprt->xpt_locallen); \ + __assign_sockaddr(client, &xprt->xpt_remote, \ + xprt->xpt_remotelen); \ } while (0); =20 DECLARE_EVENT_CLASS(nfsd_xdr_err_class, @@ -145,14 +146,14 @@ TRACE_EVENT(nfsd_compound_decode_err, ), TP_ARGS(rqstp, args_opcnt, resp_opcnt, opnum, status), TP_STRUCT__entry( - NFSD_TRACE_PROC_RES_FIELDS + NFSD_TRACE_PROC_RES_FIELDS(rqstp) =20 __field(u32, args_opcnt) __field(u32, resp_opcnt) __field(u32, opnum) ), TP_fast_assign( - NFSD_TRACE_PROC_RES_ASSIGNMENTS(status) + NFSD_TRACE_PROC_RES_ASSIGNMENTS(rqstp, status) =20 __entry->args_opcnt =3D args_opcnt; __entry->resp_opcnt =3D resp_opcnt; @@ -171,12 +172,12 @@ DECLARE_EVENT_CLASS(nfsd_compound_err_class, ), TP_ARGS(rqstp, opnum, status), TP_STRUCT__entry( - NFSD_TRACE_PROC_RES_FIELDS + NFSD_TRACE_PROC_RES_FIELDS(rqstp) =20 __field(u32, opnum) ), TP_fast_assign( - NFSD_TRACE_PROC_RES_ASSIGNMENTS(status) + NFSD_TRACE_PROC_RES_ASSIGNMENTS(rqstp, status) =20 __entry->opnum =3D opnum; ), --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 DD24627F72B; Sat, 3 May 2025 19:59:43 +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=1746302385; cv=none; b=gH6QmdhajTgE6TBHK9tmH/Oa912zz3FdNuWBGYDNdaJGvcZOR/uRODCXOCiziNpbRTomK7ntkt1p+bk0gRhQJso3OpLBJrYj4XOF0slH5LTJEgg0wrFFErTHCFEA3rdBWRkAEj9plDSSVuykYHvqivtbPq25bnyOqyjzdv8Cfhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302385; c=relaxed/simple; bh=Y+vm8QBJf6x0L8SM/TRYAXig210shae3pkuCvvWKnRY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=phuB60c26xN1+/JPPwaiNa77lZfYvcE9zLXkGhLV0pzp1QRJPj5LWaob+IzMM0zkHFN7YYvVaO170AmgUGHxGrXQHQrZBLnSWU5aCKCTVKBLXUDWaTbO0nXcxeLew6APk8lVUHdzjPNIoe5TMBGSMI+CB6OcNMhI+x/HDs4OBwM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hEUxO0kr; 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="hEUxO0kr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8648AC4CEE9; Sat, 3 May 2025 19:59:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302383; bh=Y+vm8QBJf6x0L8SM/TRYAXig210shae3pkuCvvWKnRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEUxO0kreuKGo27Yqz0p0SQoxv0dMu4BpqQI7E0qE+Bvvt/B6E6WAjOOIevZL/QTx YIMoP7jtpJ40SvxKcQ3E8fFbC0NeccAn0eMq6/TONgUOY3H6rcBfYREr0BvOk0yCPd 5Xhs6VSZa3fdPZRINIVevJrFh8ggrGIKudKMm8pxNGmchztISfxkxhSbCPyXPKb7xZ 9GD369RaQizX1mC2YdBsHfq83pgDP0KD7+Q+7103gm+nkdSpf0z1TEAIs4d7QGfFBr X5MbMRP5rxHzgVEaoWNJ12TPAAVQWQX187Q+eQeJbYu4iPcPGv5LI1y2m/g4AtMnj5 KkOICk1vNAdhw== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , , Chuck Lever Subject: [PATCH v4 02/18] NFSD: Add a Call equivalent to the NFSD_TRACE_PROC_RES macros Date: Sat, 3 May 2025 15:59:20 -0400 Message-ID: <20250503195936.5083-3-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chuck Lever Introduce tracing helpers that can be used before the procedure status code is known. These macros are similar to the SVC_RQST_ENDPOINT helpers, but they can be modified to include NFS-specific fields if that is needed later. Signed-off-by: Chuck Lever Reviewed-by: Jeff Layton --- fs/nfsd/trace.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index f67ab3d1b506..fc373c4d5fdd 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -18,6 +18,23 @@ #include "nfsfh.h" #include "xdr4.h" =20 +#define NFSD_TRACE_PROC_CALL_FIELDS(r) \ + __field(unsigned int, netns_ino) \ + __field(u32, xid) \ + __sockaddr(server, (r)->rq_xprt->xpt_locallen) \ + __sockaddr(client, (r)->rq_xprt->xpt_remotelen) + +#define NFSD_TRACE_PROC_CALL_ASSIGNMENTS(r) \ + do { \ + struct svc_xprt *xprt =3D (r)->rq_xprt; \ + __entry->netns_ino =3D SVC_NET(r)->ns.inum; \ + __entry->xid =3D be32_to_cpu((r)->rq_xid); \ + __assign_sockaddr(server, &xprt->xpt_local, \ + xprt->xpt_locallen); \ + __assign_sockaddr(client, &xprt->xpt_remote, \ + xprt->xpt_remotelen); \ + } while (0) + #define NFSD_TRACE_PROC_RES_FIELDS(r) \ __field(unsigned int, netns_ino) \ __field(u32, xid) \ --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 B3E2F27F745; Sat, 3 May 2025 19:59:44 +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=1746302385; cv=none; b=KLOxK0VxldF1Xy1xTtcq79AKznHPu7nts/ogR5lhB//J9NE2VZdQ3HmOwXJV26Czff4K28FsBUVwoCbQ2mbQDmjsLzzuxbw/l4zwmxtduZ5iTSPYMGWa10hTYbF+lH1nPEW8MzpsDp/Gr9+5vWCKOGQLFFWoQrcnP3j6ZKno/q4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302385; c=relaxed/simple; bh=mA6jQwvjY/Md2m6fWa8ZHdJ64DCSmyrszl57vuZvK2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yniwpv5X6X7PRvkRUH4K2HIV8Bkg++nbcpLGApNu6voH5K6uFDl9U05teGxINyzBG2i5Y8aJ2ry05tj9moZ7cSiRfsfn5KyEFVNMv0h4tYJPxO4cjm9hYxW+ZYH9BQOh1q8RkSmMsKAQDlYBwRZGvTBFXz95KRUMX6MfA5WwjKY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uynP6bD/; 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="uynP6bD/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83A64C4CEF2; Sat, 3 May 2025 19:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302384; bh=mA6jQwvjY/Md2m6fWa8ZHdJ64DCSmyrszl57vuZvK2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uynP6bD/0n74uEJT2kZbSzSO2E1PBXvjMn7JuCZ4IDaitR3dqaRaKOARGJEXPl5Dk QeSr3o9clHjv/o/I7C47D5nqVVcN5PT62bQT9Wv4uL3sCj+faUkmxLL5E3ReWEUaw9 gtI2zAXa3MIhkAarDEn4LHxyRkhmywjnj/l1/WyuntgH0cFJu2nOp5dfd5QCzMUI0M F0uYjfMAGTGJ+DOaeKzGG3kRY+Gh0z+CTLMv/lPUx4rupt6NfHxkCP5oo4plVW1lod Fc63QmbYeamLHOzcV9ja//86+VjJCS8Vcb8iz6V+VvUk0YE7k+rqyyA7uz3JcTiddq 5BMFUrh5Qt5lA== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 03/18] nfsd: add a tracepoint for nfsd_setattr Date: Sat, 3 May 2025 15:59:21 -0400 Message-ID: <20250503195936.5083-4-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Turn Sargun's internal kprobe based implementation of this into a normal static tracepoint. Also, remove the dprintk's that got added recently with the fix for zero-length ACLs. Cc: Sargun Dillon Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/trace.h | 39 +++++++++++++++++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ include/trace/misc/fs.h | 21 +++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index fc373c4d5fdd..b435276a1aaa 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include =20 @@ -2355,6 +2356,44 @@ DEFINE_EVENT(nfsd_copy_async_done_class, \ DEFINE_COPY_ASYNC_DONE_EVENT(done); DEFINE_COPY_ASYNC_DONE_EVENT(cancel); =20 +TRACE_EVENT(nfsd_vfs_setattr, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp, + const struct iattr *iap, + const struct timespec64 *guardtime + ), + TP_ARGS(rqstp, fhp, iap, guardtime), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + __field(s64, gtime_tv_sec) + __field(u32, gtime_tv_nsec) + __field(unsigned int, ia_valid) + __field(loff_t, ia_size) + __field(uid_t, ia_uid) + __field(gid_t, ia_gid) + __field(umode_t, ia_mode) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + __entry->gtime_tv_sec =3D guardtime ? guardtime->tv_sec : 0; + __entry->gtime_tv_nsec =3D guardtime ? guardtime->tv_nsec : 0; + __entry->ia_valid =3D iap->ia_valid; + __entry->ia_size =3D iap->ia_size; + __entry->ia_uid =3D __kuid_val(iap->ia_uid); + __entry->ia_gid =3D __kgid_val(iap->ia_gid); + __entry->ia_mode =3D iap->ia_mode; + ), + TP_printk( + "xid=3D0x%08x fh_hash=3D0x%08x ia_valid=3D%s ia_size=3D%llu ia_mode=3D0%= o ia_uid=3D%u ia_gid=3D%u guard_time=3D%lld.%u", + __entry->xid, __entry->fh_hash, show_ia_valid_flags(__entry->ia_valid), + __entry->ia_size, __entry->ia_mode, __entry->ia_uid, __entry->ia_gid, + __entry->gtime_tv_sec, __entry->gtime_tv_nsec + ) +) + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 68f7d0094b06..9e0a858d2129 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -501,6 +501,8 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, bool size_change =3D (iap->ia_valid & ATTR_SIZE); int retries; =20 + trace_nfsd_vfs_setattr(rqstp, fhp, iap, guardtime); + if (iap->ia_valid & ATTR_SIZE) { accmode |=3D NFSD_MAY_WRITE|NFSD_MAY_OWNER_OVERRIDE; ftype =3D S_IFREG; diff --git a/include/trace/misc/fs.h b/include/trace/misc/fs.h index 738b97f22f36..0406ebe2a80a 100644 --- a/include/trace/misc/fs.h +++ b/include/trace/misc/fs.h @@ -120,3 +120,24 @@ { LOOKUP_BENEATH, "BENEATH" }, \ { LOOKUP_IN_ROOT, "IN_ROOT" }, \ { LOOKUP_CACHED, "CACHED" }) + +#define show_ia_valid_flags(flags) \ + __print_flags(flags, "|", \ + { ATTR_MODE, "MODE" }, \ + { ATTR_UID, "UID" }, \ + { ATTR_GID, "GID" }, \ + { ATTR_SIZE, "SIZE" }, \ + { ATTR_ATIME, "ATIME" }, \ + { ATTR_MTIME, "MTIME" }, \ + { ATTR_CTIME, "CTIME" }, \ + { ATTR_ATIME_SET, "ATIME_SET" }, \ + { ATTR_MTIME_SET, "MTIME_SET" }, \ + { ATTR_FORCE, "FORCE" }, \ + { ATTR_KILL_SUID, "KILL_SUID" }, \ + { ATTR_KILL_SGID, "KILL_SGID" }, \ + { ATTR_FILE, "FILE" }, \ + { ATTR_KILL_PRIV, "KILL_PRIV" }, \ + { ATTR_OPEN, "OPEN" }, \ + { ATTR_TIMES_SET, "TIMES_SET" }, \ + { ATTR_TOUCH, "TOUCH"}, \ + { ATTR_DELEG, "DELEG"}) --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 B3DC927F744; Sat, 3 May 2025 19:59:45 +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=1746302385; cv=none; b=hYhcWCBhwiltVZIW4HxWUtkpuPXm/kOOY0Y5O4cY641Ted7LXHANJBTdDaIk61tpHNondPPuQGlCHBxVfb2Z77+/NCSCZoiyuQCyXJb0VSj9uv5O42JwQicAhb+Mewf6VQw19wNPACBM4OCrGa9QicMgtI/RbZv3cN1bKYEAfCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302385; c=relaxed/simple; bh=eIdlLrqSSEsRlrpUoIgud3gIcOveQpIm5RZIgyAET9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ler3WGLqzKYvKjbbC8Su2lRXIOOsiGe1l4onSc/k7EIbKxGdJrAfWNeJJF5qIAkJY0Owoj5efv1KdKeb/H5JFPYg0mRcOAZNHzjXrZat19lbqoH2KNt2c9NDq4k3YKUhErgL6hjXYfBh5OFGT3fNX5jMJ0b2vOGAFuNmKuqm6KM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HFe/Am74; 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="HFe/Am74" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 725EFC4CEEF; Sat, 3 May 2025 19:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302385; bh=eIdlLrqSSEsRlrpUoIgud3gIcOveQpIm5RZIgyAET9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFe/Am748jdfaf6bPYLwB9lM2JKNMYoUjWaIHhDsfOB0V3wuAPbC7gRK6lr7jjIPX 7SBS5cWVJzqvGpNEScdvBDE9t8kytqT7C6vEQmCovqqn2E66MA6jlgOVr22lbYwTrg xtMvmf+VITgrJ91FaBvXp1aAJAhvhdNvG8FM8wstYChJzeN89B5bFXGsP9W3eWEsEc mW52DIZzjNcaXwjiPpTCsEkZII3GbLT8+B2KRC11eahCkwB6aSGl7dI65vxtYL5TU0 G7FWt0IWmXN1h//f9tsVId7SU1NO2UZXxIrsStQ/nVCK898eRm21CSSq4HtUZ2xj3w 19EANFvDsuMmA== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 04/18] nfsd: add a tracepoint to nfsd_lookup_dentry Date: Sat, 3 May 2025 15:59:22 -0400 Message-ID: <20250503195936.5083-5-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Replace the dprintk in nfsd_lookup_dentry() with a trace point. nfsd_lookup_dentry() is called frequently enough that enabling this dprintk call site would result in log floods and performance issues. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/trace.h | 23 +++++++++++++++++++++++ fs/nfsd/vfs.c | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index b435276a1aaa..661a870d62f5 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2394,6 +2394,29 @@ TRACE_EVENT(nfsd_vfs_setattr, ) ) =20 +TRACE_EVENT(nfsd_vfs_lookup, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp, + const char *name, + unsigned int len + ), + TP_ARGS(rqstp, fhp, name, len), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + __string_len(name, name, len) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + __assign_str(name); + ), + TP_printk("xid=3D0x%08x fh_hash=3D0x%08x name=3D%s", + __entry->xid, __entry->fh_hash, __get_str(name) + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 9e0a858d2129..657ba0c2da14 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -246,7 +246,7 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_f= h *fhp, struct dentry *dentry; int host_err; =20 - dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name); + trace_nfsd_vfs_lookup(rqstp, fhp, name, len); =20 dparent =3D fhp->fh_dentry; exp =3D exp_get(fhp->fh_export); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 3864327F758; Sat, 3 May 2025 19:59:46 +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=1746302386; cv=none; b=VMLDCNPBY1CEDoWsjpCuI/r68BNYcHo8+fjbruEFpZ2foJR3ZJMC+KY39DZdovT6kpeG3nu3T0JDe7/W5dkGRyW2eqkx2iSzVxCo4yoB4Xkrj6BeUMNmuTD34BEeUkPHZk9Kv85lgV5OadC6QG+gYvvWU5HyqOOdKDj8R7zwexA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302386; c=relaxed/simple; bh=GHYXZ2zNLrHq5EDH4LC00uVoAyQfqhDn50Mif6crpQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gJ9wFo0lllb76DrmwrKPtgkPpxnayQQAjVeLtk/owljuXwSHcKVtLFLuxLmTmUlQXis8BC5+1rr3TvvBCJjTbGkGL0PgLsqai5TlfhVTLpeyMM8F+81EEssdw39WlTZbB5+RZ1eLoSViEjcn4qlL07MIf7CKT9H606NopioBjyg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=chE3djJj; 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="chE3djJj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E1D3C4CEE9; Sat, 3 May 2025 19:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302386; bh=GHYXZ2zNLrHq5EDH4LC00uVoAyQfqhDn50Mif6crpQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=chE3djJjMc7FW6JH8Zse+2CFV7jYRbD0ZhQQwFMqi6gfruOolrUFskDMvmCA+2KvH wpx0LRvpmrUNg+DzNW0t6Q3a9c2yKq6SGZeSDkROP5MYNLZSoErzT7WpvDuP3psdHH zwVK9TYf03uLqhMncb8gxva9EbZBf8HQcti5ngyaSUKWKdsEBWIMnaYmCt5lcShbtB VO1vZ6EJVLFwmFsXNp3zPt6BPHh1h4oqgunWsF+nIENn5efcY+LvS7LXkcZhus/pYh VB80mOEuT9GsPfXxxowy1IquA1ncZiBkdAXfdggnJuYy0g+/H/yyBuyqB26HTDI3SY Rh2ZpmOofLK+A== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 05/18] nfsd: add nfsd_vfs_create tracepoints Date: Sat, 3 May 2025 15:59:23 -0400 Message-ID: <20250503195936.5083-6-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observe the start of file and directory creation for all NFS versions. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 3 +++ fs/nfsd/trace.h | 27 +++++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ 3 files changed, 32 insertions(+) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 372bdcf5e07a..5d2b081072e8 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -14,6 +14,7 @@ #include "xdr3.h" #include "vfs.h" #include "filecache.h" +#include "trace.h" =20 #define NFSDDBG_FACILITY NFSDDBG_PROC =20 @@ -266,6 +267,8 @@ nfsd3_create_file(struct svc_rqst *rqstp, struct svc_fh= *fhp, __be32 status; int host_err; =20 + trace_nfsd_vfs_create(rqstp, fhp, S_IFREG, argp->name, argp->len); + if (isdotent(argp->name, argp->len)) return nfserr_exist; if (!(iap->ia_valid & ATTR_MODE)) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 661a870d62f5..a71d605fd7b7 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2417,6 +2417,33 @@ TRACE_EVENT(nfsd_vfs_lookup, ) ); =20 +TRACE_EVENT(nfsd_vfs_create, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp, + umode_t type, + const char *name, + unsigned int len + ), + TP_ARGS(rqstp, fhp, type, name, len), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + __field(umode_t, type) + __string_len(name, name, len) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + __entry->type =3D type; + __assign_str(name); + ), + TP_printk("xid=3D0x%08x fh_hash=3D0x%08x type=3D%s name=3D%s", + __entry->xid, __entry->fh_hash, + show_fs_file_type(__entry->type), __get_str(name) + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 657ba0c2da14..cc0efc47dc25 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1549,6 +1549,8 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fh= p, __be32 err; int host_err; =20 + trace_nfsd_vfs_create(rqstp, fhp, type, fname, flen); + if (isdotent(fname, flen)) return nfserr_exist; =20 --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 7610027FD5F; Sat, 3 May 2025 19:59:47 +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=1746302387; cv=none; b=FKw1uZa1OtR4gOue0Viq2IWOtJl8DSH9JPd4GvypzAcoAlXzckjUc1w1vwQqSubxfEnjPdq/dka2Kc3H206d97sp4nVOHBKYQ9yotkWVeEFkT/8dx/L4shst64aMzzvPNk23kPYkQTrtttByPJJq70NOpTJmEGy+G0Rs9/sSisk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302387; c=relaxed/simple; bh=Vd2V3yfktUNBWMDsQz5uQy2iqf4emXYgrGKyd09ytSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cYiW3QP8kpjtQxt2QQ9He9lDS8pudLDCZOAiBH/kMBRH9DtFP806F6ImEUanjgolFrh2aRUIKLIDXeop51WmBIOSDfN5506JhdnTElrlS9dkJKTqJPaz+irvlgKbdPCO9A2ub/5WSYufmDHfZ8qWPEJQIrF57A4cAspNk9RbSHs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MRSDwr1P; 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="MRSDwr1P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A810C4CEEE; Sat, 3 May 2025 19:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302387; bh=Vd2V3yfktUNBWMDsQz5uQy2iqf4emXYgrGKyd09ytSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MRSDwr1P6HRV8UoA5bBkwJkVnqohjGUAVqbxtzRBr1V/EYtV/29Baprq4UCsO3gwE 0uMJLvnml29hvTfTWybHmk5+idaD9BzFYtrFGG36PR+Ci7P8+MHDcOSeyoha5fra6X FE9pvgPBo3GPWlwMloft4mpL1SFEdBNos7+nsyEVxgWDsqFqKy2L3pBsE5dW8xHELh B5c/C8fi0Z/obEXfheJ6QXtq1Xm9SFbzEtcfuS/5U3wjuZkllhF7bAtNEn8sKC3Z9l Qx7vlY9fP4T25Qh1WPCNjzqjx0Y3PgMuhI8WvI8oXFszrKfg0pffC2dJiWLDe34WcM 7cjr21xS+54Og== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 06/18] nfsd: add tracepoint to nfsd_symlink Date: Sat, 3 May 2025 15:59:24 -0400 Message-ID: <20250503195936.5083-7-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observe the start of SYMLINK operations for all NFS versions. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/trace.h | 27 +++++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ 2 files changed, 29 insertions(+) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index a71d605fd7b7..e347cdaaa732 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2444,6 +2444,33 @@ TRACE_EVENT(nfsd_vfs_create, ) ); =20 +TRACE_EVENT(nfsd_vfs_symlink, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp, + const char *name, + unsigned int namelen, + const char *target + ), + TP_ARGS(rqstp, fhp, name, namelen, target), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + __string_len(name, name, namelen) + __string(target, target) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + __assign_str(name); + __assign_str(target); + ), + TP_printk("xid=3D0x%08x fh_hash=3D0x%08x name=3D%s target=3D%s", + __entry->xid, __entry->fh_hash, + __get_str(name), __get_str(target) + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index cc0efc47dc25..ecd453b260b6 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1651,6 +1651,8 @@ nfsd_symlink(struct svc_rqst *rqstp, struct svc_fh *f= hp, __be32 err, cerr; int host_err; =20 + trace_nfsd_vfs_symlink(rqstp, fhp, fname, flen, path); + err =3D nfserr_noent; if (!flen || path[0] =3D=3D '\0') goto out; --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 7B9EA280333; Sat, 3 May 2025 19:59:48 +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=1746302388; cv=none; b=DBBt9QOtiiuyW6v7/ZlXovw+x1sWqU9nKVhzy+qpXcSZAdfMvOs0QYxKkBX0X0UrrBwpKvCuTFwPo/jad1xNhXH6EGoDc7DtCGjjCKp3qk8CduoFg6JPfKuAywGusMgZmvEDqrYre91vqun6CqQUw8bErCj6eEVkOYXs5wNJ0kA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302388; c=relaxed/simple; bh=u8MwXtZfnrSUjQkKdU1yXQ7CiwJtv2xi+V8+9cmp40Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P/XzIw/d5mSHQgivOKpDV7dlLAf0eGFMwcdI36TFWOfYpZjYaE642oBdgN+DyYmg15hfkDmHNGvg6U2CiqoCY0EZRo1BWJJ/RTInMjW7tNMhOchdbG5dH5iWzNpK3me8Z/0dbrq0ZIb/+mcYBszjPDluhNzYSykVjqWbf1REELE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EH4Uj/mJ; 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="EH4Uj/mJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 360F5C4CEE3; Sat, 3 May 2025 19:59:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302387; bh=u8MwXtZfnrSUjQkKdU1yXQ7CiwJtv2xi+V8+9cmp40Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EH4Uj/mJvcs7VuKi2TU00jSH1vyozPpCACpEQiBrxsXyOnDctbSQKlZ50oMB0i3b+ sFsT0lVRrGpW3BgUPBI7CrVzMeDoMDvnB9n/M48+pcaxYJaciXX57Mo0V+mR6mYDjX 8I67nk3Ai2td8gaZ199vsm8malM1FSvpi/Jd1f5TzKM59Zxcd2SImEhnUMdC3HzugE dz8+wSpQzDHNRe2tfAGeVPiUWkYp4E+Y64W3bi0+zfZNfaOUQJEGOKltFgyc/BCV9o AlgwU/x9bkN4wIcOmhyzaVCm4C2vKkw7s47WHyq748Zq9y8KSkXxHEOM3G+gBq8q/L iDc07OeZ8Ubvw== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 07/18] nfsd: add tracepoint to nfsd_link() Date: Sat, 3 May 2025 15:59:25 -0400 Message-ID: <20250503195936.5083-8-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/trace.h | 27 +++++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ 2 files changed, 29 insertions(+) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index e347cdaaa732..acbf94cfb720 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2471,6 +2471,33 @@ TRACE_EVENT(nfsd_vfs_symlink, ) ); =20 +TRACE_EVENT(nfsd_vfs_link, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *sfhp, + const struct svc_fh *tfhp, + const char *name, + unsigned int namelen + ), + TP_ARGS(rqstp, sfhp, tfhp, name, namelen), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, sfh_hash) + __field(u32, tfh_hash) + __string_len(name, name, namelen) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->sfh_hash =3D knfsd_fh_hash(&sfhp->fh_handle); + __entry->tfh_hash =3D knfsd_fh_hash(&tfhp->fh_handle); + __assign_str(name); + ), + TP_printk("xid=3D0x%08x src_fh=3D0x%08x tgt_fh=3D0x%08x name=3D%s", + __entry->xid, __entry->sfh_hash, __entry->tfh_hash, + __get_str(name) + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index ecd453b260b6..30702f36db98 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1721,6 +1721,8 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, __be32 err; int host_err; =20 + trace_nfsd_vfs_link(rqstp, ffhp, tfhp, name, len); + err =3D fh_verify(rqstp, ffhp, S_IFDIR, NFSD_MAY_CREATE); if (err) goto out; --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 6FAF2280A52; Sat, 3 May 2025 19:59:48 +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=1746302389; cv=none; b=Yg/9OnOSadQveCwNVDqBURGcUys8i05v170i0zaPkiHtHtDbVNrsT6/O2EqU7HdeNImBL467wLM6Y7E5eNOwFgnY8vXfQrKI6o4PrLEy88PrLqkfFhUhKD6ByzIu/xexXy+jfmBb8tQCe6/H44MF7d2l+LAHfEnRKmmy1L5mV1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302389; c=relaxed/simple; bh=gSwF/HPRk47C+RY/8Zzaq52Y/XzIPBLZGy7m330tfxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VqPDUSsv0vWfHW9oYYUU4vWs3415eH/yWsl/0jJSD0Dv6iyo+86lv42aIfd9D+R8BQ1C0HM6u5Ht4blFWGBuHkhAESwFRM61NnxvLUR1fMqgIMYWSRbNhkoltAVL2/QfV+NoCUDxKQ4u5RAZK7Qy90ySiWyrVK3avaiuMNGvgXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eKKhCxsd; 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="eKKhCxsd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21615C4CEEE; Sat, 3 May 2025 19:59:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302388; bh=gSwF/HPRk47C+RY/8Zzaq52Y/XzIPBLZGy7m330tfxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eKKhCxsdQSTMAq8fwZPMhpP/NpBDpGu7PiOmZHDB7g8o3Kv84/i3K+m9JfSANixII a5ldd4N4Pno+8L6tKKppDkRN/gcjTmR1EPvdMsqyOq4oWwC8M/Oi1QM8qEMCGKklNJ N2gkZrQO4ahwS2gi/mAOEk7xNU7xr+Qk/iVMrhdbJbHXEf1JxU6rCu4znmZiQpndto EnN+UepjrceCt1hvIBwX3TMCh76pVuZQaS1hWwFiepVwS4lLsFNDaoYg2Z9UHP2+x5 Q6G9rvo4jKGULkgxoFDP9tf41v+TlImKvP+LieNhbpXswzYKJpCYf3wL2Vg0IhrN+8 faEuRya0HZdZA== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 08/18] nfsd: add tracepoints for unlink events Date: Sat, 3 May 2025 15:59:26 -0400 Message-ID: <20250503195936.5083-9-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observe the start of UNLINK, REMOVE, and RMDIR operations for all NFS versions. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/trace.h | 24 ++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ 2 files changed, 26 insertions(+) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index acbf94cfb720..e96585546d01 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2498,6 +2498,30 @@ TRACE_EVENT(nfsd_vfs_link, ) ); =20 +TRACE_EVENT(nfsd_vfs_unlink, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp, + const char *name, + unsigned int len + ), + TP_ARGS(rqstp, fhp, name, len), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + __string_len(name, name, len) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + __assign_str(name); + ), + TP_printk("xid=3D0x%08x fh_hash=3D0x%08x name=3D%s", + __entry->xid, __entry->fh_hash, + __get_str(name) + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 30702f36db98..820290e5328f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1998,6 +1998,8 @@ nfsd_unlink(struct svc_rqst *rqstp, struct svc_fh *fh= p, int type, __be32 err; int host_err; =20 + trace_nfsd_vfs_unlink(rqstp, fhp, fname, flen); + err =3D nfserr_acces; if (!flen || isdotent(fname, flen)) goto out; --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 457EE280CE7; Sat, 3 May 2025 19:59:49 +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=1746302390; cv=none; b=QkkcCj0QEt3HUswFL0oVBnqxAbGx0Ug3Or66a/TYIQOFUrdacGC7t20H1y+eeTOWT1x4hiT863PpgEbI4Xn4/ge6utpKCSKrqFXWoXmzKo/Fevr8hUzAuBdbwQk6coNRqOcObOY9A4kHasSN5/HUcH/Xh2Y85CUPConMDG9LwSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302390; c=relaxed/simple; bh=KMY3BOjFTILPTpVm7oEa9ID80RUxMf6Ju5Mms7cyin8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fa7FR4VIrPjoFOi5q9nmHC06a96q2RkgaeMGdPUVxOtSjk8CcZN+BrI7LWIb/0L/gDtnaXoTN6SIxRuud+BHhhW+ob+Gzv9KFdj262eth8T3rdHAmyvVxv3YnKpyvCmL5wtXGh/BsjGUPPMc1T4wvefIJ4VH16JbGM48Uo89zvc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BLYSPmWd; 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="BLYSPmWd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13C0BC4CEE9; Sat, 3 May 2025 19:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302389; bh=KMY3BOjFTILPTpVm7oEa9ID80RUxMf6Ju5Mms7cyin8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BLYSPmWdg/uvfmuP9RKAnLUn2WzU4kZQCZzu5kvFLczp2q9CdM0mDlPYLJ0KObu1B HoVMFwz8wChYfP71NIxYsKsc0gcXxwdMiIfZO8eGlEgZ0rO56xWnbpb4Q52CzWQNnF DJdjYpollelvccFDnhJPfXdfMUCo5olJkO3+RehIfxoVcdNP/oZ8gr5mXbY+/3QxD3 CbSyQjy6riyKbZ2+nMAwe5X4u2N5M8eUPtn6o7Vy1axd1dAeM3ttbAQ1O2wFIJrbkv /aQlEw3knLarWGd6bXeS3LNsDl9hZwdvJ3KsbEaLnVhcKu2V8B8WWkxCl9ySxI815n NLFOnjsgQN2kQ== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 09/18] nfsd: add tracepoint to nfsd_rename Date: Sat, 3 May 2025 15:59:27 -0400 Message-ID: <20250503195936.5083-10-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observe the start of RENAME operations for all NFS versions. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/trace.h | 31 +++++++++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ 2 files changed, 33 insertions(+) diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index e96585546d01..46091d7f2260 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2522,6 +2522,37 @@ TRACE_EVENT(nfsd_vfs_unlink, ) ); =20 +TRACE_EVENT(nfsd_vfs_rename, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *sfhp, + const struct svc_fh *tfhp, + const char *source, + unsigned int sourcelen, + const char *target, + unsigned int targetlen + ), + TP_ARGS(rqstp, sfhp, tfhp, source, sourcelen, target, targetlen), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, sfh_hash) + __field(u32, tfh_hash) + __string_len(source, source, sourcelen) + __string_len(target, target, targetlen) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->sfh_hash =3D knfsd_fh_hash(&sfhp->fh_handle); + __entry->tfh_hash =3D knfsd_fh_hash(&tfhp->fh_handle); + __assign_str(source); + __assign_str(target); + ), + TP_printk("xid=3D0x%08x sfh_hash=3D0x%08x tfh_hash=3D0x%08x source=3D%s t= arget=3D%s", + __entry->xid, __entry->sfh_hash, __entry->tfh_hash, + __get_str(source), __get_str(target) + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 820290e5328f..41314b2a8199 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1840,6 +1840,8 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ff= hp, char *fname, int flen, int host_err; bool close_cached =3D false; =20 + trace_nfsd_vfs_rename(rqstp, ffhp, tfhp, fname, flen, tname, tlen); + err =3D fh_verify(rqstp, ffhp, S_IFDIR, NFSD_MAY_REMOVE); if (err) goto out; --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 D146928134F; Sat, 3 May 2025 19:59:50 +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=1746302390; cv=none; b=J8KD0IiRxTnNjhnnAot2mjNgtRsC55MjUac6jE+VLPbDfJex9Cz4RSHa5Ap/7mASflviYOzHCGuVfN+05hPiyyU8Q1eg4e83DbqehSxNRDf/f7T1zqYuBqxh7aXOS2VPvXt1GxU/rzLSP6E4HJLHbSnHhIeKUA4AttwG4Vsd0oQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302390; c=relaxed/simple; bh=03R75VgnpBb44xGfvLWBoDvFeCj07/E0MngEVFGpsRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FtIaVcXdT8oEHvwpdllM2gc+fs35cByL75ZG+i/EDM19GwxokR9wUkD5ys5rJRlQ9bkE9+uyOes0Ok+6q0q6i9z8tFcdenqr/dM7vdvMdxBXdhcSpE661dEkWi23+hEepOyr9jY6M8Uxf6wWlzLM0hGg9BCOBmiB8o7PJoCVu3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SXE1ovg7; 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="SXE1ovg7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02543C4CEEE; Sat, 3 May 2025 19:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302390; bh=03R75VgnpBb44xGfvLWBoDvFeCj07/E0MngEVFGpsRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SXE1ovg7TpY8BqMQ0mV4mSC4e4KL9VBphKiFA2hxoLRhu6SRYu8EbXVwTBPoKWGHz JNuYJp9aSNEXNFCH42GyIix4uG8eHaqG1s9N4c6cLY2NGzsInrdCw+oXFtWmSJLnrK An0o453i7+BQMP5BM4abSYRvUsad8krX55WDIgt8NneFQhhrsL+CbHEoIZA+PyvpoC sb8i9LoSpeGfCqwcKXd4FnWbkKBwP5aoLunHJSadvg1T+HiOeX0sWlo6pov+Vp8XY6 GuMRd1JX10zSUd3es2saqs5yTnFFyuevOIidoRCJtf1RQSqTTRtSki8tozRxF/LHcl /C2/feFvUScmA== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 10/18] nfsd: add tracepoint to nfsd_readdir Date: Sat, 3 May 2025 15:59:28 -0400 Message-ID: <20250503195936.5083-11-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observe the start of NFS READDIR operations. The NFS READDIR's count argument can be interesting when tuning a client's readdir behavior. However, the count argument is not passed to nfsd_readdir(). To properly capture the count argument, this tracepoint must appear in each proc function before the nfsd_readdir() call. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 2 ++ fs/nfsd/nfs4proc.c | 3 +++ fs/nfsd/nfsproc.c | 2 ++ fs/nfsd/trace.h | 26 ++++++++++++++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 5d2b081072e8..80096a5c4865 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -625,6 +625,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp) dprintk("nfsd: READDIR(3) %s %d bytes at %d\n", SVCFH_fmt(&argp->fh), argp->count, (u32) argp->cookie); + trace_nfsd_vfs_readdir(rqstp, &argp->fh, argp->count, argp->cookie); =20 nfsd3_init_dirlist_pages(rqstp, resp, argp->count); =20 @@ -659,6 +660,7 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp) dprintk("nfsd: READDIR+(3) %s %d bytes at %d\n", SVCFH_fmt(&argp->fh), argp->count, (u32) argp->cookie); + trace_nfsd_vfs_readdir(rqstp, &argp->fh, argp->count, argp->cookie); =20 nfsd3_init_dirlist_pages(rqstp, resp, argp->count); =20 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 77895e099673..483fd8b26f9d 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -998,6 +998,9 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_comp= ound_state *cstate, u64 cookie =3D readdir->rd_cookie; static const nfs4_verifier zeroverf; =20 + trace_nfsd_vfs_readdir(rqstp, &cstate->current_fh, + readdir->rd_maxcount, readdir->rd_cookie); + /* no need to check permission - this will be done in nfsd_readdir() */ =20 if (readdir->rd_bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1) diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 6dda081eb24c..c561af30c37a 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -10,6 +10,7 @@ #include "cache.h" #include "xdr.h" #include "vfs.h" +#include "trace.h" =20 #define NFSDDBG_FACILITY NFSDDBG_PROC =20 @@ -618,6 +619,7 @@ nfsd_proc_readdir(struct svc_rqst *rqstp) dprintk("nfsd: READDIR %s %d bytes at %d\n", SVCFH_fmt(&argp->fh), =09 argp->count, argp->cookie); + trace_nfsd_vfs_readdir(rqstp, &argp->fh, argp->count, argp->cookie); =20 nfsd_init_dirlist_pages(rqstp, resp, argp->count); =20 diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 46091d7f2260..bed58cf55c10 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2553,6 +2553,32 @@ TRACE_EVENT(nfsd_vfs_rename, ) ); =20 +TRACE_EVENT(nfsd_vfs_readdir, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp, + u32 count, + u64 offset + ), + TP_ARGS(rqstp, fhp, count, offset), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + __field(u32, count) + __field(u64, offset) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + __entry->count =3D count; + __entry->offset =3D offset; + ), + TP_printk("xid=3D0x%08x fh_hash=3D0x%08x offset=3D%llu count=3D%u", + __entry->xid, __entry->fh_hash, + __entry->offset, __entry->count + ) +); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 5D2E128150F; Sat, 3 May 2025 19:59:51 +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=1746302392; cv=none; b=rK1rze82t4rI6OnCgBgB94eiJFwxPGmQS7mhKcFeqxLMXaNcEe7VAPQl1OdejgS61nyOQe2bmLXhHOn9f8QAxfEnI0D09EjKQ2+3oAwK8lKVH0eIOhBF7w8s3ybZOODEWifUwKtXKoM9lNtoXQzDBNEEQ4s+VMBquPooL+2aoYM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302392; c=relaxed/simple; bh=ZKs0bRbmtNComB3idWcyiEEWtYkgrA5qtpbBITjrpuA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TpYcpcwMn/pQIK2RsHxUlwrnX6Mq3DSP9mx5azeR2I7LwyvIHQUnsnBQPT+PUufYg7JnxRiuaREkGR998KkiPX9n1QZThIDyfrE/mDhu11W/jduW/CsfQ9I6HSbA211jPQS094o+qiwNowS28T1wL8MAcUhG9qMri6K6SBtoSDE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l5Bmxx3V; 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="l5Bmxx3V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E51F4C4CEF1; Sat, 3 May 2025 19:59:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302391; bh=ZKs0bRbmtNComB3idWcyiEEWtYkgrA5qtpbBITjrpuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l5Bmxx3VSgNxEdpLmMUkQqE8BNzTN1GL4eCRr8wmjhohbuliOnbVEymzbDXT2U64J +IoWds50gO+J1oVaarNg7FX3+Og7iWFRwaRTstGBf3HLr9+iIHbPWhxqV8XTzTo3XU zBg5KnVYEyMl6L2tD1Va+kVSnhUQq28aIajN3pFXxjuEePx2/7VWuORUoa3KHBZSGB 01LQjUScTOlRQOip9NS5Kebv4BY/mi23EMilofmmhlbhurVOw0L73ajF/DPEhhaeeB qjWt76NyTrLPjqXFZFJHmSNg866vPFgKbfvwJw/gol2Tn3vgiqXN7mSonPLvza17/o xJahD0wGloSLg== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 11/18] nfsd: add tracepoint for getattr and statfs events Date: Sat, 3 May 2025 15:59:29 -0400 Message-ID: <20250503195936.5083-12-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton There isn't a common helper for getattrs, so add these into the protocol-specific helpers. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 2 ++ fs/nfsd/nfs4proc.c | 2 ++ fs/nfsd/nfsproc.c | 2 ++ fs/nfsd/trace.h | 30 ++++++++++++++++++++++++++++++ fs/nfsd/vfs.c | 2 ++ 5 files changed, 38 insertions(+) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 80096a5c4865..f6eb8331dc4b 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -70,6 +70,8 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp) struct nfsd_fhandle *argp =3D rqstp->rq_argp; struct nfsd3_attrstat *resp =3D rqstp->rq_resp; =20 + trace_nfsd_vfs_getattr(rqstp, &argp->fh); + dprintk("nfsd: GETATTR(3) %s\n", SVCFH_fmt(&argp->fh)); =20 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 483fd8b26f9d..2b16ee1ae461 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -876,6 +876,8 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_comp= ound_state *cstate, struct nfsd4_getattr *getattr =3D &u->getattr; __be32 status; =20 + trace_nfsd_vfs_getattr(rqstp, &cstate->current_fh); + status =3D fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP); if (status) return status; diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index c561af30c37a..8816cc565c0c 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -55,6 +55,8 @@ nfsd_proc_getattr(struct svc_rqst *rqstp) struct nfsd_fhandle *argp =3D rqstp->rq_argp; struct nfsd_attrstat *resp =3D rqstp->rq_resp; =20 + trace_nfsd_vfs_getattr(rqstp, &argp->fh); + dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); =20 fh_copy(&resp->fh, &argp->fh); diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index bed58cf55c10..3c5505ef5e3a 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2579,6 +2579,36 @@ TRACE_EVENT(nfsd_vfs_readdir, ) ); =20 +DECLARE_EVENT_CLASS(nfsd_vfs_getattr_class, + TP_PROTO( + const struct svc_rqst *rqstp, + const struct svc_fh *fhp + ), + TP_ARGS(rqstp, fhp), + TP_STRUCT__entry( + NFSD_TRACE_PROC_CALL_FIELDS(rqstp) + __field(u32, fh_hash) + ), + TP_fast_assign( + NFSD_TRACE_PROC_CALL_ASSIGNMENTS(rqstp); + __entry->fh_hash =3D knfsd_fh_hash(&fhp->fh_handle); + ), + TP_printk("xid=3D0x%08x fh_hash=3D0x%08x", + __entry->xid, __entry->fh_hash + ) +); + +#define DEFINE_NFSD_VFS_GETATTR_EVENT(__name) \ +DEFINE_EVENT(nfsd_vfs_getattr_class, __name, \ + TP_PROTO( \ + const struct svc_rqst *rqstp, \ + const struct svc_fh *fhp \ + ), \ + TP_ARGS(rqstp, fhp)) + +DEFINE_NFSD_VFS_GETATTR_EVENT(nfsd_vfs_getattr); +DEFINE_NFSD_VFS_GETATTR_EVENT(nfsd_vfs_statfs); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 41314b2a8199..d0dfd97de4d3 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -2290,6 +2290,8 @@ nfsd_statfs(struct svc_rqst *rqstp, struct svc_fh *fh= p, struct kstatfs *stat, in { __be32 err; =20 + trace_nfsd_vfs_statfs(rqstp, fhp); + err =3D fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP | access); if (!err) { struct path path =3D { --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 26313281530; Sat, 3 May 2025 19:59:52 +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=1746302393; cv=none; b=aX7nlEAY5sNclwGELAXK+40L3ZHlew0RAHc0ysd3oPUJ7/v1edvlQpvF16RlZsdKgfxw5452G9b2ThIOTHQ1KMejVIGoX77Vb+rGOMmS1EbZ+OJdCb/6ZXxw5eNRz4t4t/NSCUw8UwHVGxRyhybyjYIJuaW/kR0zEDEPJDlorIY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302393; c=relaxed/simple; bh=TVHo4Ecy++QVCQpnYiE4psmntUpTeyQ75KVVZClLUzw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OUaOImEI/ojtFK1UksR+ycQEJuYVwNUUdS5vR51xYUcef2b1mlUXTDMvUfLPJTueN0kKr0vdk4dZZoznk8YVn94fx1ds7nYYOxyLwUulGHKpr/Ps8WHZNJw+Qfj5RwL9jHuvOq+uTJq/znZGDJ0oJBQMaAFALmXERfZRTG4JCOk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gfRo2zBR; 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="gfRo2zBR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8E5AC4CEEF; Sat, 3 May 2025 19:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302392; bh=TVHo4Ecy++QVCQpnYiE4psmntUpTeyQ75KVVZClLUzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gfRo2zBRgJes8jqTLAuFuu2BUobMaNoh9dM0mwC3jP/8ANMolvc7b7edZ0moMNuee Ib/BPADMCBANV6d/ysYLMCehuVV8k/7D4mn4yC3TCVsEMgcaMcEHElRWk/p1xRwI1f R7FGnQ0aKfBoBaW5IBJrgxw1tS+5IWjXfow5GbhHkLDgloA5l3ZC6q9d7pYXk3G884 Hd/x5S9C0aYySIYQdoCyulcH7qwp2Vt/EVy8qhqjGv7L6cVwz/TSh2ShFdfbFJT8in ibo0fUdpKo8cpZ5z3Oz9ef4TGXyJKPNGb/5OXUCkZnkeg64UeEIeKgXU8AHbT6SZzy xyYb/vzcNofHA== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 12/18] nfsd: remove old v2/3 create path dprintks Date: Sat, 3 May 2025 15:59:30 -0400 Message-ID: <20250503195936.5083-13-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 15 --------------- fs/nfsd/nfsproc.c | 5 ----- 2 files changed, 20 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index f6eb8331dc4b..a4dd1f7c202f 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -385,11 +385,6 @@ nfsd3_proc_create(struct svc_rqst *rqstp) struct nfsd3_diropres *resp =3D rqstp->rq_resp; svc_fh *dirfhp, *newfhp; =20 - dprintk("nfsd: CREATE(3) %s %.*s\n", - SVCFH_fmt(&argp->fh), - argp->len, - argp->name); - dirfhp =3D fh_copy(&resp->dirfh, &argp->fh); newfhp =3D fh_init(&resp->fh, NFS3_FHSIZE); =20 @@ -410,11 +405,6 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp) .na_iattr =3D &argp->attrs, }; =20 - dprintk("nfsd: MKDIR(3) %s %.*s\n", - SVCFH_fmt(&argp->fh), - argp->len, - argp->name); - argp->attrs.ia_valid &=3D ~ATTR_SIZE; fh_copy(&resp->dirfh, &argp->fh); fh_init(&resp->fh, NFS3_FHSIZE); @@ -479,11 +469,6 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) int type; dev_t rdev =3D 0; =20 - dprintk("nfsd: MKNOD(3) %s %.*s\n", - SVCFH_fmt(&argp->fh), - argp->len, - argp->name); - fh_copy(&resp->dirfh, &argp->fh); fh_init(&resp->fh, NFS3_FHSIZE); =20 diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 8816cc565c0c..eec925d84410 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -295,9 +295,6 @@ nfsd_proc_create(struct svc_rqst *rqstp) int hosterr; dev_t rdev =3D 0, wanted =3D new_decode_dev(attr->ia_size); =20 - dprintk("nfsd: CREATE %s %.*s\n", - SVCFH_fmt(dirfhp), argp->len, argp->name); - /* First verify the parent file handle */ resp->status =3D fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_EXEC); if (resp->status !=3D nfs_ok) @@ -551,8 +548,6 @@ nfsd_proc_mkdir(struct svc_rqst *rqstp) .na_iattr =3D &argp->attrs, }; =20 - dprintk("nfsd: MKDIR %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp= ->name); - if (resp->fh.fh_dentry) { printk(KERN_WARNING "nfsd_proc_mkdir: response already verified??\n"); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 2179327EC64; Sat, 3 May 2025 19:59:53 +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=1746302394; cv=none; b=TAsMFJFDC2N2k2EN+G7WYqufkUPpW9Z8c3u+KU88lv9rw7fi2Fi8u3OybphY5O8Y2ix6/cft6/4H9/5K8bgxLe2xRVtlhApRFoyaQQPSIAT4PFOiWahGNQZD1hkDxI57iExSDYdkRmS7w+BhtR6LxTYLndFnAZ1xpVpgiqBrSB0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302394; c=relaxed/simple; bh=VFdE7daLYTIqpnRRpPG79EzLxFLGC+mrG75NvGdLqRQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TYVAH2+VkJrdTZBb4jtWrZ5ORHCnRd18GhebvNgzJNoF2OqbbVm1LjoMowFlG4oSOoNsf2csOZcPDFXk/v3ceVbBSLZXpe6cUWsOQHEllPIv98nYnCVGgH8jGC+wkiEOif07a6877+bsG//em2AdToCzwHujiEYZNDUivSm4gOU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pm88v6bw; 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="pm88v6bw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF32DC4CEF1; Sat, 3 May 2025 19:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302393; bh=VFdE7daLYTIqpnRRpPG79EzLxFLGC+mrG75NvGdLqRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pm88v6bw7MiYV57rLO15wyO10EbMVrIXRv82nJYbwzur+xgxPeAQJEDjPdG3SyelA CbAygPkV0CM+O3hcdOBXRlBCg3K+DRKwU1apQnWeP2D0dYZNTo85ALi55xbd/s6sEY al7hS3QWPO3v8Z0Lp8U++09lETRSp7LZPPlytuWES602DZbdBC+SPH5tir+s+YE7f4 zSpILJGdSIzKd7QJyEaS7d0qXOeMJWa/wc+cIICdpYtLMwikfGKOSaJfe8CZvT28FU AR4ZVkqqbQzfu0ULmyCsMLCxZGWNr99v33mjXkT2B1x+baWvbWii8y4dVOOs67BejE 2Zp2TkZs2xYAw== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 13/18] nfsd: remove old v2/3 SYMLINK dprintks Date: Sat, 3 May 2025 15:59:31 -0400 Message-ID: <20250503195936.5083-14-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 5 ----- fs/nfsd/nfsproc.c | 4 ---- 2 files changed, 9 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index a4dd1f7c202f..f207fba722eb 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -440,11 +440,6 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp) goto out; } =20 - dprintk("nfsd: SYMLINK(3) %s %.*s -> %.*s\n", - SVCFH_fmt(&argp->ffh), - argp->flen, argp->fname, - argp->tlen, argp->tname); - fh_copy(&resp->dirfh, &argp->ffh); fh_init(&resp->fh, NFS3_FHSIZE); resp->status =3D nfsd_symlink(rqstp, &resp->dirfh, argp->fname, diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index eec925d84410..a12ad08b000a 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -519,10 +519,6 @@ nfsd_proc_symlink(struct svc_rqst *rqstp) goto out; } =20 - dprintk("nfsd: SYMLINK %s %.*s -> %.*s\n", - SVCFH_fmt(&argp->ffh), argp->flen, argp->fname, - argp->tlen, argp->tname); - fh_init(&newfh, NFS_FHSIZE); resp->status =3D nfsd_symlink(rqstp, &argp->ffh, argp->fname, argp->flen, argp->tname, &attrs, &newfh); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 A2AF32820B8; Sat, 3 May 2025 19:59:54 +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=1746302394; cv=none; b=fyr7tcgqRnr5XQ/NOHQkNgt8/AWenK/bH8bck1HSXeekGMfGrzZb8I9SMtIo+jZiu+Zr+8wiQluReYuqFaBilUpZ7VpJKvvXJHS3bu7T7sVrkPcPLyYO0f3aBqnoJL6OxzF4EIBYxUuLhDpu9K8a1wmX7gBq9iUDi0Hs39jUt2c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302394; c=relaxed/simple; bh=hXJpa8SOENSd84UvNO/LlV+Wj+S1H3eee9wa5eQWBmM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q5qKG6l6r/nU9xpY1/F+CfVKT86DLiUc2WOz71+ZofGVseCydKXwJF7lXaCHb1Lczzv9G2+pY4wR7ITdQU1G249qjpqdFMvJn3BY8PVTyhxBbtQV70aSSmp0ezRE8NPgyyq160/gY6Eaev/HBnEWMtcbZzxqwBbumfV/ffPLiig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qakcm/7a; 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="Qakcm/7a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C291FC4CEEF; Sat, 3 May 2025 19:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302394; bh=hXJpa8SOENSd84UvNO/LlV+Wj+S1H3eee9wa5eQWBmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qakcm/7ap110weZv79I9oAWDD2FfDBoIJdGyACJEvXwM5a3ZdQH1rhSVN8t5Oq4yH XIZu4ceL3c729QGDBpp+0an/ZcLyvM1Dwht2oIhkr7VM6zBAs2bkOlyvHWxhUeEkbr 2SV/wl7u8YTgb1KhrE/h73A912CkU4Ss0sNqrn4qMLBByOySF2v+OcD3Wp7ouhmBT9 0u+45wfzQ++sFRPZM3AWFG+YSfVDGDtxWrbC6ekcOw3fqZhqD6kQ4AFgXlISQm/fq+ mGPWLb/FcR+dI1ry6/WjmL/er/eEEq/IGuVqtH75QjJGn7P5ZM1p9jTRHBHjiCv2GD ea6MwS3W/hDsA== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 14/18] nfsd: remove old LINK dprintks Date: Sat, 3 May 2025 15:59:32 -0400 Message-ID: <20250503195936.5083-15-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 7 ------- fs/nfsd/nfsproc.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index f207fba722eb..ebf9bcac9e7f 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -559,13 +559,6 @@ nfsd3_proc_link(struct svc_rqst *rqstp) struct nfsd3_linkargs *argp =3D rqstp->rq_argp; struct nfsd3_linkres *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: LINK(3) %s ->\n", - SVCFH_fmt(&argp->ffh)); - dprintk("nfsd: -> %s %.*s\n", - SVCFH_fmt(&argp->tfh), - argp->tlen, - argp->tname); - fh_copy(&resp->fh, &argp->ffh); fh_copy(&resp->tfh, &argp->tfh); resp->status =3D nfsd_link(rqstp, &resp->tfh, argp->tname, argp->tlen, diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index a12ad08b000a..6636fd075ca8 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -481,13 +481,6 @@ nfsd_proc_link(struct svc_rqst *rqstp) struct nfsd_linkargs *argp =3D rqstp->rq_argp; struct nfsd_stat *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: LINK %s ->\n", - SVCFH_fmt(&argp->ffh)); - dprintk("nfsd: %s %.*s\n", - SVCFH_fmt(&argp->tfh), - argp->tlen, - argp->tname); - resp->status =3D nfsd_link(rqstp, &argp->tfh, argp->tname, argp->tlen, &argp->ffh); fh_put(&argp->ffh); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 8FDD6283691; Sat, 3 May 2025 19:59:55 +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=1746302395; cv=none; b=D+Ik2Stzk1fhClIROER5JaX8DLm8FTxbqO4ybGIXdZOqLgMfUsrHaUROikfa6TPUB5/0ojbX9o/VWpdQwdFMrc1RGD/Iua/dC47bEJIBz2boNkWt606KtpDBVFQMKQ90zMAYPxRVg9CNCAtr7XDVVy5GvMWXx5R0mKIpfRGP/nY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302395; c=relaxed/simple; bh=igopUQe57zKtfrfTWB997I8/C9AiNjZWaNL+X86qkLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o6c6vLCE6X8N6FeyXcl5Js9lJYg8yh1k3tJWDkwLX927QGnKloFa03nl6QNUGruwZ8OEMt4C3S4E24GxI1SaFgc8VecjHbx4SB4dXHyQD51pdgpfoL3D54X2o7XROyeWAgbHsWfwdcPtcQwj1dWqz2S3F3wJewELOkNKR85Dte0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ch5uZBcR; 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="Ch5uZBcR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B265BC4CEE3; Sat, 3 May 2025 19:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302395; bh=igopUQe57zKtfrfTWB997I8/C9AiNjZWaNL+X86qkLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ch5uZBcR6aP8yCeWPJKOIA+iOu4wINJFidaHVikgq1WPq2h9yFxtjY3qrCkLKdOmr nRocF18eJmjc2fzYB1QL5F9stgE3NVvpo/v33MNqLp/H9UmXLZPOcmdvRIex3evbU+ BNvQKJzU9vQmZY9OFJVkz1Cptl4TLn2WoSlE4iyIbymPDIm5bIyR4aDBQTILhyDx7+ cilwB/cCC1JeCyPirrOD6WW95knECecyX930zqU6cWxUkW9sY9Thwsh/7S2G8rcpVW pTAq7OYOZvW0gzO8qQs14GSNMPGALaOpWyAVcOS8p8ctlOJkmkYVCt6WlaX7D/Suyo QtbCYR3NTuZbQ== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 15/18] nfsd: remove REMOVE/RMDIR dprintks Date: Sat, 3 May 2025 15:59:33 -0400 Message-ID: <20250503195936.5083-16-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 10 ---------- fs/nfsd/nfsproc.c | 5 ----- 2 files changed, 15 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index ebf9bcac9e7f..3b1d63d51bb2 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -496,11 +496,6 @@ nfsd3_proc_remove(struct svc_rqst *rqstp) struct nfsd3_diropargs *argp =3D rqstp->rq_argp; struct nfsd3_attrstat *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: REMOVE(3) %s %.*s\n", - SVCFH_fmt(&argp->fh), - argp->len, - argp->name); - /* Unlink. -S_IFDIR means file must not be a directory */ fh_copy(&resp->fh, &argp->fh); resp->status =3D nfsd_unlink(rqstp, &resp->fh, -S_IFDIR, @@ -518,11 +513,6 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp) struct nfsd3_diropargs *argp =3D rqstp->rq_argp; struct nfsd3_attrstat *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: RMDIR(3) %s %.*s\n", - SVCFH_fmt(&argp->fh), - argp->len, - argp->name); - fh_copy(&resp->fh, &argp->fh); resp->status =3D nfsd_unlink(rqstp, &resp->fh, S_IFDIR, argp->name, argp->len); diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 6636fd075ca8..7581b1ef4183 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -445,9 +445,6 @@ nfsd_proc_remove(struct svc_rqst *rqstp) struct nfsd_diropargs *argp =3D rqstp->rq_argp; struct nfsd_stat *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: REMOVE %s %.*s\n", SVCFH_fmt(&argp->fh), - argp->len, argp->name); - /* Unlink. -SIFDIR means file must not be a directory */ resp->status =3D nfsd_unlink(rqstp, &argp->fh, -S_IFDIR, argp->name, argp->len); @@ -565,8 +562,6 @@ nfsd_proc_rmdir(struct svc_rqst *rqstp) struct nfsd_diropargs *argp =3D rqstp->rq_argp; struct nfsd_stat *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: RMDIR %s %.*s\n", SVCFH_fmt(&argp->fh), argp->len, argp= ->name); - resp->status =3D nfsd_unlink(rqstp, &argp->fh, S_IFDIR, argp->name, argp->len); fh_put(&argp->fh); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 805EA283C8D; Sat, 3 May 2025 19:59:56 +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=1746302396; cv=none; b=I0YcVfcj5GoeQFdS6HvVQQLIuYdOcjl6wvkperx/2/Y+x9Ks9fGvJOSwbmwnBCdHg+W/fWnHWXXV6zUOdLihr2z3xikIr6jt2LS6aMaW1xdsLy4tKuGGewp5lu/iKr3w1VpkRenYEzjglRK5uiFr2f3BaJj1u6SlcfOmUkDz4hE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302396; c=relaxed/simple; bh=BqaEAnyNy3K13S7S9/sMiwjPohQ+/Jf2zGrJdRtOmFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tUQms9NpodmBOvJ1vJzdVjrIzxjB4YCPxR6MLITMWWGJL1nD7Jk6NB3WlpHmjwSpU9wATtntEbwYfXqrWcELlCPaAyDW6K7TuBv8ublmRTWh8vwegkQKv6OtW4DXKaqCE521h6pzxfYp/mgTHtwc9O+atvW+kvWX3tEfuygbn58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OO7k+/Wd; 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="OO7k+/Wd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A56E2C4CEE9; Sat, 3 May 2025 19:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302396; bh=BqaEAnyNy3K13S7S9/sMiwjPohQ+/Jf2zGrJdRtOmFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OO7k+/WdSe9mJhDx+xvZuyZR2pM3BYA5f3re43QtAfhfLCQjA/9I0CQtuP1iiJjTB BVaRb16c5yS9ObUEClqgVJ+eczZaQ77ATizuyd4jcFa/7I+UCigGrQOMwg504ACAnR Hjhg9V1OYFIMM3LIXd/kSe8Gapz2abuF46DMwfYL/4uSK083Oq0EnoXmvpyP+a7iKc k4OSWts+cK8p0gheFdYg10UNDlhQ4bH6nORqalB6Hi5oRZaLcwTk0/tR0wUi+C32ts EWGgQV8WHu4liJR+nO5C/+KB1aEHMPUEFH5OLguf3a9/565pycD/uwsGuO/TOnnPMR m2//LkWhZzdbg== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 16/18] nfsd: remove dprintks for v2/3 RENAME events Date: Sat, 3 May 2025 15:59:34 -0400 Message-ID: <20250503195936.5083-17-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 9 --------- fs/nfsd/nfsproc.c | 5 ----- 2 files changed, 14 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 3b1d63d51bb2..e394b0fb6260 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -526,15 +526,6 @@ nfsd3_proc_rename(struct svc_rqst *rqstp) struct nfsd3_renameargs *argp =3D rqstp->rq_argp; struct nfsd3_renameres *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: RENAME(3) %s %.*s ->\n", - SVCFH_fmt(&argp->ffh), - argp->flen, - argp->fname); - dprintk("nfsd: -> %s %.*s\n", - SVCFH_fmt(&argp->tfh), - argp->tlen, - argp->tname); - fh_copy(&resp->ffh, &argp->ffh); fh_copy(&resp->tfh, &argp->tfh); resp->status =3D nfsd_rename(rqstp, &resp->ffh, argp->fname, argp->flen, diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 7581b1ef4183..799ee95cdcd1 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -459,11 +459,6 @@ nfsd_proc_rename(struct svc_rqst *rqstp) struct nfsd_renameargs *argp =3D rqstp->rq_argp; struct nfsd_stat *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: RENAME %s %.*s -> \n", - SVCFH_fmt(&argp->ffh), argp->flen, argp->fname); - dprintk("nfsd: -> %s %.*s\n", - SVCFH_fmt(&argp->tfh), argp->tlen, argp->tname); - resp->status =3D nfsd_rename(rqstp, &argp->ffh, argp->fname, argp->flen, &argp->tfh, argp->tname, argp->tlen); fh_put(&argp->ffh); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 DBFC0283FD3; Sat, 3 May 2025 19:59:57 +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=1746302398; cv=none; b=FBGwHVO6fCWa8rpuJArVvVM4AdllGUsrol5pO/KBm/0aDM4T+H3ncD5NhoygUKHVIQ1LdBpRWx7Irvg8r/jOK6Yu/C6kD1csNSwg1TNEr4UcZIhVQsw6tWxasprr/LJ81ENfSSfOA76H3IKiBnKrqEsaQzp2irEkI/IbU1UIj5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302398; c=relaxed/simple; bh=rUy0ZARda46oepREydl694WcGHVvCWSzq1QMRW1Hqzg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h6PbbIYbQh+Y1JbcL45vLzxXhxzhyhuPrg3+X7ILV1TPc0zkwAhe3wxmltIZl5hMmDwm+IwK5sn3O3fjklatB/z6GZ8xuftKgtz6z4XXPGWe1DzuS5SAvoNfdmc1HjCJqlWe/4xxUsT3hq4qFN+YONjhpjM3UdFjHOHJizn4WZk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gPKurCJ4; 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="gPKurCJ4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96AEDC4CEE3; Sat, 3 May 2025 19:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302397; bh=rUy0ZARda46oepREydl694WcGHVvCWSzq1QMRW1Hqzg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gPKurCJ4iUIiZwUzoK4ssw3+lYJfclNs15qIA/tPKnVHRShzPnuRhOBil3jWCrYnt nsKUpETJ8sHJ1JkcVSmGfs6+9D3TlKuNCCFYed2V2GClzv3vlZRA4Kizo8Da4K6pvw MAXST8XTDTL2xyMo4GFRYYNE5A41uiIzg6+J5BpcScAvZkU6Qh2WGcD9NugiNpoe1C O6Cz/l8Gl7Bo6zqToBsJ0l+hFVmQrWsCAGxCEA3vT3LlUpdkAhtQm6K8Wgx34WNXFt Ure8bYkF+9X0FsZ27IDY5V2Qg2ttHINUwv8i0ddUsLNX1rHfKMUKYlpt3bYbfrzqSk t4tdkr4iVgIHQ== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 17/18] nfsd: remove legacy READDIR dprintks Date: Sat, 3 May 2025 15:59:35 -0400 Message-ID: <20250503195936.5083-18-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 6 ------ fs/nfsd/nfsproc.c | 3 --- 2 files changed, 9 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index e394b0fb6260..6019ce3a8036 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -578,9 +578,6 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp) struct nfsd3_readdirres *resp =3D rqstp->rq_resp; loff_t offset; =20 - dprintk("nfsd: READDIR(3) %s %d bytes at %d\n", - SVCFH_fmt(&argp->fh), - argp->count, (u32) argp->cookie); trace_nfsd_vfs_readdir(rqstp, &argp->fh, argp->count, argp->cookie); =20 nfsd3_init_dirlist_pages(rqstp, resp, argp->count); @@ -613,9 +610,6 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp) struct nfsd3_readdirres *resp =3D rqstp->rq_resp; loff_t offset; =20 - dprintk("nfsd: READDIR+(3) %s %d bytes at %d\n", - SVCFH_fmt(&argp->fh), - argp->count, (u32) argp->cookie); trace_nfsd_vfs_readdir(rqstp, &argp->fh, argp->count, argp->cookie); =20 nfsd3_init_dirlist_pages(rqstp, resp, argp->count); diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 799ee95cdcd1..fe0f1c372f18 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -592,9 +592,6 @@ nfsd_proc_readdir(struct svc_rqst *rqstp) struct nfsd_readdirres *resp =3D rqstp->rq_resp; loff_t offset; =20 - dprintk("nfsd: READDIR %s %d bytes at %d\n", - SVCFH_fmt(&argp->fh), =09 - argp->count, argp->cookie); trace_nfsd_vfs_readdir(rqstp, &argp->fh, argp->count, argp->cookie); =20 nfsd_init_dirlist_pages(rqstp, resp, argp->count); --=20 2.49.0 From nobody Fri Dec 19 22:01:24 2025 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 C002D283FF2; Sat, 3 May 2025 19:59:58 +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=1746302398; cv=none; b=FdLyjGQWNdIM/WCmPN27fJX5UHW3U8lZH1uyjA6h91vx2Rr+UB7E1IDEWDKepQofBrDtsTZbffY2oS+S2UVr16hHXIffRY4FJLaTZLM82UV5lcV/s8Gy12xaEf9hFFQARDy74QtU4bD8Mgus5glMrHTGj5J5QoQ5krwfCeVKZX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746302398; c=relaxed/simple; bh=gdhaTlGl8svKPWDxZ3pZi8kE3ywkX/zSLudtSlstuOw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DZYnHabPf3trV8o0Qfea0U476cKk09Q7ilYHCLcnAS+9MO5W3w9u2x1paFMfOoWe0ZzAJWIlaiAWOxAGuLD3yFpV/qa1tCSFT5Ij/FG7/3+cKopUElTDneL+xu3fvSz4ccltirfUTdPCcLQBLfh3fGqqH4rvjy3wlqo6vBThIbk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GrUCwc5f; 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="GrUCwc5f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8717DC4CEEE; Sat, 3 May 2025 19:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746302398; bh=gdhaTlGl8svKPWDxZ3pZi8kE3ywkX/zSLudtSlstuOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GrUCwc5foghAT/DIcNqRa8pQz48O5r91IXHVzsNKBfWp22HdAE5NdiGaFzzUTMSIc AUUzRn/PPLl2l0B2wT3Q5B1fWAle77L/6IaICK+iP+dTADbgUETH87HN2z8iII/y1u etbJ1HKXMG9d0j5kjWlCmpWIBbMRAI4z2YSWRWvJmDxUA0pDHS7t1svRCqE8xkpLd5 9plv1LhNe7TrU2D9P0QgxHQxe4r2R4a3Sg4T5ABPMIkZm5DeCGkCSeRh5tkSyzR2JC GhI3agbYwJBGl6EvexY8+r5tWQ+4OfgSH6FYAmKlgeKeojha1gLtRD2fMETMdba8j5 bJnff4ZMavsgw== From: cel@kernel.org To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: sargun@sargun.me, , Subject: [PATCH v4 18/18] nfsd: remove legacy dprintks from GETATTR and STATFS codepaths Date: Sat, 3 May 2025 15:59:36 -0400 Message-ID: <20250503195936.5083-19-cel@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250503195936.5083-1-cel@kernel.org> References: <20250503195936.5083-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jeff Layton Observability here is now covered by static tracepoints. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfs3proc.c | 6 ------ fs/nfsd/nfsproc.c | 4 ---- 2 files changed, 10 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 6019ce3a8036..8902fae8c62d 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -72,9 +72,6 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp) =20 trace_nfsd_vfs_getattr(rqstp, &argp->fh); =20 - dprintk("nfsd: GETATTR(3) %s\n", - SVCFH_fmt(&argp->fh)); - fh_copy(&resp->fh, &argp->fh); resp->status =3D fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP | NFSD_MAY_BYPASS_GSS_ON_ROOT); @@ -651,9 +648,6 @@ nfsd3_proc_fsstat(struct svc_rqst *rqstp) struct nfsd_fhandle *argp =3D rqstp->rq_argp; struct nfsd3_fsstatres *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: FSSTAT(3) %s\n", - SVCFH_fmt(&argp->fh)); - resp->status =3D nfsd_statfs(rqstp, &argp->fh, &resp->stats, 0); fh_put(&argp->fh); resp->status =3D nfsd3_map_status(resp->status); diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index fe0f1c372f18..7c573d792252 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -57,8 +57,6 @@ nfsd_proc_getattr(struct svc_rqst *rqstp) =20 trace_nfsd_vfs_getattr(rqstp, &argp->fh); =20 - dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); - fh_copy(&resp->fh, &argp->fh); resp->status =3D fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP | NFSD_MAY_BYPASS_GSS_ON_ROOT); @@ -617,8 +615,6 @@ nfsd_proc_statfs(struct svc_rqst *rqstp) struct nfsd_fhandle *argp =3D rqstp->rq_argp; struct nfsd_statfsres *resp =3D rqstp->rq_resp; =20 - dprintk("nfsd: STATFS %s\n", SVCFH_fmt(&argp->fh)); - resp->status =3D nfsd_statfs(rqstp, &argp->fh, &resp->stats, NFSD_MAY_BYPASS_GSS_ON_ROOT); fh_put(&argp->fh); --=20 2.49.0