diff mbox series

[v2] nfsd: rename delegation related tracepoints to make them less confusing

Message ID 20200828070255.141460-1-houtao1@huawei.com
State New
Headers show
Series [v2] nfsd: rename delegation related tracepoints to make them less confusing | expand

Commit Message

Hou Tao Aug. 28, 2020, 7:02 a.m. UTC
Now when a read delegation is given, two delegation related traces
will be printed:

    nfsd_deleg_open: client 5f45b854:e6058001 stateid 00000030:00000001
    nfsd_deleg_none: client 5f45b854:e6058001 stateid 0000002f:00000001

Although the intention is to let developers know two stateid are
returned, the traces are confusing about whether or not a read delegation
is handled out. So renaming trace_nfsd_deleg_none() to trace_nfsd_open()
and trace_nfsd_deleg_open() to trace_nfsd_deleg_read() to make
the intension clearer.

The patched traces will be:

    nfsd_deleg_read: client 5f48a967:b55b21cd stateid 00000003:00000001
    nfsd_open: client 5f48a967:b55b21cd stateid 00000002:00000001

Suggested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Hou Tao <houtao1@huawei.com>
---
v1: https://marc.info/?l=linux-nfs&m=159851134513236&w=2

 fs/nfsd/nfs4state.c | 4 ++--
 fs/nfsd/trace.h     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Chuck Lever Aug. 28, 2020, 1:21 p.m. UTC | #1
> On Aug 28, 2020, at 3:02 AM, Hou Tao <houtao1@huawei.com> wrote:
> 
> Now when a read delegation is given, two delegation related traces
> will be printed:
> 
>    nfsd_deleg_open: client 5f45b854:e6058001 stateid 00000030:00000001
>    nfsd_deleg_none: client 5f45b854:e6058001 stateid 0000002f:00000001
> 
> Although the intention is to let developers know two stateid are
> returned, the traces are confusing about whether or not a read delegation
> is handled out. So renaming trace_nfsd_deleg_none() to trace_nfsd_open()
> and trace_nfsd_deleg_open() to trace_nfsd_deleg_read() to make
> the intension clearer.
> 
> The patched traces will be:
> 
>    nfsd_deleg_read: client 5f48a967:b55b21cd stateid 00000003:00000001
>    nfsd_open: client 5f48a967:b55b21cd stateid 00000002:00000001
> 
> Suggested-by: Chuck Lever <chuck.lever@oracle.com>
> Signed-off-by: Hou Tao <houtao1@huawei.com>

LGTM. I assume Bruce is taking this for v5.10.


> ---
> v1: https://marc.info/?l=linux-nfs&m=159851134513236&w=2
> 
> fs/nfsd/nfs4state.c | 4 ++--
> fs/nfsd/trace.h     | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index c09a2a4281ec9..0525acfe31314 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -5126,7 +5126,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open,
> 
> 	memcpy(&open->op_delegate_stateid, &dp->dl_stid.sc_stateid, sizeof(dp->dl_stid.sc_stateid));
> 
> -	trace_nfsd_deleg_open(&dp->dl_stid.sc_stateid);
> +	trace_nfsd_deleg_read(&dp->dl_stid.sc_stateid);
> 	open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
> 	nfs4_put_stid(&dp->dl_stid);
> 	return;
> @@ -5243,7 +5243,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
> 	nfs4_open_delegation(current_fh, open, stp);
> nodeleg:
> 	status = nfs_ok;
> -	trace_nfsd_deleg_none(&stp->st_stid.sc_stateid);
> +	trace_nfsd_open(&stp->st_stid.sc_stateid);
> out:
> 	/* 4.1 client trying to upgrade/downgrade delegation? */
> 	if (open->op_delegate_type == NFS4_OPEN_DELEGATE_NONE && dp &&
> diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> index 1861db1bdc670..99bf07800cd09 100644
> --- a/fs/nfsd/trace.h
> +++ b/fs/nfsd/trace.h
> @@ -289,8 +289,8 @@ DEFINE_STATEID_EVENT(layout_recall_done);
> DEFINE_STATEID_EVENT(layout_recall_fail);
> DEFINE_STATEID_EVENT(layout_recall_release);
> 
> -DEFINE_STATEID_EVENT(deleg_open);
> -DEFINE_STATEID_EVENT(deleg_none);
> +DEFINE_STATEID_EVENT(open);
> +DEFINE_STATEID_EVENT(deleg_read);
> DEFINE_STATEID_EVENT(deleg_break);
> DEFINE_STATEID_EVENT(deleg_recall);
> 
> -- 
> 2.25.0.4.g0ad7144999
> 

--
Chuck Lever
J. Bruce Fields Aug. 29, 2020, 3:20 p.m. UTC | #2
On Fri, Aug 28, 2020 at 09:21:55AM -0400, Chuck Lever wrote:
> 
> 
> > On Aug 28, 2020, at 3:02 AM, Hou Tao <houtao1@huawei.com> wrote:
> > 
> > Now when a read delegation is given, two delegation related traces
> > will be printed:
> > 
> >    nfsd_deleg_open: client 5f45b854:e6058001 stateid 00000030:00000001
> >    nfsd_deleg_none: client 5f45b854:e6058001 stateid 0000002f:00000001
> > 
> > Although the intention is to let developers know two stateid are
> > returned, the traces are confusing about whether or not a read delegation
> > is handled out. So renaming trace_nfsd_deleg_none() to trace_nfsd_open()
> > and trace_nfsd_deleg_open() to trace_nfsd_deleg_read() to make
> > the intension clearer.
> > 
> > The patched traces will be:
> > 
> >    nfsd_deleg_read: client 5f48a967:b55b21cd stateid 00000003:00000001
> >    nfsd_open: client 5f48a967:b55b21cd stateid 00000002:00000001
> > 
> > Suggested-by: Chuck Lever <chuck.lever@oracle.com>
> > Signed-off-by: Hou Tao <houtao1@huawei.com>
> 
> LGTM. I assume Bruce is taking this for v5.10.

Applying for 5.10, thanks.--b.

> 
> 
> > ---
> > v1: https://marc.info/?l=linux-nfs&m=159851134513236&w=2
> > 
> > fs/nfsd/nfs4state.c | 4 ++--
> > fs/nfsd/trace.h     | 4 ++--
> > 2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> > index c09a2a4281ec9..0525acfe31314 100644
> > --- a/fs/nfsd/nfs4state.c
> > +++ b/fs/nfsd/nfs4state.c
> > @@ -5126,7 +5126,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open,
> > 
> > 	memcpy(&open->op_delegate_stateid, &dp->dl_stid.sc_stateid, sizeof(dp->dl_stid.sc_stateid));
> > 
> > -	trace_nfsd_deleg_open(&dp->dl_stid.sc_stateid);
> > +	trace_nfsd_deleg_read(&dp->dl_stid.sc_stateid);
> > 	open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
> > 	nfs4_put_stid(&dp->dl_stid);
> > 	return;
> > @@ -5243,7 +5243,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
> > 	nfs4_open_delegation(current_fh, open, stp);
> > nodeleg:
> > 	status = nfs_ok;
> > -	trace_nfsd_deleg_none(&stp->st_stid.sc_stateid);
> > +	trace_nfsd_open(&stp->st_stid.sc_stateid);
> > out:
> > 	/* 4.1 client trying to upgrade/downgrade delegation? */
> > 	if (open->op_delegate_type == NFS4_OPEN_DELEGATE_NONE && dp &&
> > diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> > index 1861db1bdc670..99bf07800cd09 100644
> > --- a/fs/nfsd/trace.h
> > +++ b/fs/nfsd/trace.h
> > @@ -289,8 +289,8 @@ DEFINE_STATEID_EVENT(layout_recall_done);
> > DEFINE_STATEID_EVENT(layout_recall_fail);
> > DEFINE_STATEID_EVENT(layout_recall_release);
> > 
> > -DEFINE_STATEID_EVENT(deleg_open);
> > -DEFINE_STATEID_EVENT(deleg_none);
> > +DEFINE_STATEID_EVENT(open);
> > +DEFINE_STATEID_EVENT(deleg_read);
> > DEFINE_STATEID_EVENT(deleg_break);
> > DEFINE_STATEID_EVENT(deleg_recall);
> > 
> > -- 
> > 2.25.0.4.g0ad7144999
> > 
> 
> --
> Chuck Lever
> 
>
diff mbox series

Patch

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c09a2a4281ec9..0525acfe31314 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -5126,7 +5126,7 @@  nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open,
 
 	memcpy(&open->op_delegate_stateid, &dp->dl_stid.sc_stateid, sizeof(dp->dl_stid.sc_stateid));
 
-	trace_nfsd_deleg_open(&dp->dl_stid.sc_stateid);
+	trace_nfsd_deleg_read(&dp->dl_stid.sc_stateid);
 	open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
 	nfs4_put_stid(&dp->dl_stid);
 	return;
@@ -5243,7 +5243,7 @@  nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
 	nfs4_open_delegation(current_fh, open, stp);
 nodeleg:
 	status = nfs_ok;
-	trace_nfsd_deleg_none(&stp->st_stid.sc_stateid);
+	trace_nfsd_open(&stp->st_stid.sc_stateid);
 out:
 	/* 4.1 client trying to upgrade/downgrade delegation? */
 	if (open->op_delegate_type == NFS4_OPEN_DELEGATE_NONE && dp &&
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 1861db1bdc670..99bf07800cd09 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -289,8 +289,8 @@  DEFINE_STATEID_EVENT(layout_recall_done);
 DEFINE_STATEID_EVENT(layout_recall_fail);
 DEFINE_STATEID_EVENT(layout_recall_release);
 
-DEFINE_STATEID_EVENT(deleg_open);
-DEFINE_STATEID_EVENT(deleg_none);
+DEFINE_STATEID_EVENT(open);
+DEFINE_STATEID_EVENT(deleg_read);
 DEFINE_STATEID_EVENT(deleg_break);
 DEFINE_STATEID_EVENT(deleg_recall);