Commit 06cbd26d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.2-1' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client updates from Anna Schumaker:
 "Highlights include:

  Stable bugfixes:
   - Fall back to MDS if no deviceid is found rather than aborting   # v4.11+
   - NFS4: Fix v4.0 client state corruption when mount

  Features:
   - Much improved handling of soft mounts with NFS v4.0:
       - Reduce risk of false positive timeouts
       - Faster failover of reads and writes after a timeout
       - Added a "softerr" mount option to return ETIMEDOUT instead of
         EIO to the application after a timeout
   - Increase number of xprtrdma backchannel requests
   - Add additional xprtrdma tracepoints
   - Improved send completion batching for xprtrdma

  Other bugfixes and cleanups:
   - Return -EINVAL when NFS v4.2 is passed an invalid dedup mode
   - Reduce usage of GFP_ATOMIC pages in SUNRPC
   - Various minor NFS over RDMA cleanups and bugfixes
   - Use the correct container namespace for upcalls
   - Don't share superblocks between user namespaces
   - Various other container fixes
   - Make nfs_match_client() killable to prevent soft lockups
   - Don't mark all open state for recovery when handling recallable
     state revoked flag"

* tag 'nfs-for-5.2-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (69 commits)
  SUNRPC: Rebalance a kref in auth_gss.c
  NFS: Fix a double unlock from nfs_match,get_client
  nfs: pass the correct prototype to read_cache_page
  NFSv4: don't mark all open state for recovery when handling recallable state revoked flag
  SUNRPC: Fix an error code in gss_alloc_msg()
  SUNRPC: task should be exit if encode return EKEYEXPIRED more times
  NFS4: Fix v4.0 client state corruption when mount
  PNFS fallback to MDS if no deviceid found
  NFS: make nfs_match_client killable
  lockd: Store the lockd client credential in struct nlm_host
  NFS: When mounting, don't share filesystems between different user namespaces
  NFS: Convert NFSv2 to use the container user namespace
  NFSv4: Convert the NFS client idmapper to use the container user namespace
  NFS: Convert NFSv3 to use the container user namespace
  SUNRPC: Use namespace of listening daemon in the client AUTH_GSS upcall
  SUNRPC: Use the client user namespace when encoding creds
  NFS: Store the credential of the mount process in the nfs_server
  SUNRPC: Cache cred of process creating the rpc_client
  xprtrdma: Remove stale comment
  xprtrdma: Update comments that reference ib_drain_qp
  ...
parents abde77eb 5940d1cf

fs/lockd/clntlock.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) 
	host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen,

				   nlm_init->protocol, nlm_version,

				   nlm_init->hostname, nlm_init->noresvport,

				   nlm_init->net);

				   nlm_init->net, nlm_init->cred);

	if (host == NULL)

		goto out_nohost;

	if (host->h_rpcclnt == NULL && nlm_bind_host(host) == NULL)

fs/lockd/clntproc.c

+2 −2
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static void nlmclnt_unlock_callback(struct rpc_task *task, void *data) 
	struct nlm_rqst	*req = data;

	u32 status = ntohl(req->a_res.status);



	if (RPC_ASSASSINATED(task))

	if (RPC_SIGNALLED(task))

		goto die;



	if (task->tk_status < 0) {
@@ -783,7 +783,7 @@ static void nlmclnt_cancel_callback(struct rpc_task *task, void *data) 
	struct nlm_rqst	*req = data;

	u32 status = ntohl(req->a_res.status);



	if (RPC_ASSASSINATED(task))

	if (RPC_SIGNALLED(task))

		goto die;



	if (task->tk_status < 0) {

fs/lockd/host.c

+9 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct nlm_lookup_host_info { 
	const size_t		hostname_len;	/* it's length */

	const int		noresvport;	/* use non-priv port */

	struct net		*net;		/* network namespace to bind */

	const struct cred	*cred;

};



/*
@@ -162,6 +163,7 @@ static struct nlm_host *nlm_alloc_host(struct nlm_lookup_host_info *ni, 
	host->h_nsmhandle  = nsm;

	host->h_addrbuf    = nsm->sm_addrbuf;

	host->net	   = ni->net;

	host->h_cred	   = get_cred(ni->cred),

	strlcpy(host->nodename, utsname()->nodename, sizeof(host->nodename));



out:
@@ -188,6 +190,7 @@ static void nlm_destroy_host_locked(struct nlm_host *host) 
	clnt = host->h_rpcclnt;

	if (clnt != NULL)

		rpc_shutdown_client(clnt);

	put_cred(host->h_cred);

	kfree(host);



	ln->nrhosts--;
@@ -202,6 +205,8 @@ static void nlm_destroy_host_locked(struct nlm_host *host) 
 * @version: NLM protocol version

 * @hostname: '\0'-terminated hostname of server

 * @noresvport: 1 if non-privileged port should be used

 * @net: pointer to net namespace

 * @cred: pointer to cred

 *

 * Returns an nlm_host structure that matches the passed-in

 * [server address, transport protocol, NLM version, server hostname].
@@ -214,7 +219,8 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, 
				     const u32 version,

				     const char *hostname,

				     int noresvport,

				     struct net *net)

				     struct net *net,

				     const struct cred *cred)

{

	struct nlm_lookup_host_info ni = {

		.server		= 0,
@@ -226,6 +232,7 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, 
		.hostname_len	= strlen(hostname),

		.noresvport	= noresvport,

		.net		= net,

		.cred		= cred,

	};

	struct hlist_head *chain;

	struct nlm_host	*host;
@@ -458,6 +465,7 @@ nlm_bind_host(struct nlm_host *host) 
			.authflavor	= RPC_AUTH_UNIX,

			.flags		= (RPC_CLNT_CREATE_NOPING |

					   RPC_CLNT_CREATE_AUTOBIND),

			.cred		= host->h_cred,

		};



		/*

fs/lockd/mon.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static struct rpc_clnt *nsm_create(struct net *net, const char *nodename) 
		.version		= NSM_VERSION,

		.authflavor		= RPC_AUTH_NULL,

		.flags			= RPC_CLNT_CREATE_NOPING,

		.cred			= current_cred(),

	};



	return rpc_create(&args);

fs/nfs/client.c

+15 −1
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat 
	struct nfs_client *clp;

	const struct sockaddr *sap = data->addr;

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

	int error;



again:

	list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {
@@ -296,9 +297,11 @@ again: 
		if (clp->cl_cons_state > NFS_CS_READY) {

			refcount_inc(&clp->cl_count);

			spin_unlock(&nn->nfs_client_lock);

			nfs_wait_client_init_complete(clp);

			error = nfs_wait_client_init_complete(clp);

			nfs_put_client(clp);

			spin_lock(&nn->nfs_client_lock);

			if (error < 0)

				return ERR_PTR(error);

			goto again;

		}
@@ -407,6 +410,8 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) 
		clp = nfs_match_client(cl_init);

		if (clp) {

			spin_unlock(&nn->nfs_client_lock);

			if (IS_ERR(clp))

				return clp;

			if (new)

				new->rpc_ops->free_client(new);

			return nfs_found_client(cl_init, clp);
@@ -500,6 +505,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		.program	= &nfs_program,

		.version	= clp->rpc_ops->version,

		.authflavor	= flavor,

		.cred		= cl_init->cred,

	};



	if (test_bit(NFS_CS_DISCRTRY, &clp->cl_flags))
@@ -598,6 +604,8 @@ int nfs_init_server_rpcclient(struct nfs_server *server, 
			sizeof(server->client->cl_timeout_default));

	server->client->cl_timeout = &server->client->cl_timeout_default;

	server->client->cl_softrtry = 0;

	if (server->flags & NFS_MOUNT_SOFTERR)

		server->client->cl_softerr = 1;

	if (server->flags & NFS_MOUNT_SOFT)

		server->client->cl_softrtry = 1;
@@ -652,6 +660,7 @@ static int nfs_init_server(struct nfs_server *server, 
		.proto = data->nfs_server.protocol,

		.net = data->net,

		.timeparms = &timeparms,

		.cred = server->cred,

	};

	struct nfs_client *clp;

	int error;
@@ -920,6 +929,7 @@ void nfs_free_server(struct nfs_server *server) 
	ida_destroy(&server->lockowner_id);

	ida_destroy(&server->openowner_id);

	nfs_free_iostats(server->io_stats);

	put_cred(server->cred);

	kfree(server);

	nfs_release_automount_timer();

}
@@ -940,6 +950,8 @@ struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info, 
	if (!server)

		return ERR_PTR(-ENOMEM);



	server->cred = get_cred(current_cred());



	error = -ENOMEM;

	fattr = nfs_alloc_fattr();

	if (fattr == NULL)
@@ -1006,6 +1018,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 
	if (!server)

		return ERR_PTR(-ENOMEM);



	server->cred = get_cred(source->cred);



	error = -ENOMEM;

	fattr_fsinfo = nfs_alloc_fattr();

	if (fattr_fsinfo == NULL)

CRA Git | Maintained and supported by SUSTech CRA and CCSE