Commit 1b37ac21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-7.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd fixes from Chuck Lever:

 - Restore previous nfsd thread count reporting behavior

 - Fix credential reference leaks in the NFSD netlink admin protocol

* tag 'nfsd-7.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: report the requested maximum number of threads instead of number running
  nfsd: Fix cred ref leak in nfsd_nl_listener_set_doit().
  nfsd: Fix cred ref leak in nfsd_nl_threads_set_doit().
parents 11439c46 36441017

Documentation/netlink/specs/nfsd.yaml

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ operations: 
            - compound-ops

    -

      name: threads-set

      doc: set the number of running threads

      doc: set the maximum number of running threads

      attribute-set: server

      flags: [admin-perm]

      do:
@@ -165,7 +165,7 @@ operations: 
            - min-threads

    -

      name: threads-get

      doc: get the number of running threads

      doc: get the maximum number of running threads

      attribute-set: server

      do:

        reply:

fs/nfsd/nfsctl.c

+11 −11
Original line number Diff line number Diff line
@@ -377,15 +377,15 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size) 
}



/*

 * write_threads - Start NFSD, or report the current number of running threads

 * write_threads - Start NFSD, or report the configured number of threads

 *

 * Input:

 *			buf:		ignored

 *			size:		zero

 * Output:

 *	On success:	passed-in buffer filled with '\n'-terminated C

 *			string numeric value representing the number of

 *			running NFSD threads;

 *			string numeric value representing the configured

 *			number of NFSD threads;

 *			return code is the size in bytes of the string

 *	On error:	return code is zero

 *
@@ -399,8 +399,8 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size) 
 * Output:

 *	On success:	NFS service is started;

 *			passed-in buffer filled with '\n'-terminated C

 *			string numeric value representing the number of

 *			running NFSD threads;

 *			string numeric value representing the configured

 *			number of NFSD threads;

 *			return code is the size in bytes of the string

 *	On error:	return code is zero or a negative errno value

 */
@@ -430,7 +430,7 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size) 
}



/*

 * write_pool_threads - Set or report the current number of threads per pool

 * write_pool_threads - Set or report the configured number of threads per pool

 *

 * Input:

 *			buf:		ignored
@@ -447,7 +447,7 @@ static ssize_t write_threads(struct file *file, char *buf, size_t size) 
 * Output:

 *	On success:	passed-in buffer filled with '\n'-terminated C

 *			string containing integer values representing the

 *			number of NFSD threads in each pool;

 *			configured number of NFSD threads in each pool;

 *			return code is the size in bytes of the string

 *	On error:	return code is zero or a negative errno value

 */
@@ -1647,7 +1647,7 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info) 
	if (attr)

		nn->min_threads = nla_get_u32(attr);



	ret = nfsd_svc(nrpools, nthreads, net, get_current_cred(), scope);

	ret = nfsd_svc(nrpools, nthreads, net, current_cred(), scope);

	if (ret > 0)

		ret = 0;

out_unlock:
@@ -1657,7 +1657,7 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info) 
}



/**

 * nfsd_nl_threads_get_doit - get the number of running threads

 * nfsd_nl_threads_get_doit - get the maximum number of running threads

 * @skb: reply buffer

 * @info: netlink metadata and command arguments

 *
@@ -1700,7 +1700,7 @@ int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info) 
			struct svc_pool *sp = &nn->nfsd_serv->sv_pools[i];



			err = nla_put_u32(skb, NFSD_A_SERVER_THREADS,

					  sp->sp_nrthreads);

					  sp->sp_nrthrmax);

			if (err)

				goto err_unlock;

		}
@@ -2000,7 +2000,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info) 
		}



		ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa, 0,

					      get_current_cred());

					      current_cred());

		/* always save the latest error */

		if (ret < 0)

			err = ret;

fs/nfsd/nfssvc.c

+4 −3
Original line number Diff line number Diff line
@@ -239,12 +239,13 @@ static void nfsd_net_free(struct percpu_ref *ref) 


int nfsd_nrthreads(struct net *net)

{

	int rv = 0;

	int i, rv = 0;

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);



	mutex_lock(&nfsd_mutex);

	if (nn->nfsd_serv)

		rv = nn->nfsd_serv->sv_nrthreads;

		for (i = 0; i < nn->nfsd_serv->sv_nrpools; ++i)

			rv += nn->nfsd_serv->sv_pools[i].sp_nrthrmax;

	mutex_unlock(&nfsd_mutex);

	return rv;

}
@@ -659,7 +660,7 @@ int nfsd_get_nrthreads(int n, int *nthreads, struct net *net) 


	if (serv)

		for (i = 0; i < serv->sv_nrpools && i < n; i++)

			nthreads[i] = serv->sv_pools[i].sp_nrthreads;

			nthreads[i] = serv->sv_pools[i].sp_nrthrmax;

	return 0;

}