From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C3E8EB64DC for ; Tue, 11 Jul 2023 08:58:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229801AbjGKI6x (ORCPT ); Tue, 11 Jul 2023 04:58:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231494AbjGKI6q (ORCPT ); Tue, 11 Jul 2023 04:58:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 779101702 for ; Tue, 11 Jul 2023 01:58:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DC74F613F8 for ; Tue, 11 Jul 2023 08:58:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC8EDC433C7; Tue, 11 Jul 2023 08:58:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689065920; bh=yYxUV/av0ciWFZl79cb0qO+yzusf4HdjlG9ZhdcEwEA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CamGVQMIogyLcz3HZjL/9YNMJfJOzoTfVjKjbn5n1Fs6uBGjBRXoqtao9QCbAtXus yJ5lvUBCR1TxsHunQenjSuo8dTZLzQQiUYSL6hiJbVsnjykHMkeyqRz2wgekYkZcCM 35KJd6t6i13imt4muQ7iZWhwYRqBIiCmP895gPXLixXYKu4WFZgzGkpSNqxOgzuBXY /CDKJou5Dg01NEmQe2PbR+yB7th2Qci6gum2MCUOCvxCxSPADR8y2s0A7OCiOnn3Yf 1Vdq2mdgan6jrukzJWESX3OL5NDvUMFJzS8VXnWqUHsChpaApcKSYnSOPLyea575o8 QOMyzl5CEDJEw== Date: Tue, 11 Jul 2023 10:58:36 +0200 From: Lorenzo Bianconi To: Jeff Layton Cc: linux-nfs@vger.kernel.org, lorenzo.bianconi@redhat.com, chuck.lever@oracle.com Subject: Re: [PATCH] NFSD: add rpc_status entry in nfsd debug filesystem Message-ID: References: <9495cf3f3674351579b5fd13d5ccacd7a6336088.1689005402.git.lorenzo@kernel.org> <1034ac186c7df01611052e743fded11d6a4fc179.camel@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="LiJDYqCy8arIFWnq" Content-Disposition: inline In-Reply-To: <1034ac186c7df01611052e743fded11d6a4fc179.camel@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org --LiJDYqCy8arIFWnq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > On Mon, 2023-07-10 at 18:16 +0200, Lorenzo Bianconi wrote: > > Introduce rpc_status entry in nfsd debug filesystem in order to dump > > pending RPC requests debugging information. > >=20 > > Link: https://bugzilla.linux-nfs.org/show_bug.cgi?id=3D366 > > Signed-off-by: Lorenzo Bianconi > > --- > > Changes since RFCv1: > > - riduce time holding nfsd_mutex bumping svc_serv refcoung in > > nfsd_rpc_status_open() > > - dump rqstp->rq_stime > > - add missing kdoc for nfsd_rpc_status_open() > > --- > > fs/nfsd/nfs4proc.c | 4 +-- > > fs/nfsd/nfsctl.c | 10 ++++++ > > fs/nfsd/nfsd.h | 2 ++ > > fs/nfsd/nfssvc.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ > > net/sunrpc/svc.c | 2 +- > > 5 files changed, 102 insertions(+), 4 deletions(-) > >=20 > > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c > > index 5ae670807449..a4dd1ef104c3 100644 > > --- a/fs/nfsd/nfs4proc.c > > +++ b/fs/nfsd/nfs4proc.c > > @@ -2452,8 +2452,6 @@ static inline void nfsd4_increment_op_stats(u32 o= pnum) > > =20 > > static const struct nfsd4_operation nfsd4_ops[]; > > =20 > > -static const char *nfsd4_op_name(unsigned opnum); > > - > > /* > > * Enforce NFSv4.1 COMPOUND ordering rules: > > * > > @@ -3583,7 +3581,7 @@ void warn_on_nonidempotent_op(struct nfsd4_op *op) > > } > > } > > =20 > > -static const char *nfsd4_op_name(unsigned opnum) > > +const char *nfsd4_op_name(unsigned opnum) > > { > > if (opnum < ARRAY_SIZE(nfsd4_ops)) > > return nfsd4_ops[opnum].op_name; > > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > > index 1b8b1aab9a15..629b4296e7c6 100644 > > --- a/fs/nfsd/nfsctl.c > > +++ b/fs/nfsd/nfsctl.c > > @@ -57,6 +57,8 @@ enum { > > NFSD_RecoveryDir, > > NFSD_V4EndGrace, > > #endif > > + NFSD_Rpc_Status, > > + > > NFSD_MaxReserved > > }; > > =20 > > @@ -195,6 +197,13 @@ static inline struct net *netns(struct file *file) > > return file_inode(file)->i_sb->s_fs_info; > > } > > =20 > > +static const struct file_operations nfsd_rpc_status_operations =3D { > > + .open =3D nfsd_rpc_status_open, > > + .read =3D seq_read, > > + .llseek =3D seq_lseek, > > + .release =3D nfsd_pool_stats_release, > > +}; > > + > > /* > > * write_unlock_ip - Release all locks used by a client > > * > > @@ -1400,6 +1409,7 @@ static int nfsd_fill_super(struct super_block *sb= , struct fs_context *fc) > > [NFSD_RecoveryDir] =3D {"nfsv4recoverydir", &transaction_ops, S_IWUS= R|S_IRUSR}, > > [NFSD_V4EndGrace] =3D {"v4_end_grace", &transaction_ops, S_IWUSR|S_I= RUGO}, > > #endif > > + [NFSD_Rpc_Status] =3D {"rpc_status", &nfsd_rpc_status_operations, S_= IRUGO}, > > /* last one */ {""} > > }; > > =20 > > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > > index d88498f8b275..75a3e1d55bc8 100644 > > --- a/fs/nfsd/nfsd.h > > +++ b/fs/nfsd/nfsd.h > > @@ -94,6 +94,7 @@ int nfsd_get_nrthreads(int n, int *, struct net *); > > int nfsd_set_nrthreads(int n, int *, struct net *); > > int nfsd_pool_stats_open(struct inode *, struct file *); > > int nfsd_pool_stats_release(struct inode *, struct file *); > > +int nfsd_rpc_status_open(struct inode *inode, struct file *file); > > void nfsd_shutdown_threads(struct net *net); > > =20 > > void nfsd_put(struct net *net); > > @@ -506,6 +507,7 @@ extern void nfsd4_ssc_init_umount_work(struct nfsd_= net *nn); > > =20 > > extern void nfsd4_init_leases_net(struct nfsd_net *nn); > > =20 > > +const char *nfsd4_op_name(unsigned opnum); > > #else /* CONFIG_NFSD_V4 */ > > static inline int nfsd4_is_junction(struct dentry *dentry) > > { > > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > > index 2154fa63c5f2..ef1eb8b1c5bf 100644 > > --- a/fs/nfsd/nfssvc.c > > +++ b/fs/nfsd/nfssvc.c > > @@ -1147,3 +1147,91 @@ int nfsd_pool_stats_release(struct inode *inode,= struct file *file) > > mutex_unlock(&nfsd_mutex); > > return ret; > > } > > + > > +static int nfsd_rpc_status_show(struct seq_file *m, void *v) > > +{ > > + struct inode *inode =3D file_inode(m->file); > > + struct nfsd_net *nn =3D net_generic(inode->i_sb->s_fs_info, nfsd_net_= id); > > + int i; > > + > > + rcu_read_lock(); > > + >=20 > Much nicer without all of the heavyweight locking, I think! >=20 > > + for (i =3D 0; i < nn->nfsd_serv->sv_nrpools; i++) { > > + struct svc_rqst *rqstp; > > + > > + seq_puts(m, "XID | FLAGS | PROG |"); > > + seq_puts(m, " VERS | PROC\t| TS(us)\t |"); > > + seq_puts(m, " REMOTE - LOCAL IP ADDR"); > > + seq_puts(m, "\t\t\t\t\t\t\t\t | NFS4 COMPOUND OPS\n"); >=20 > It may be best to just eliminate the header, or at the very least, only > print it once by moving it outside of the for loop. ack, right. I will just get rid of it. >=20 > > + list_for_each_entry_rcu(rqstp, > > + &nn->nfsd_serv->sv_pools[i].sp_all_threads, > > + rq_all) { > > + if (!test_bit(RQ_BUSY, &rqstp->rq_flags)) > > + continue; > > + > > + seq_printf(m, > > + "0x%08x | 0x%08lx | 0x%08x | NFSv%d |" > > + " %s\t| %016lld |", >=20 > I'd definitely get rid of the '|' delimiters. I think that it'd be best > to just separate the fields by single spaces, as that will be simpler > for scripts to parse. There are plenty of examples in the kernel that do > that (/proc/locks, /proc/self/mountstats, etc.). ack, I will fix it. >=20 > We can always write a simple shell or python script for nfs-utils that > parses and pretty-prints the fields. ack, I will do. >=20 > > + be32_to_cpu(rqstp->rq_xid), rqstp->rq_flags, > > + rqstp->rq_prog, rqstp->rq_vers, > > + svc_proc_name(rqstp), > > + ktime_to_us(rqstp->rq_stime)); > > + > > + if (rqstp->rq_addr.ss_family =3D=3D AF_INET) { > > + seq_printf(m, " %pI4 - %pI4\t\t\t\t\t\t\t |", > > + &((struct sockaddr_in *)&rqstp->rq_addr)->sin_addr, > > + &((struct sockaddr_in *)&rqstp->rq_daddr)->sin_addr); > > + } else if (rqstp->rq_addr.ss_family =3D=3D AF_INET6) { > > + seq_printf(m, " %pI6 - %pI6 |", > > + &((struct sockaddr_in6 *)&rqstp->rq_addr)->sin6_addr, > > + &((struct sockaddr_in6 *)&rqstp->rq_daddr)->sin6_addr); > > + } else { > > + seq_printf(m, " Unknown address family: %hu\n", >=20 > ...and if we're going to go for something machine-parseable, maybe just > print this as "unknown:%hu". Also, I don't think you want the extra > newline here. ack, I will fix it. Regards, Lorenzo >=20 > > + rqstp->rq_addr.ss_family); > > + continue; > > + } > > +#ifdef CONFIG_NFSD_V4 > > + if (rqstp->rq_vers =3D=3D NFS4_VERSION && > > + rqstp->rq_proc =3D=3D NFSPROC4_COMPOUND) { > > + /* NFSv4 compund */ > > + struct nfsd4_compoundargs *args =3D rqstp->rq_argp; > > + struct nfsd4_compoundres *resp =3D rqstp->rq_resp; > > + > > + while (resp->opcnt < args->opcnt) { > > + struct nfsd4_op *op =3D &args->ops[resp->opcnt++]; > > + > > + seq_printf(m, " %s", nfsd4_op_name(op->opnum)); > > + } > > + } > > +#endif /* CONFIG_NFSD_V4 */ > > + seq_puts(m, "\n"); > > + } > > + } > > + > > + rcu_read_unlock(); > > + > > + return 0; > > +} > > + > > +/** > > + * nfsd_rpc_status_open - Atomically copy a write verifier > > + * @inode: entry inode pointer. > > + * @file: entry file pointer. > > + * > > + * This routine dumps pending RPC requests info queued into nfs server. > > + */ > > +int nfsd_rpc_status_open(struct inode *inode, struct file *file) > > +{ > > + struct nfsd_net *nn =3D net_generic(inode->i_sb->s_fs_info, nfsd_net_= id); > > + > > + mutex_lock(&nfsd_mutex); > > + if (!nn->nfsd_serv) { > > + mutex_unlock(&nfsd_mutex); > > + return -ENODEV; > > + } > > + > > + svc_get(nn->nfsd_serv); > > + mutex_unlock(&nfsd_mutex); > > + > > + return single_open(file, nfsd_rpc_status_show, inode->i_private); > > +} > > diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c > > index 587811a002c9..44eac83b35a1 100644 > > --- a/net/sunrpc/svc.c > > +++ b/net/sunrpc/svc.c > > @@ -1629,7 +1629,7 @@ const char *svc_proc_name(const struct svc_rqst *= rqstp) > > return rqstp->rq_procinfo->pc_name; > > return "unknown"; > > } > > - > > +EXPORT_SYMBOL_GPL(svc_proc_name); > > =20 > > /** > > * svc_encode_result_payload - mark a range of bytes as a result paylo= ad >=20 > --=20 > Jeff Layton --LiJDYqCy8arIFWnq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCZK0ZvAAKCRA6cBh0uS2t rEN0AP4mSmBNYUfjzwPSgmuZ9TL7DOEniT+2V6gyyFz54J1cZgEAnce9IDdm/9SE Xc72jhXLSZ7NbvKAN9oO+tcnbTSG9wU= =MhQp -----END PGP SIGNATURE----- --LiJDYqCy8arIFWnq--