Commit 99d99825 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client updates from Anna Schumaker:
 "New Features:
   - Enable the NFS v4.2 READ_PLUS operation by default

  Stable Fixes:
   - NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info
   - NFS: Fix a potential data corruption

  Bugfixes:
   - Fix various READ_PLUS issues including:
      - smatch warnings
      - xdr size calculations
      - scratch buffer handling
      - 32bit / highmem xdr page handling
   - Fix checkpatch errors in file.c
   - Fix redundant readdir request after an EOF
   - Fix handling of COPY ERR_OFFLOAD_NO_REQ
   - Fix assignment of xprtdata.cred

  Cleanups:
   - Remove unused xprtrdma function declarations
   - Clean up an integer overflow check to avoid a warning
   - Clean up #includes in dns_resolve.c
   - Clean up nfs4_get_device_info so we don't pass a NULL pointer
     to __free_page()
   - Clean up sunrpc TCP socket timeout configuration
   - Guard against READDIR loops when entry names are too long
   - Use EXCHID4_FLAG_USE_PNFS_DS for DS servers"

* tag 'nfs-for-6.6-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (22 commits)
  pNFS: Fix assignment of xprtdata.cred
  NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ
  NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN
  NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server
  NFS/pNFS: Set the connect timeout for the pNFS flexfiles driver
  SUNRPC: Don't override connect timeouts in rpc_clnt_add_xprt()
  SUNRPC: Allow specification of TCP client connect timeout at setup
  SUNRPC: Refactor and simplify connect timeout
  SUNRPC: Set the TCP_SYNCNT to match the socket timeout
  NFS: Fix a potential data corruption
  nfs: fix redundant readdir request after get eof
  nfs/blocklayout: Use the passed in gfp flags
  filemap: Fix errors in file.c
  NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info
  NFS: Move common includes outside ifdef
  SUNRPC: clean up integer overflow check
  xprtrdma: Remove unused function declaration rpcrdma_bc_post_recv()
  NFS: Enable the READ_PLUS operation by default
  SUNRPC: kmap() the xdr pages during decode
  NFSv4.2: Rework scratch handling for READ_PLUS (again)
  ...
parents f35d1706 c4a123d2

fs/nfs/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -209,8 +209,6 @@ config NFS_DISABLE_UDP_SUPPORT 
config NFS_V4_2_READ_PLUS

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

	depends on NFS_V4_2

	default n

	default y

	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.
 
	 Choose Y here to enable use of the NFS v4.2 READ_PLUS operation.

fs/nfs/blocklayout/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ bl_parse_concat(struct nfs_server *server, struct pnfs_block_dev *d, 
	int ret, i;



	d->children = kcalloc(v->concat.volumes_count,

			sizeof(struct pnfs_block_dev), GFP_KERNEL);

			sizeof(struct pnfs_block_dev), gfp_mask);

	if (!d->children)

		return -ENOMEM;
@@ -433,7 +433,7 @@ bl_parse_stripe(struct nfs_server *server, struct pnfs_block_dev *d, 
	int ret, i;



	d->children = kcalloc(v->stripe.volumes_count,

			sizeof(struct pnfs_block_dev), GFP_KERNEL);

			sizeof(struct pnfs_block_dev), gfp_mask);

	if (!d->children)

		return -ENOMEM;

fs/nfs/client.c

+2 −0
Original line number Diff line number Diff line
@@ -517,6 +517,8 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		.authflavor	= flavor,

		.cred		= cl_init->cred,

		.xprtsec	= cl_init->xprtsec,

		.connect_timeout = cl_init->connect_timeout,

		.reconnect_timeout = cl_init->reconnect_timeout,

	};



	if (test_bit(NFS_CS_DISCRTRY, &clp->cl_flags))

fs/nfs/dir.c

+11 −4
Original line number Diff line number Diff line
@@ -1089,6 +1089,17 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc, 
	for (i = desc->cache_entry_index; i < array->size; i++) {

		struct nfs_cache_array_entry *ent;



		/*

		 * nfs_readdir_handle_cache_misses return force clear at

		 * (cache_misses > NFS_READDIR_CACHE_MISS_THRESHOLD) for

		 * readdir heuristic, NFS_READDIR_CACHE_MISS_THRESHOLD + 1

		 * entries need be emitted here.

		 */

		if (first_emit && i > NFS_READDIR_CACHE_MISS_THRESHOLD + 2) {

			desc->eob = true;

			break;

		}



		ent = &array->array[i];

		if (!dir_emit(desc->ctx, ent->name, ent->name_len,

		    nfs_compat_user_ino64(ent->ino), ent->d_type)) {
@@ -1107,10 +1118,6 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc, 
			desc->ctx->pos = desc->dir_cookie;

		else

			desc->ctx->pos++;

		if (first_emit && i > NFS_READDIR_CACHE_MISS_THRESHOLD + 1) {

			desc->eob = true;

			break;

		}

	}

	if (array->folio_is_eof)

		desc->eof = !desc->eob;

fs/nfs/direct.c

+19 −1
Original line number Diff line number Diff line
@@ -472,13 +472,31 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter, 
	return result;

}



static void nfs_direct_add_page_head(struct list_head *list,

				     struct nfs_page *req)

{

	struct nfs_page *head = req->wb_head;



	if (!list_empty(&head->wb_list) || !nfs_lock_request(head))

		return;

	if (!list_empty(&head->wb_list)) {

		nfs_unlock_request(head);

		return;

	}

	list_add(&head->wb_list, list);

	kref_get(&head->wb_kref);

	kref_get(&head->wb_kref);

}



static void nfs_direct_join_group(struct list_head *list, struct inode *inode)

{

	struct nfs_page *req, *subreq;



	list_for_each_entry(req, list, wb_list) {

		if (req->wb_head != req)

		if (req->wb_head != req) {

			nfs_direct_add_page_head(&req->wb_list, req);

			continue;

		}

		subreq = req->wb_this_page;

		if (subreq == req)

			continue;