mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
930b64ca0c
Currently, nfsd_proc_stat_init() ignores the return value of svc_proc_register(). If the procfile creation fails, then the kernel will WARN when it tries to remove the entry later. Fix nfsd_proc_stat_init() to return the same type of pointer as svc_proc_register(), and fix up nfsd_net_init() to check that and fail the nfsd_net construction if it occurs. svc_proc_register() can fail if the dentry can't be allocated, or if an identical dentry already exists. The second case is pretty unlikely in the nfsd_net construction codepath, so if this happens, return -ENOMEM. Reported-by: syzbot+e34ad04f27991521104c@syzkaller.appspotmail.com Closes: https://lore.kernel.org/linux-nfs/67a47501.050a0220.19061f.05f9.GAE@google.com/ Cc: stable@vger.kernel.org # v6.9 Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
76 lines
2.1 KiB
C
76 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Statistics for NFS server.
|
|
*
|
|
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
|
|
*/
|
|
#ifndef _NFSD_STATS_H
|
|
#define _NFSD_STATS_H
|
|
|
|
#include <uapi/linux/nfsd/stats.h>
|
|
#include <linux/percpu_counter.h>
|
|
|
|
struct proc_dir_entry *nfsd_proc_stat_init(struct net *net);
|
|
void nfsd_proc_stat_shutdown(struct net *net);
|
|
|
|
static inline void nfsd_stats_rc_hits_inc(struct nfsd_net *nn)
|
|
{
|
|
percpu_counter_inc(&nn->counter[NFSD_STATS_RC_HITS]);
|
|
}
|
|
|
|
static inline void nfsd_stats_rc_misses_inc(struct nfsd_net *nn)
|
|
{
|
|
percpu_counter_inc(&nn->counter[NFSD_STATS_RC_MISSES]);
|
|
}
|
|
|
|
static inline void nfsd_stats_rc_nocache_inc(struct nfsd_net *nn)
|
|
{
|
|
percpu_counter_inc(&nn->counter[NFSD_STATS_RC_NOCACHE]);
|
|
}
|
|
|
|
static inline void nfsd_stats_fh_stale_inc(struct nfsd_net *nn,
|
|
struct svc_export *exp)
|
|
{
|
|
percpu_counter_inc(&nn->counter[NFSD_STATS_FH_STALE]);
|
|
if (exp && exp->ex_stats)
|
|
percpu_counter_inc(&exp->ex_stats->counter[EXP_STATS_FH_STALE]);
|
|
}
|
|
|
|
static inline void nfsd_stats_io_read_add(struct nfsd_net *nn,
|
|
struct svc_export *exp, s64 amount)
|
|
{
|
|
percpu_counter_add(&nn->counter[NFSD_STATS_IO_READ], amount);
|
|
if (exp && exp->ex_stats)
|
|
percpu_counter_add(&exp->ex_stats->counter[EXP_STATS_IO_READ], amount);
|
|
}
|
|
|
|
static inline void nfsd_stats_io_write_add(struct nfsd_net *nn,
|
|
struct svc_export *exp, s64 amount)
|
|
{
|
|
percpu_counter_add(&nn->counter[NFSD_STATS_IO_WRITE], amount);
|
|
if (exp && exp->ex_stats)
|
|
percpu_counter_add(&exp->ex_stats->counter[EXP_STATS_IO_WRITE], amount);
|
|
}
|
|
|
|
static inline void nfsd_stats_payload_misses_inc(struct nfsd_net *nn)
|
|
{
|
|
percpu_counter_inc(&nn->counter[NFSD_STATS_PAYLOAD_MISSES]);
|
|
}
|
|
|
|
static inline void nfsd_stats_drc_mem_usage_add(struct nfsd_net *nn, s64 amount)
|
|
{
|
|
percpu_counter_add(&nn->counter[NFSD_STATS_DRC_MEM_USAGE], amount);
|
|
}
|
|
|
|
static inline void nfsd_stats_drc_mem_usage_sub(struct nfsd_net *nn, s64 amount)
|
|
{
|
|
percpu_counter_sub(&nn->counter[NFSD_STATS_DRC_MEM_USAGE], amount);
|
|
}
|
|
|
|
#ifdef CONFIG_NFSD_V4
|
|
static inline void nfsd_stats_wdeleg_getattr_inc(struct nfsd_net *nn)
|
|
{
|
|
percpu_counter_inc(&nn->counter[NFSD_STATS_WDELEG_GETATTR]);
|
|
}
|
|
#endif
|
|
#endif /* _NFSD_STATS_H */
|