Commit 6840a3dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.10-3' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client fixes from Anna Schumaker:
 "Here are a handful more bugfixes for 5.10.

  Unfortunately, we found some problems with the new READ_PLUS operation
  that aren't easy to fix. We've decided to disable this codepath
  through a Kconfig option for now, but a series of patches going into
  5.11 will clean up the code and fix the issues at the same time. This
  seemed like the best way to go about it.

  Summary:

   - Fix array overflow when flexfiles mirroring is enabled

   - Fix rpcrdma_inline_fixup() crash with new LISTXATTRS

   - Fix 5 second delay when doing inter-server copy

   - Disable READ_PLUS by default"

* tag 'nfs-for-5.10-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  NFS: Disable READ_PLUS by default
  NFSv4.2: Fix 5 seconds delay when doing inter server copy
  NFS: Fix rpcrdma_inline_fixup() crash with new LISTXATTRS operation
  pNFS/flexfiles: Fix array overflow when flexfiles mirroring is enabled
parents 4d31058b 21e31401

fs/nfs/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -205,3 +205,12 @@ config NFS_DISABLE_UDP_SUPPORT 
	 Choose Y here to disable the use of NFS over UDP. NFS over UDP

	 on modern networks (1Gb+) can lead to data corruption caused by

	 fragmentation during high loads.



config NFS_V4_2_READ_PLUS

	bool "NFS: Enable support for the NFSv4.2 READ_PLUS operation"

	depends on NFS_V4_2

	default n

	help

	 This is intended for developers only. The READ_PLUS operation has

	 been shown to have issues under specific conditions and should not

	 be used in production.

fs/nfs/flexfilelayout/flexfilelayout.c

+21 −6
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ ff_layout_pg_init_read(struct nfs_pageio_descriptor *pgio, 
	struct nfs_pgio_mirror *pgm;

	struct nfs4_ff_layout_mirror *mirror;

	struct nfs4_pnfs_ds *ds;

	u32 ds_idx, i;

	u32 ds_idx;



retry:

	ff_layout_pg_check_layout(pgio, req);
@@ -864,11 +864,9 @@ retry: 
		goto retry;

	}



	for (i = 0; i < pgio->pg_mirror_count; i++) {

		mirror = FF_LAYOUT_COMP(pgio->pg_lseg, i);

		pgm = &pgio->pg_mirrors[i];

	mirror = FF_LAYOUT_COMP(pgio->pg_lseg, ds_idx);

	pgm = &pgio->pg_mirrors[0];

	pgm->pg_bsize = mirror->mirror_ds->ds_versions[0].rsize;

	}



	pgio->pg_mirror_idx = ds_idx;
@@ -985,6 +983,21 @@ out: 
	return 1;

}



static u32

ff_layout_pg_set_mirror_write(struct nfs_pageio_descriptor *desc, u32 idx)

{

	u32 old = desc->pg_mirror_idx;



	desc->pg_mirror_idx = idx;

	return old;

}



static struct nfs_pgio_mirror *

ff_layout_pg_get_mirror_write(struct nfs_pageio_descriptor *desc, u32 idx)

{

	return &desc->pg_mirrors[idx];

}



static const struct nfs_pageio_ops ff_layout_pg_read_ops = {

	.pg_init = ff_layout_pg_init_read,

	.pg_test = pnfs_generic_pg_test,
@@ -998,6 +1011,8 @@ static const struct nfs_pageio_ops ff_layout_pg_write_ops = { 
	.pg_doio = pnfs_generic_pg_writepages,

	.pg_get_mirror_count = ff_layout_pg_get_mirror_count_write,

	.pg_cleanup = pnfs_generic_pg_cleanup,

	.pg_get_mirror = ff_layout_pg_get_mirror_write,

	.pg_set_mirror = ff_layout_pg_set_mirror_write,

};



static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs)

fs/nfs/nfs42proc.c

+13 −8
Original line number Diff line number Diff line
@@ -1241,12 +1241,13 @@ static ssize_t _nfs42_proc_listxattrs(struct inode *inode, void *buf, 
		.rpc_resp	= &res,

	};

	u32 xdrlen;

	int ret, np;

	int ret, np, i;





	ret = -ENOMEM;

	res.scratch = alloc_page(GFP_KERNEL);

	if (!res.scratch)

		return -ENOMEM;

		goto out;



	xdrlen = nfs42_listxattr_xdrsize(buflen);

	if (xdrlen > server->lxasize)
@@ -1254,9 +1255,12 @@ static ssize_t _nfs42_proc_listxattrs(struct inode *inode, void *buf, 
	np = xdrlen / PAGE_SIZE + 1;



	pages = kcalloc(np, sizeof(struct page *), GFP_KERNEL);

	if (pages == NULL) {

		__free_page(res.scratch);

		return -ENOMEM;

	if (!pages)

		goto out_free_scratch;

	for (i = 0; i < np; i++) {

		pages[i] = alloc_page(GFP_KERNEL);

		if (!pages[i])

			goto out_free_pages;

	}



	arg.xattr_pages = pages;
@@ -1271,14 +1275,15 @@ static ssize_t _nfs42_proc_listxattrs(struct inode *inode, void *buf, 
		*eofp = res.eof;

	}



out_free_pages:

	while (--np >= 0) {

		if (pages[np])

			__free_page(pages[np]);

	}



	__free_page(res.scratch);

	kfree(pages);



out_free_scratch:

	__free_page(res.scratch);

out:

	return ret;



}

fs/nfs/nfs42xdr.c

+0 −1
Original line number Diff line number Diff line
@@ -1528,7 +1528,6 @@ static void nfs4_xdr_enc_listxattrs(struct rpc_rqst *req, 


	rpc_prepare_reply_pages(req, args->xattr_pages, 0, args->count,

	    hdr.replen);

	req->rq_rcv_buf.flags |= XDRBUF_SPARSE_PAGES;



	encode_nops(&hdr);

}

fs/nfs/nfs4file.c

+1 −1
Original line number Diff line number Diff line
@@ -377,10 +377,10 @@ static struct file *__nfs42_ssc_open(struct vfsmount *ss_mnt, 
		goto out_stateowner;



	set_bit(NFS_SRV_SSC_COPY_STATE, &ctx->state->flags);

	set_bit(NFS_OPEN_STATE, &ctx->state->flags);

	memcpy(&ctx->state->open_stateid.other, &stateid->other,

	       NFS4_STATEID_OTHER_SIZE);

	update_open_stateid(ctx->state, stateid, NULL, filep->f_mode);

	set_bit(NFS_OPEN_STATE, &ctx->state->flags);



	nfs_file_set_open_context(filep, ctx);

	put_nfs_open_context(ctx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE