From nobody Fri Dec 19 04:09:33 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 2691025D908; Wed, 9 Apr 2025 14:33:07 +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=1744209188; cv=none; b=JTew4FLbublAc5hpbmBaguaILMzkq8nBZ10KRC45Z+sx72WxtI7e25RfPqdQz3rSW6Ws+wLuMJzug0azHzMg+tvwh31MnkK3C3zYeiklgwgTX8PrCBEFXArtaxpEw8sGOqzRXNR/4Cv2JPGLZUwNahy+r12KuxD2OXvMgqaluJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209188; c=relaxed/simple; bh=zAC5eP0LXF+hgwORpWpvsUmRBvw+t8mnhNhIY/cgPIQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JxW8rZLMf5Md2Nat0xAWq2RWN008/tjBgvVaAnr8+LbLOiTQsRb24UUy+JcJBai9WLMZrG4aTe/Pf4GnR6udF1uhMtjg8MWHu08YP2V5Z9RmhTgqHqRuQJifTYyICHEdrbhghEpQPHdebtlcQxFKpenKLZXHQX/+5+ARcDaeKko= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q107yTs3; 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="q107yTs3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6C79C4CEEC; Wed, 9 Apr 2025 14:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744209187; bh=zAC5eP0LXF+hgwORpWpvsUmRBvw+t8mnhNhIY/cgPIQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=q107yTs3+mm02BTQzIYlQYquns9ujrtYj2Qu5Fj0GBStTvfz8XFVnb4miFzxrnDq3 wdyH25GlP/zq+4j4hbPB+4YcSedkB6M7Ckxq5RNT2BELLNRJ1Xuwf3O/IF3EocbfYO z+5oeBdhAxdLJlmuT0my4TXB6h+DhROo8qPj3bTYcp9LK7OpnWwdUCymApKogJq2ni LVu2gDR3nbOTjWvYKWNR/NiStBg2fPyUniVcZiEf50VjFmMelqeitA2hUoiSrpEalK GzI+8QaVm3JmfDsYpdTXc3D0nlq6WGZj08GOdU7H3lnGjxonrrATcxGC5Kn4g+iUa5 KEyGW8wO23eiw== From: Jeff Layton Date: Wed, 09 Apr 2025 10:32:28 -0400 Subject: [PATCH v2 06/12] nfsd: add tracepoints around nfsd_create events 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: <20250409-nfsd-tracepoints-v2-6-cf4e084fdd9c@kernel.org> References: <20250409-nfsd-tracepoints-v2-0-cf4e084fdd9c@kernel.org> In-Reply-To: <20250409-nfsd-tracepoints-v2-0-cf4e084fdd9c@kernel.org> To: Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker Cc: Sargun Dillon , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6343; i=jlayton@kernel.org; h=from:subject:message-id; bh=zAC5eP0LXF+hgwORpWpvsUmRBvw+t8mnhNhIY/cgPIQ=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBn9oUa+OgcktwyR8lbU2wdUf24sVUU7rVawtqnH obmVMeNm5+JAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZ/aFGgAKCRAADmhBGVaC FQCwD/wOA2Uel01YilhIR4K7BPvlJ2IfGvxwykJZLkSvP0bJvluO1HOpdWk+t8+q57faUkoKTDM hEJSBwJQKCjLzC3cEFcym++GVezNeZ5arl7b0O0X8sOUP+cScvRnxGoXxJEtFUmbUYtKz03f+TB hGroFkTjqkXs/zvVU3hjXCSvxvom8rb3B6/7C9eM/VkpjcTsArLxx2ITHsCnm3yD/eCtAxOwasR HCI/AFldw3t4cLCSG7tIAq//Ytt7gC9Nv2WmVyPy6GMrkgLXHa85aNNaA5aG55TCL8oIId247pE a3yhKOwDVsLAuRSrKvqTq8qnEgGkKxGiWhAdNcatU2g3M2XNZvQ4sK+TaF2LcXMnDk06f6/biIl PJZQDGlyQSHhBw35uJqJXATYXRwmGvqrEVztTfoOzFrjJfU3QHGE+P1xVuqgB6J1eXuuBa8tExo lRWISIywp+HLWpw3RHYRkf+l7h8n4g4lFSxGJMQDguY3E2UjTTt7HCm/E/PekqXOHsUb4YJtO/i FF6mGDYEeEWPcIrnkkibtZdLocieKMH2LamI9GGl+m+HL/YtIa3QBRszKlToL6TBeUH8AZEzygG gmLoTokxoez5CF95vHynCCUShA7vVvNre+WlK+eht0S/11Qy0DyvwQT2nFU3GAEL1gxHUlwp7yl xymF3XKi8X9hoDg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 ...and remove the legacy dprintks. Signed-off-by: Jeff Layton --- fs/nfsd/nfs3proc.c | 18 +++++------------- fs/nfsd/nfs4proc.c | 29 +++++++++++++++++++++++++++++ fs/nfsd/nfsproc.c | 6 +++--- fs/nfsd/trace.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 16 deletions(-) diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 372bdcf5e07a5c835da240ecebb02e3576eb2ca6..ea1280970ea11b2a82f0de88ad0= 422eef7063d6d 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 @@ -380,10 +381,7 @@ 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); + trace_nfsd3_proc_create(rqstp, &argp->fh, S_IFREG, argp->name, argp->len); =20 dirfhp =3D fh_copy(&resp->dirfh, &argp->fh); newfhp =3D fh_init(&resp->fh, NFS3_FHSIZE); @@ -405,10 +403,7 @@ 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); + trace_nfsd3_proc_mkdir(rqstp, &argp->fh, S_IFDIR, argp->name, argp->len); =20 argp->attrs.ia_valid &=3D ~ATTR_SIZE; fh_copy(&resp->dirfh, &argp->fh); @@ -471,13 +466,10 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) struct nfsd_attrs attrs =3D { .na_iattr =3D &argp->attrs, }; - int type; + int type =3D nfs3_ftypes[argp->ftype]; dev_t rdev =3D 0; =20 - dprintk("nfsd: MKNOD(3) %s %.*s\n", - SVCFH_fmt(&argp->fh), - argp->len, - argp->name); + trace_nfsd3_proc_mknod(rqstp, &argp->fh, type, argp->name, argp->len); =20 fh_copy(&resp->dirfh, &argp->fh); fh_init(&resp->fh, NFS3_FHSIZE); diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 6e23d6103010197c0316b07c189fe12ec3033812..2c795103deaa4044596bd07d90d= b788169a32a0c 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -250,6 +250,8 @@ nfsd4_create_file(struct svc_rqst *rqstp, struct svc_fh= *fhp, __be32 status; int host_err; =20 + trace_nfsd4_create_file(rqstp, fhp, S_IFREG, open->op_fname, open->op_fna= melen); + if (isdotent(open->op_fname, open->op_fnamelen)) return nfserr_exist; if (!(iap->ia_valid & ATTR_MODE)) @@ -807,6 +809,29 @@ nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_comp= ound_state *cstate, return status; } =20 +static umode_t nfs_type_to_vfs_type(enum nfs_ftype4 nfstype) +{ + switch (nfstype) { + case NF4REG: + return S_IFREG; + case NF4DIR: + return S_IFDIR; + case NF4BLK: + return S_IFBLK; + case NF4CHR: + return S_IFCHR; + case NF4LNK: + return S_IFLNK; + case NF4SOCK: + return S_IFSOCK; + case NF4FIFO: + return S_IFIFO; + default: + break; + } + return 0; +} + static __be32 nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, union nfsd4_op_u *u) @@ -822,6 +847,10 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_comp= ound_state *cstate, __be32 status; dev_t rdev; =20 + trace_nfsd4_create(rqstp, &cstate->current_fh, + nfs_type_to_vfs_type(create->cr_type), + create->cr_name, create->cr_namelen); + fh_init(&resfh, NFS4_FHSIZE); =20 status =3D fh_verify(rqstp, &cstate->current_fh, S_IFDIR, NFSD_MAY_NOP); diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 6dda081eb24c00b834ab0965c3a35a12115bceb7..33d8cbf8785588d38d4ec5efd76= 9c1d1d06c6a91 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 @@ -292,8 +293,7 @@ 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); + trace_nfsd_proc_create(rqstp, dirfhp, S_IFREG, argp->name, argp->len); =20 /* First verify the parent file handle */ resp->status =3D fh_verify(rqstp, dirfhp, S_IFDIR, NFSD_MAY_EXEC); @@ -548,7 +548,7 @@ 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); + trace_nfsd_proc_mkdir(rqstp, &argp->fh, S_IFDIR, argp->name, argp->len); =20 if (resp->fh.fh_dentry) { printk(KERN_WARNING diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 382849d7c321d6ded8213890c2e7075770aa716c..c6aff23a845f06c87e701d57ec5= 77c2c5c5a743c 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -2391,6 +2391,45 @@ TRACE_EVENT(nfsd_lookup_dentry, TP_printk("xid=3D0x%08x fh_hash=3D0x%08x name=3D%s", __entry->xid, __entry->fh_hash, __get_str(name)) ); + +DECLARE_EVENT_CLASS(nfsd_vfs_create_class, + TP_PROTO(struct svc_rqst *rqstp, + struct svc_fh *fhp, + umode_t type, + const char *name, + unsigned int len), + TP_ARGS(rqstp, fhp, type, name, len), + TP_STRUCT__entry( + SVC_RQST_ENDPOINT_FIELDS(rqstp) + __field(u32, fh_hash) + __field(umode_t, type) + __string_len(name, name, len) + ), + TP_fast_assign( + SVC_RQST_ENDPOINT_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)) +); + +#define DEFINE_NFSD_VFS_CREATE_EVENT(__name) \ + DEFINE_EVENT(nfsd_vfs_create_class, __name, \ + TP_PROTO(struct svc_rqst *rqstp, struct svc_fh *fhp, \ + umode_t type, const char *name, unsigned int len), \ + TP_ARGS(rqstp, fhp, type, name, len)) + +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd_proc_create); +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd_proc_mkdir); +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd3_proc_create); +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd3_proc_mkdir); +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd3_proc_mknod); +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd4_create); +DEFINE_NFSD_VFS_CREATE_EVENT(nfsd4_create_file); + #endif /* _NFSD_TRACE_H */ =20 #undef TRACE_INCLUDE_PATH --=20 2.49.0