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

Merge tag 'nfs-for-5.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client updates from Trond Myklebust:
 "Highlights include:

  Stable fixes:
   - Fixes for NFS I/O request leakages
   - Fix error handling paths in the NFS I/O recoalescing code
   - Reinitialise NFSv4.1 sequence results before retransmitting a
     request
   - Fix a soft lockup in the delegation recovery code
   - Bulk destroy of layouts needs to be safe w.r.t. umount
   - Prevent thundering herd issues when the SUNRPC socket is not
     connected
   - Respect RPC call timeouts when retrying transmission

  Features:
   - Convert rpc auth layer to use xdr_streams
   - Config option to disable insecure RPCSEC_GSS crypto types
   - Reduce size of RPC receive buffers
   - Readdirplus optimization by cache mechanism
   - Convert SUNRPC socket send code to use iov_iter()
   - SUNRPC micro-optimisations to avoid indirect calls
   - Add support for the pNFS LAYOUTERROR operation and use it with the
     pNFS/flexfiles driver
   - Add trace events to report non-zero NFS status codes
   - Various removals of unnecessary dprintks

  Bugfixes and cleanups:
   - Fix a number of sparse warnings and documentation format warnings
   - Fix nfs_parse_devname to not modify it's argument
   - Fix potential corruption of page being written through pNFS/blocks
   - fix xfstest generic/099 failures on nfsv3
   - Avoid NFSv4.1 "false retries" when RPC calls are interrupted
   - Abort I/O early if the pNFS/flexfiles layout segment was
     invalidated
   - Avoid unnecessary pNFS/flexfiles layout invalidations"

* tag 'nfs-for-5.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (90 commits)
  SUNRPC: Take the transport send lock before binding+connecting
  SUNRPC: Micro-optimise when the task is known not to be sleeping
  SUNRPC: Check whether the task was transmitted before rebind/reconnect
  SUNRPC: Remove redundant calls to RPC_IS_QUEUED()
  SUNRPC: Clean up
  SUNRPC: Respect RPC call timeouts when retrying transmission
  SUNRPC: Fix up RPC back channel transmission
  SUNRPC: Prevent thundering herd when the socket is not connected
  SUNRPC: Allow dynamic allocation of back channel slots
  NFSv4.1: Bump the default callback session slot count to 16
  SUNRPC: Convert remaining GFP_NOIO, and GFP_NOWAIT sites in sunrpc
  NFS/flexfiles: Clean up mirror DS initialisation
  NFS/flexfiles: Remove dead code in ff_layout_mirror_valid()
  NFS/flexfile: Simplify nfs4_ff_layout_select_ds_stateid()
  NFS/flexfile: Simplify nfs4_ff_layout_ds_version()
  NFS/flexfiles: Simplify ff_layout_get_ds_cred()
  NFS/flexfiles: Simplify nfs4_ff_find_or_create_ds_client()
  NFS/flexfiles: Simplify nfs4_ff_layout_select_ds_fh()
  NFS/flexfiles: Speed up read failover when DSes are down
  NFS/flexfiles: Don't invalidate DS deviceids for being unresponsive
  ...
parents f88c5942 4d6c671a

fs/lockd/clnt4xdr.c

+0 −14
Original line number Diff line number Diff line
@@ -74,17 +74,6 @@ static void nlm4_compute_offsets(const struct nlm_lock *lock, 
		*l_len = loff_t_to_s64(fl->fl_end - fl->fl_start + 1);

}



/*

 * Handle decode buffer overflows out-of-line.

 */

static void print_overflow_msg(const char *func, const struct xdr_stream *xdr)

{

	dprintk("lockd: %s prematurely hit the end of our receive buffer. "

		"Remaining buffer length is %tu words.\n",

		func, xdr->end - xdr->p);

}





/*

 * Encode/decode NLMv4 basic data types

 *
@@ -176,7 +165,6 @@ out_size: 
	dprintk("NFS: returned cookie was too long: %u\n", length);

	return -EIO;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}
@@ -236,7 +224,6 @@ out_bad_xdr: 
			__func__, be32_to_cpup(p));

	return -EIO;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}
@@ -309,7 +296,6 @@ static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result) 
out:

	return error;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}

fs/lockd/clntxdr.c

+0 −14
Original line number Diff line number Diff line
@@ -70,17 +70,6 @@ static void nlm_compute_offsets(const struct nlm_lock *lock, 
		*l_len = loff_t_to_s32(fl->fl_end - fl->fl_start + 1);

}



/*

 * Handle decode buffer overflows out-of-line.

 */

static void print_overflow_msg(const char *func, const struct xdr_stream *xdr)

{

	dprintk("lockd: %s prematurely hit the end of our receive buffer. "

		"Remaining buffer length is %tu words.\n",

		func, xdr->end - xdr->p);

}





/*

 * Encode/decode NLMv3 basic data types

 *
@@ -173,7 +162,6 @@ out_size: 
	dprintk("NFS: returned cookie was too long: %u\n", length);

	return -EIO;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}
@@ -231,7 +219,6 @@ out_enum: 
		__func__, be32_to_cpup(p));

	return -EIO;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}
@@ -303,7 +290,6 @@ static int decode_nlm_holder(struct xdr_stream *xdr, struct nlm_res *result) 
out:

	return error;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;

}

fs/nfs/callback_xdr.c

+28 −36
Original line number Diff line number Diff line
@@ -72,16 +72,6 @@ static int nfs4_encode_void(struct svc_rqst *rqstp, __be32 *p) 
	return xdr_ressize_check(rqstp, p);

}



static __be32 *read_buf(struct xdr_stream *xdr, size_t nbytes)

{

	__be32 *p;



	p = xdr_inline_decode(xdr, nbytes);

	if (unlikely(p == NULL))

		printk(KERN_WARNING "NFS: NFSv4 callback reply buffer overflowed!\n");

	return p;

}



static __be32 decode_string(struct xdr_stream *xdr, unsigned int *len,

		const char **str, size_t maxlen)

{
@@ -98,13 +88,13 @@ static __be32 decode_fh(struct xdr_stream *xdr, struct nfs_fh *fh) 
{

	__be32 *p;



	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	fh->size = ntohl(*p);

	if (fh->size > NFS4_FHSIZE)

		return htonl(NFS4ERR_BADHANDLE);

	p = read_buf(xdr, fh->size);

	p = xdr_inline_decode(xdr, fh->size);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	memcpy(&fh->data[0], p, fh->size);
@@ -117,11 +107,11 @@ static __be32 decode_bitmap(struct xdr_stream *xdr, uint32_t *bitmap) 
	__be32 *p;

	unsigned int attrlen;



	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	attrlen = ntohl(*p);

	p = read_buf(xdr, attrlen << 2);

	p = xdr_inline_decode(xdr, attrlen << 2);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	if (likely(attrlen > 0))
@@ -135,7 +125,7 @@ static __be32 decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid) 
{

	__be32 *p;



	p = read_buf(xdr, NFS4_STATEID_SIZE);

	p = xdr_inline_decode(xdr, NFS4_STATEID_SIZE);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	memcpy(stateid->data, p, NFS4_STATEID_SIZE);
@@ -156,7 +146,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
	status = decode_string(xdr, &hdr->taglen, &hdr->tag, CB_OP_TAGLEN_MAXSZ);

	if (unlikely(status != 0))

		return status;

	p = read_buf(xdr, 12);

	p = xdr_inline_decode(xdr, 12);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	hdr->minorversion = ntohl(*p++);
@@ -176,7 +166,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound 
static __be32 decode_op_hdr(struct xdr_stream *xdr, unsigned int *op)

{

	__be32 *p;

	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE_HDR);

	*op = ntohl(*p);
@@ -205,7 +195,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, 
	status = decode_delegation_stateid(xdr, &args->stateid);

	if (unlikely(status != 0))

		return status;

	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	args->truncate = ntohl(*p);
@@ -227,7 +217,7 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp, 
	__be32 status = 0;

	uint32_t iomode;



	p = read_buf(xdr, 4 * sizeof(uint32_t));

	p = xdr_inline_decode(xdr, 4 * sizeof(uint32_t));

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);
@@ -245,14 +235,14 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp, 
		if (unlikely(status != 0))

			return status;



		p = read_buf(xdr, 2 * sizeof(uint64_t));

		p = xdr_inline_decode(xdr, 2 * sizeof(uint64_t));

		if (unlikely(p == NULL))

			return htonl(NFS4ERR_BADXDR);

		p = xdr_decode_hyper(p, &args->cbl_range.offset);

		p = xdr_decode_hyper(p, &args->cbl_range.length);

		return decode_layout_stateid(xdr, &args->cbl_stateid);

	} else if (args->cbl_recall_type == RETURN_FSID) {

		p = read_buf(xdr, 2 * sizeof(uint64_t));

		p = xdr_inline_decode(xdr, 2 * sizeof(uint64_t));

		if (unlikely(p == NULL))

			return htonl(NFS4ERR_BADXDR);

		p = xdr_decode_hyper(p, &args->cbl_fsid.major);
@@ -275,7 +265,7 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, 
	args->ndevs = 0;



	/* Num of device notifications */

	p = read_buf(xdr, sizeof(uint32_t));

	p = xdr_inline_decode(xdr, sizeof(uint32_t));

	if (unlikely(p == NULL)) {

		status = htonl(NFS4ERR_BADXDR);

		goto out;
@@ -298,7 +288,8 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, 
	for (i = 0; i < n; i++) {

		struct cb_devicenotifyitem *dev = &args->devs[i];



		p = read_buf(xdr, (4 * sizeof(uint32_t)) + NFS4_DEVICEID4_SIZE);

		p = xdr_inline_decode(xdr, (4 * sizeof(uint32_t)) +

				      NFS4_DEVICEID4_SIZE);

		if (unlikely(p == NULL)) {

			status = htonl(NFS4ERR_BADXDR);

			goto err;
@@ -329,7 +320,7 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, 
		p += XDR_QUADLEN(NFS4_DEVICEID4_SIZE);



		if (dev->cbd_layout_type == NOTIFY_DEVICEID4_CHANGE) {

			p = read_buf(xdr, sizeof(uint32_t));

			p = xdr_inline_decode(xdr, sizeof(uint32_t));

			if (unlikely(p == NULL)) {

				status = htonl(NFS4ERR_BADXDR);

				goto err;
@@ -359,7 +350,7 @@ static __be32 decode_sessionid(struct xdr_stream *xdr, 
{

	__be32 *p;



	p = read_buf(xdr, NFS4_MAX_SESSIONID_LEN);

	p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);
@@ -379,13 +370,13 @@ static __be32 decode_rc_list(struct xdr_stream *xdr, 
		goto out;



	status = htonl(NFS4ERR_RESOURCE);

	p = read_buf(xdr, sizeof(uint32_t));

	p = xdr_inline_decode(xdr, sizeof(uint32_t));

	if (unlikely(p == NULL))

		goto out;



	rc_list->rcl_nrefcalls = ntohl(*p++);

	if (rc_list->rcl_nrefcalls) {

		p = read_buf(xdr,

		p = xdr_inline_decode(xdr,

			     rc_list->rcl_nrefcalls * 2 * sizeof(uint32_t));

		if (unlikely(p == NULL))

			goto out;
@@ -418,7 +409,7 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp, 
	if (status)

		return status;



	p = read_buf(xdr, 5 * sizeof(uint32_t));

	p = xdr_inline_decode(xdr, 5 * sizeof(uint32_t));

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);
@@ -461,7 +452,7 @@ static __be32 decode_recallany_args(struct svc_rqst *rqstp, 
	uint32_t bitmap[2];

	__be32 *p, status;



	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);

	args->craa_objs_to_keep = ntohl(*p++);
@@ -480,7 +471,7 @@ static __be32 decode_recallslot_args(struct svc_rqst *rqstp, 
	struct cb_recallslotargs *args = argp;

	__be32 *p;



	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);

	args->crsa_target_highest_slotid = ntohl(*p++);
@@ -492,14 +483,14 @@ static __be32 decode_lockowner(struct xdr_stream *xdr, struct cb_notify_lock_arg 
	__be32		*p;

	unsigned int	len;



	p = read_buf(xdr, 12);

	p = xdr_inline_decode(xdr, 12);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);



	p = xdr_decode_hyper(p, &args->cbnl_owner.clientid);

	len = be32_to_cpu(*p);



	p = read_buf(xdr, len);

	p = xdr_inline_decode(xdr, len);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_BADXDR);
@@ -537,7 +528,7 @@ static __be32 decode_write_response(struct xdr_stream *xdr, 
	__be32 *p;



	/* skip the always zero field */

	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(!p))

		goto out;

	p++;
@@ -577,7 +568,7 @@ static __be32 decode_offload_args(struct svc_rqst *rqstp, 
		return status;



	/* decode status */

	p = read_buf(xdr, 4);

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(!p))

		goto out;

	args->error = ntohl(*p++);
@@ -943,10 +934,11 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
	};

	unsigned int nops = 0;



	xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);

	xdr_init_decode(&xdr_in, &rqstp->rq_arg,

			rqstp->rq_arg.head[0].iov_base, NULL);



	p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);

	xdr_init_encode(&xdr_out, &rqstp->rq_res, p);

	xdr_init_encode(&xdr_out, &rqstp->rq_res, p, NULL);



	status = decode_compound_hdr_arg(&xdr_in, &hdr_arg);

	if (status == htonl(NFS4ERR_RESOURCE))

fs/nfs/delegation.c

+13 −9
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ static struct inode *nfs_delegation_grab_inode(struct nfs_delegation *delegation 
	spin_lock(&delegation->lock);

	if (delegation->inode != NULL)

		inode = igrab(delegation->inode);

	if (!inode)

		set_bit(NFS_DELEGATION_INODE_FREEING, &delegation->flags);

	spin_unlock(&delegation->lock);

	return inode;

}
@@ -681,7 +683,7 @@ void nfs_expire_all_delegations(struct nfs_client *clp) 


/**

 * nfs_super_return_all_delegations - return delegations for one superblock

 * @sb: sb to process

 * @server: pointer to nfs_server to process

 *

 */

void nfs_server_return_all_delegations(struct nfs_server *server)
@@ -944,10 +946,11 @@ restart: 
	list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {

		list_for_each_entry_rcu(delegation, &server->delegations,

								super_list) {

			if (test_bit(NFS_DELEGATION_RETURNING,

						&delegation->flags))

				continue;

			if (test_bit(NFS_DELEGATION_NEED_RECLAIM,

			if (test_bit(NFS_DELEGATION_INODE_FREEING,

						&delegation->flags) ||

			    test_bit(NFS_DELEGATION_RETURNING,

						&delegation->flags) ||

			    test_bit(NFS_DELEGATION_NEED_RECLAIM,

						&delegation->flags) == 0)

				continue;

			if (!nfs_sb_active(server->super))
@@ -1053,10 +1056,11 @@ restart: 
	list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {

		list_for_each_entry_rcu(delegation, &server->delegations,

								super_list) {

			if (test_bit(NFS_DELEGATION_RETURNING,

						&delegation->flags))

				continue;

			if (test_bit(NFS_DELEGATION_TEST_EXPIRED,

			if (test_bit(NFS_DELEGATION_INODE_FREEING,

						&delegation->flags) ||

			    test_bit(NFS_DELEGATION_RETURNING,

						&delegation->flags) ||

			    test_bit(NFS_DELEGATION_TEST_EXPIRED,

						&delegation->flags) == 0)

				continue;

			if (!nfs_sb_active(server->super))

fs/nfs/delegation.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ enum { 
	NFS_DELEGATION_RETURNING,

	NFS_DELEGATION_REVOKED,

	NFS_DELEGATION_TEST_EXPIRED,

	NFS_DELEGATION_INODE_FREEING,

};



int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,

CRA Git | Maintained and supported by SUSTech CRA and CCSE