[PATCH] NFSD: Remove nfsd_drc_gc() tracepoint

[PATCH] NFSD: Remove nfsd_drc_gc() tracepoint

[Chuck Lever]

From: Chuck Lever <chuck.lever@oracle.com>

This trace point was for debugging the DRC's garbage collection. In
the field it's just noise.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfscache.c |    6 +-----
 fs/nfsd/trace.h    |   22 ----------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index fd56a52aa5fb..4d2055c7898a 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -364,8 +364,6 @@ nfsd_reply_cache_scan(struct shrinker *shrink, struct shrink_control *sc)
 		if (freed > sc->nr_to_scan)
 			break;
 	}
-
-	trace_nfsd_drc_gc(nn, freed);
 	return freed;
 }
 
@@ -486,7 +484,6 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, struct nfsd_cacherep **cacherep)
 	__wsum			csum;
 	struct nfsd_drc_bucket	*b;
 	int type = rqstp->rq_cachetype;
-	unsigned long freed;
 	LIST_HEAD(dispose);
 	int rtn = RC_DOIT;
 
@@ -516,8 +513,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, struct nfsd_cacherep **cacherep)
 	nfsd_prune_bucket_locked(nn, b, 3, &dispose);
 	spin_unlock(&b->cache_lock);
 
-	freed = nfsd_cacherep_dispose(&dispose);
-	trace_nfsd_drc_gc(nn, freed);
+	nfsd_cacherep_dispose(&dispose);
 
 	nfsd_stats_rc_misses_inc();
 	atomic_inc(&nn->num_drc_entries);
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index fbc0ccb40424..d1e8cf079b0f 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -1262,28 +1262,6 @@ TRACE_EVENT(nfsd_drc_mismatch,
 		__entry->ingress)
 );
 
-TRACE_EVENT_CONDITION(nfsd_drc_gc,
-	TP_PROTO(
-		const struct nfsd_net *nn,
-		unsigned long freed
-	),
-	TP_ARGS(nn, freed),
-	TP_CONDITION(freed > 0),
-	TP_STRUCT__entry(
-		__field(unsigned long long, boot_time)
-		__field(unsigned long, freed)
-		__field(int, total)
-	),
-	TP_fast_assign(
-		__entry->boot_time = nn->boot_time;
-		__entry->freed = freed;
-		__entry->total = atomic_read(&nn->num_drc_entries);
-	),
-	TP_printk("boot_time=%16llx total=%d freed=%lu",
-		__entry->boot_time, __entry->total, __entry->freed
-	)
-);
-
 TRACE_EVENT(nfsd_cb_args,
 	TP_PROTO(
 		const struct nfs4_client *clp,

Re: [PATCH] NFSD: Remove nfsd_drc_gc() tracepoint

[Jeff Layton]

On Mon, 2023-11-13 at 08:45 -0500, Chuck Lever wrote:
> From: Chuck Lever <chuck.lever@oracle.com>
> 
> This trace point was for debugging the DRC's garbage collection. In
> the field it's just noise.
> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfsd/nfscache.c |    6 +-----
>  fs/nfsd/trace.h    |   22 ----------------------
>  2 files changed, 1 insertion(+), 27 deletions(-)
> 
> diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
> index fd56a52aa5fb..4d2055c7898a 100644
> --- a/fs/nfsd/nfscache.c
> +++ b/fs/nfsd/nfscache.c
> @@ -364,8 +364,6 @@ nfsd_reply_cache_scan(struct shrinker *shrink, struct shrink_control *sc)
>  		if (freed > sc->nr_to_scan)
>  			break;
>  	}
> -
> -	trace_nfsd_drc_gc(nn, freed);
>  	return freed;
>  }
>  
> @@ -486,7 +484,6 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, struct nfsd_cacherep **cacherep)
>  	__wsum			csum;
>  	struct nfsd_drc_bucket	*b;
>  	int type = rqstp->rq_cachetype;
> -	unsigned long freed;
>  	LIST_HEAD(dispose);
>  	int rtn = RC_DOIT;
>  
> @@ -516,8 +513,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp, struct nfsd_cacherep **cacherep)
>  	nfsd_prune_bucket_locked(nn, b, 3, &dispose);
>  	spin_unlock(&b->cache_lock);
>  
> -	freed = nfsd_cacherep_dispose(&dispose);
> -	trace_nfsd_drc_gc(nn, freed);
> +	nfsd_cacherep_dispose(&dispose);
>  
>  	nfsd_stats_rc_misses_inc();
>  	atomic_inc(&nn->num_drc_entries);
> diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> index fbc0ccb40424..d1e8cf079b0f 100644
> --- a/fs/nfsd/trace.h
> +++ b/fs/nfsd/trace.h
> @@ -1262,28 +1262,6 @@ TRACE_EVENT(nfsd_drc_mismatch,
>  		__entry->ingress)
>  );
>  
> -TRACE_EVENT_CONDITION(nfsd_drc_gc,
> -	TP_PROTO(
> -		const struct nfsd_net *nn,
> -		unsigned long freed
> -	),
> -	TP_ARGS(nn, freed),
> -	TP_CONDITION(freed > 0),
> -	TP_STRUCT__entry(
> -		__field(unsigned long long, boot_time)
> -		__field(unsigned long, freed)
> -		__field(int, total)
> -	),
> -	TP_fast_assign(
> -		__entry->boot_time = nn->boot_time;
> -		__entry->freed = freed;
> -		__entry->total = atomic_read(&nn->num_drc_entries);
> -	),
> -	TP_printk("boot_time=%16llx total=%d freed=%lu",
> -		__entry->boot_time, __entry->total, __entry->freed
> -	)
> -);
> -
>  TRACE_EVENT(nfsd_cb_args,
>  	TP_PROTO(
>  		const struct nfs4_client *clp,
> 
> 

Reviewed-by: Jeff Layton <jlayton@kernel.org>