The next commit switches the nfsd_serv member for struct nfsd_net over
to a void pointer (void __rcu *). Prepare for this by assigning
nn->nfsd_serv to an struct svc_serv pointer that is then happily
dereferenced. This eliminates what would otherwise be numerous void
pointer dereferences after the next commit.
All nfsd code what audited so that methods that hold nfsd_mutex will
continue to directly dereference nn->nfsd_serv.
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
---
fs/nfsd/nfsctl.c | 21 +++++++++++++--------
fs/nfsd/nfssvc.c | 28 ++++++++++++++++------------
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 202140df8f82..e26b1bc7ad33 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -679,10 +679,11 @@ static ssize_t write_versions(struct file *file, char *buf, size_t size)
static ssize_t __write_ports_names(char *buf, struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv = nn->nfsd_serv;
- if (nn->nfsd_serv == NULL)
+ if (serv == NULL)
return 0;
- return svc_xprt_names(nn->nfsd_serv, buf, SIMPLE_TRANSACTION_LIMIT);
+ return svc_xprt_names(serv, buf, SIMPLE_TRANSACTION_LIMIT);
}
/*
@@ -709,7 +710,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
serv = nn->nfsd_serv;
err = svc_addsock(serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
- if (!serv->sv_nrthreads && list_empty(&nn->nfsd_serv->sv_permsocks))
+ if (!serv->sv_nrthreads && list_empty(&serv->sv_permsocks))
nfsd_destroy_serv(net);
return err;
@@ -757,7 +758,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
svc_xprt_put(xprt);
}
out_err:
- if (!serv->sv_nrthreads && list_empty(&nn->nfsd_serv->sv_permsocks))
+ if (!serv->sv_nrthreads && list_empty(&serv->sv_permsocks))
nfsd_destroy_serv(net);
return err;
@@ -1666,6 +1667,7 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info)
int nthreads = 0, count = 0, nrpools, ret = -EOPNOTSUPP, rem;
struct net *net = genl_info_net(info);
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv;
const struct nlattr *attr;
const char *scope = NULL;
@@ -1693,7 +1695,8 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info)
info->attrs[NFSD_A_SERVER_LEASETIME] ||
info->attrs[NFSD_A_SERVER_SCOPE]) {
ret = -EBUSY;
- if (nn->nfsd_serv && nn->nfsd_serv->sv_nrthreads)
+ serv = nn->nfsd_serv;
+ if (serv && serv->sv_nrthreads)
goto out_unlock;
ret = -EINVAL;
@@ -1741,6 +1744,7 @@ int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info)
{
struct net *net = genl_info_net(info);
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv;
void *hdr;
int err;
@@ -1765,11 +1769,12 @@ int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info)
if (err)
goto err_unlock;
- if (nn->nfsd_serv) {
+ serv = nn->nfsd_serv;
+ if (serv) {
int i;
for (i = 0; i < nfsd_nrpools(net); ++i) {
- struct svc_pool *sp = &nn->nfsd_serv->sv_pools[i];
+ struct svc_pool *sp = &serv->sv_pools[i];
err = nla_put_u32(skb, NFSD_A_SERVER_THREADS,
atomic_read(&sp->sp_nrthreads));
@@ -2087,7 +2092,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info)
err = ret;
}
- if (!serv->sv_nrthreads && list_empty(&nn->nfsd_serv->sv_permsocks))
+ if (!serv->sv_nrthreads && list_empty(&serv->sv_permsocks))
nfsd_destroy_serv(net);
out_unlock_mtx:
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 8f4b8c341c7c..d6e9d346e84a 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -309,10 +309,12 @@ int nfsd_nrthreads(struct net *net)
{
int rv = 0;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv;
mutex_lock(&nfsd_mutex);
- if (nn->nfsd_serv)
- rv = nn->nfsd_serv->sv_nrthreads;
+ serv = nn->nfsd_serv;
+ if (serv)
+ rv = serv->sv_nrthreads;
mutex_unlock(&nfsd_mutex);
return rv;
}
@@ -321,16 +323,17 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred)
{
int error;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv = nn->nfsd_serv;
- if (!list_empty(&nn->nfsd_serv->sv_permsocks))
+ if (!list_empty(&serv->sv_permsocks))
return 0;
- error = svc_xprt_create(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT,
+ error = svc_xprt_create(serv, "udp", net, PF_INET, NFS_PORT,
SVC_SOCK_DEFAULTS, cred);
if (error < 0)
return error;
- error = svc_xprt_create(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT,
+ error = svc_xprt_create(serv, "tcp", net, PF_INET, NFS_PORT,
SVC_SOCK_DEFAULTS, cred);
if (error < 0)
return error;
@@ -742,11 +745,12 @@ int nfsd_create_serv(struct net *net)
int nfsd_nrpools(struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv = nn->nfsd_serv;
- if (nn->nfsd_serv == NULL)
+ if (serv == NULL)
return 0;
else
- return nn->nfsd_serv->sv_nrpools;
+ return serv->sv_nrpools;
}
int nfsd_get_nrthreads(int n, int *nthreads, struct net *net)
@@ -767,14 +771,15 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
int tot = 0;
int err = 0;
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
+ struct svc_serv *serv = nn->nfsd_serv;
WARN_ON(!mutex_is_locked(&nfsd_mutex));
- if (nn->nfsd_serv == NULL || n <= 0)
+ if (serv == NULL || n <= 0)
return 0;
- if (n > nn->nfsd_serv->sv_nrpools)
- n = nn->nfsd_serv->sv_nrpools;
+ if (n > serv->sv_nrpools)
+ n = serv->sv_nrpools;
/* enforce a global maximum number of threads */
tot = 0;
@@ -804,8 +809,7 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
/* apply the new numbers */
for (i = 0; i < n; i++) {
- err = svc_set_num_threads(nn->nfsd_serv,
- &nn->nfsd_serv->sv_pools[i],
+ err = svc_set_num_threads(serv, &serv->sv_pools[i],
nthreads[i]);
if (err)
break;
--
2.44.0
