From: Julian Schroeder Date: Mon, 23 May 2022 18:52:26 +0000 (+0000) Subject: nfsd: destroy percpu stats counters after reply cache shutdown X-Git-Tag: v6.1-rc5~902^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd5e363eac77ef81542db77ddad0559fa0f9204e;p=platform%2Fkernel%2Flinux-starfive.git nfsd: destroy percpu stats counters after reply cache shutdown Upon nfsd shutdown any pending DRC cache is freed. DRC cache use is tracked via a percpu counter. In the current code the percpu counter is destroyed before. If any pending cache is still present, percpu_counter_add is called with a percpu counter==NULL. This causes a kernel crash. The solution is to destroy the percpu counter after the cache is freed. Fixes: e567b98ce9a4b (“nfsd: protect concurrent access to nfsd stats counters”) Signed-off-by: Julian Schroeder Signed-off-by: Chuck Lever --- diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 0b3f12a..7da88bd 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -206,7 +206,6 @@ void nfsd_reply_cache_shutdown(struct nfsd_net *nn) struct svc_cacherep *rp; unsigned int i; - nfsd_reply_cache_stats_destroy(nn); unregister_shrinker(&nn->nfsd_reply_cache_shrinker); for (i = 0; i < nn->drc_hashsize; i++) { @@ -217,6 +216,7 @@ void nfsd_reply_cache_shutdown(struct nfsd_net *nn) rp, nn); } } + nfsd_reply_cache_stats_destroy(nn); kvfree(nn->drc_hashtbl); nn->drc_hashtbl = NULL;