Commit 700a800a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-5.2' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 "This consists mostly of nfsd container work:

  Scott Mayhew revived an old api that communicates with a userspace
  daemon to manage some on-disk state that's used to track clients
  across server reboots. We've been using a usermode_helper upcall for
  that, but it's tough to run those with the right namespaces, so a
  daemon is much friendlier to container use cases.

  Trond fixed nfsd's handling of user credentials in user namespaces. He
  also contributed patches that allow containers to support different
  sets of NFS protocol versions.

  The only remaining container bug I'm aware of is that the NFS reply
  cache is shared between all containers. If anyone's aware of other
  gaps in our container support, let me know.

  The rest of this is miscellaneous bugfixes"

* tag 'nfsd-5.2' of git://linux-nfs.org/~bfields/linux: (23 commits)
  nfsd: update callback done processing
  locks: move checks from locks_free_lock() to locks_release_private()
  nfsd: fh_drop_write in nfsd_unlink
  nfsd: allow fh_want_write to be called twice
  nfsd: knfsd must use the container user namespace
  SUNRPC: rsi_parse() should use the current user namespace
  SUNRPC: Fix the server AUTH_UNIX userspace mappings
  lockd: Pass the user cred from knfsd when starting the lockd server
  SUNRPC: Temporary sockets should inherit the cred from their parent
  SUNRPC: Cache the process user cred in the RPC server listener
  nfsd: Allow containers to set supported nfs versions
  nfsd: Add custom rpcbind callbacks for knfsd
  SUNRPC: Allow further customisation of RPC program registration
  SUNRPC: Clean up generic dispatcher code
  SUNRPC: Add a callback to initialise server requests
  SUNRPC/nfs: Fix return value for nfs4_callback_compound()
  nfsd: handle legacy client tracking records sent by nfsdcld
  nfsd: re-order client tracking method selection
  nfsd: keep a tally of RECLAIM_COMPLETE operations when using nfsdcld
  nfsd: un-deprecate nfsdcld
  ...
parents b06ed1e7 1c73b9d2

fs/lockd/clntlock.c

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) 
	u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4;

	int status;



	status = lockd_up(nlm_init->net);

	status = lockd_up(nlm_init->net, nlm_init->cred);

	if (status < 0)

		return ERR_PTR(status);
@@ -241,7 +241,7 @@ reclaimer(void *ptr) 
	allow_signal(SIGKILL);



	down_write(&host->h_rwsem);

	lockd_up(net);	/* note: this cannot fail as lockd is already running */

	lockd_up(net, NULL);	/* note: this cannot fail as lockd is already running */



	dprintk("lockd: reclaiming locks for host %s\n", host->h_name);

fs/lockd/svc.c

+20 −13
Original line number Diff line number Diff line
@@ -188,28 +188,31 @@ lockd(void *vrqstp) 


static int create_lockd_listener(struct svc_serv *serv, const char *name,

				 struct net *net, const int family,

				 const unsigned short port)

				 const unsigned short port,

				 const struct cred *cred)

{

	struct svc_xprt *xprt;



	xprt = svc_find_xprt(serv, name, net, family, 0);

	if (xprt == NULL)

		return svc_create_xprt(serv, name, net, family, port,

						SVC_SOCK_DEFAULTS);

						SVC_SOCK_DEFAULTS, cred);

	svc_xprt_put(xprt);

	return 0;

}



static int create_lockd_family(struct svc_serv *serv, struct net *net,

			       const int family)

			       const int family, const struct cred *cred)

{

	int err;



	err = create_lockd_listener(serv, "udp", net, family, nlm_udpport);

	err = create_lockd_listener(serv, "udp", net, family, nlm_udpport,

			cred);

	if (err < 0)

		return err;



	return create_lockd_listener(serv, "tcp", net, family, nlm_tcpport);

	return create_lockd_listener(serv, "tcp", net, family, nlm_tcpport,

			cred);

}



/*
@@ -222,16 +225,17 @@ static int create_lockd_family(struct svc_serv *serv, struct net *net, 
 * Returns zero if all listeners are available; otherwise a

 * negative errno value is returned.

 */

static int make_socks(struct svc_serv *serv, struct net *net)

static int make_socks(struct svc_serv *serv, struct net *net,

		const struct cred *cred)

{

	static int warned;

	int err;



	err = create_lockd_family(serv, net, PF_INET);

	err = create_lockd_family(serv, net, PF_INET, cred);

	if (err < 0)

		goto out_err;



	err = create_lockd_family(serv, net, PF_INET6);

	err = create_lockd_family(serv, net, PF_INET6, cred);

	if (err < 0 && err != -EAFNOSUPPORT)

		goto out_err;
@@ -246,7 +250,8 @@ out_err: 
	return err;

}



static int lockd_up_net(struct svc_serv *serv, struct net *net)

static int lockd_up_net(struct svc_serv *serv, struct net *net,

		const struct cred *cred)

{

	struct lockd_net *ln = net_generic(net, lockd_net_id);

	int error;
@@ -258,7 +263,7 @@ static int lockd_up_net(struct svc_serv *serv, struct net *net) 
	if (error)

		goto err_bind;



	error = make_socks(serv, net);

	error = make_socks(serv, net, cred);

	if (error < 0)

		goto err_bind;

	set_grace_period(net);
@@ -461,7 +466,7 @@ static struct svc_serv *lockd_create_svc(void) 
/*

 * Bring up the lockd process if it's not already up.

 */

int lockd_up(struct net *net)

int lockd_up(struct net *net, const struct cred *cred)

{

	struct svc_serv *serv;

	int error;
@@ -474,7 +479,7 @@ int lockd_up(struct net *net) 
		goto err_create;

	}



	error = lockd_up_net(serv, net);

	error = lockd_up_net(serv, net, cred);

	if (error < 0) {

		lockd_unregister_notifiers();

		goto err_put;
@@ -807,5 +812,7 @@ static struct svc_program nlmsvc_program = { 
	.pg_name		= "lockd",		/* service name */

	.pg_class		= "nfsd",		/* share authentication with nfsd */

	.pg_stats		= &nlmsvc_stats,	/* stats table */

	.pg_authenticate = &lockd_authenticate	/* export authentication */

	.pg_authenticate	= &lockd_authenticate,	/* export authentication */

	.pg_init_request	= svc_generic_init_request,

	.pg_rpcbind_set		= svc_generic_rpcbind_set,

};

fs/locks.c

+6 −6
Original line number Diff line number Diff line
@@ -352,6 +352,12 @@ EXPORT_SYMBOL_GPL(locks_alloc_lock); 


void locks_release_private(struct file_lock *fl)

{

	BUG_ON(waitqueue_active(&fl->fl_wait));

	BUG_ON(!list_empty(&fl->fl_list));

	BUG_ON(!list_empty(&fl->fl_blocked_requests));

	BUG_ON(!list_empty(&fl->fl_blocked_member));

	BUG_ON(!hlist_unhashed(&fl->fl_link));



	if (fl->fl_ops) {

		if (fl->fl_ops->fl_release_private)

			fl->fl_ops->fl_release_private(fl);
@@ -371,12 +377,6 @@ EXPORT_SYMBOL_GPL(locks_release_private); 
/* Free a lock which is not in use. */

void locks_free_lock(struct file_lock *fl)

{

	BUG_ON(waitqueue_active(&fl->fl_wait));

	BUG_ON(!list_empty(&fl->fl_list));

	BUG_ON(!list_empty(&fl->fl_blocked_requests));

	BUG_ON(!list_empty(&fl->fl_blocked_member));

	BUG_ON(!hlist_unhashed(&fl->fl_link));



	locks_release_private(fl);

	kmem_cache_free(filelock_cache, fl);

}

fs/nfs/callback.c

+7 −2
Original line number Diff line number Diff line
@@ -41,11 +41,13 @@ static struct svc_program nfs4_callback_program; 


static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)

{

	const struct cred *cred = current_cred();

	int ret;

	struct nfs_net *nn = net_generic(net, nfs_net_id);



	ret = svc_create_xprt(serv, "tcp", net, PF_INET,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,

				cred);

	if (ret <= 0)

		goto out_err;

	nn->nfs_callback_tcpport = ret;
@@ -53,7 +55,8 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) 
		nn->nfs_callback_tcpport, PF_INET, net->ns.inum);



	ret = svc_create_xprt(serv, "tcp", net, PF_INET6,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,

				cred);

	if (ret > 0) {

		nn->nfs_callback_tcpport6 = ret;

		dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",
@@ -457,4 +460,6 @@ static struct svc_program nfs4_callback_program = { 
	.pg_class = "nfs",				/* authentication class */

	.pg_stats = &nfs4_callback_stats,

	.pg_authenticate = nfs_callback_authenticate,

	.pg_init_request = svc_generic_init_request,

	.pg_rpcbind_set	= svc_generic_rpcbind_set,

};

fs/nfs/callback_xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 


out_invalidcred:

	pr_warn_ratelimited("NFS: NFSv4 callback contains invalid cred\n");

	return rpc_autherr_badcred;

	return svc_return_autherr(rqstp, rpc_autherr_badcred);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE