Commit 070a542f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client updates from Anna Schumaker:
 "New Features:
   - Add a Kconfig option to redirect dfprintk() to the trace buffer
   - Enable use of the RWF_DONTCACHE flag on the NFS client
   - Add striped layout handling to pNFS flexfiles
   - Add proper localio handling for READ and WRITE O_DIRECT

  Bugfixes:
   - Handle NFS4ERR_GRACE errors during delegation recall
   - Fix NFSv4.1 backchannel max_resp_sz verification check
   - Fix mount hang after CREATE_SESSION failure
   - Fix d_parent->d_inode locking in nfs4_setup_readdir()

  Other Cleanups and Improvements:
   - Improvements to write handling tracepoints
   - Fix a few trivial spelling mistakes
   - Cleanups to the rpcbind cleanup call sites
   - Convert the SUNRPC xdr_buf to use a scratch folio instead of
     scratch page
   - Remove unused NFS_WBACK_BUSY() macro
   - Remove __GFP_NOWARN flags
   - Unexport rpc_malloc() and rpc_free()"

* tag 'nfs-for-6.18-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (46 commits)
  NFS: add basic STATX_DIOALIGN and STATX_DIO_READ_ALIGN support
  nfs/localio: add tracepoints for misaligned DIO READ and WRITE support
  nfs/localio: add proper O_DIRECT support for READ and WRITE
  nfs/localio: refactor iocb initialization
  nfs/localio: refactor iocb and iov_iter_bvec initialization
  nfs/localio: avoid issuing misaligned IO using O_DIRECT
  nfs/localio: make trace_nfs_local_open_fh more useful
  NFSD: filecache: add STATX_DIOALIGN and STATX_DIO_READ_ALIGN support
  sunrpc: unexport rpc_malloc() and rpc_free()
  NFSv4/flexfiles: Add support for striped layouts
  NFSv4/flexfiles: Update layout stats & error paths for striped layouts
  NFSv4/flexfiles: Write path updates for striped layouts
  NFSv4/flexfiles: Commit path updates for striped layouts
  NFSv4/flexfiles: Read path updates for striped layouts
  NFSv4/flexfiles: Update low level helper functions to be DS stripe aware.
  NFSv4/flexfiles: Add data structure support for striped layouts
  NFSv4/flexfiles: Use ds_commit_idx when marking a write commit
  NFSv4/flexfiles: Remove cred local variable dependency
  nfs4_setup_readdir(): insufficient locking for ->d_parent->d_inode dereferencing
  NFS: Enable use of the RWF_DONTCACHE flag on the NFS client
  ...
parents 63e62baa 1f0d4ab0

fs/lockd/svc.c

+2 −4
Original line number Diff line number Diff line
@@ -216,8 +216,7 @@ static int make_socks(struct svc_serv *serv, struct net *net, 
	if (warned++ == 0)

		printk(KERN_WARNING

			"lockd_up: makesock failed, error=%d\n", err);

	svc_xprt_destroy_all(serv, net);

	svc_rpcb_cleanup(serv, net);

	svc_xprt_destroy_all(serv, net, true);

	return err;

}
@@ -255,8 +254,7 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net) 
			nlm_shutdown_hosts_net(net);

			cancel_delayed_work_sync(&ln->grace_period_end);

			locks_end_grace(&ln->lockd_manager);

			svc_xprt_destroy_all(serv, net);

			svc_rpcb_cleanup(serv, net);

			svc_xprt_destroy_all(serv, net, true);

		}

	} else {

		pr_err("%s: no users! net=%x\n",

fs/nfs/blocklayout/blocklayout.c

+4 −4
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr, 
	struct pnfs_layout_segment *lseg;

	struct xdr_buf buf;

	struct xdr_stream xdr;

	struct page *scratch;

	struct folio *scratch;

	int status, i;

	uint32_t count;

	__be32 *p;
@@ -689,13 +689,13 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr, 
		return ERR_PTR(-ENOMEM);



	status = -ENOMEM;

	scratch = alloc_page(gfp_mask);

	scratch = folio_alloc(gfp_mask, 0);

	if (!scratch)

		goto out;



	xdr_init_decode_pages(&xdr, &buf,

			lgr->layoutp->pages, lgr->layoutp->len);

	xdr_set_scratch_page(&xdr, scratch);

	xdr_set_scratch_folio(&xdr, scratch);



	status = -EIO;

	p = xdr_inline_decode(&xdr, 4);
@@ -744,7 +744,7 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, struct nfs4_layoutget_res *lgr, 
	}



out_free_scratch:

	__free_page(scratch);

	folio_put(scratch);

out:

	dprintk("%s returns %d\n", __func__, status);

	switch (status) {

fs/nfs/blocklayout/dev.c

+4 −4
Original line number Diff line number Diff line
@@ -541,16 +541,16 @@ bl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, 
	struct pnfs_block_dev *top;

	struct xdr_stream xdr;

	struct xdr_buf buf;

	struct page *scratch;

	struct folio *scratch;

	int nr_volumes, ret, i;

	__be32 *p;



	scratch = alloc_page(gfp_mask);

	scratch = folio_alloc(gfp_mask, 0);

	if (!scratch)

		goto out;



	xdr_init_decode_pages(&xdr, &buf, pdev->pages, pdev->pglen);

	xdr_set_scratch_page(&xdr, scratch);

	xdr_set_scratch_folio(&xdr, scratch);



	p = xdr_inline_decode(&xdr, sizeof(__be32));

	if (!p)
@@ -582,7 +582,7 @@ bl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, 
out_free_volumes:

	kfree(volumes);

out_free_scratch:

	__free_page(scratch);

	folio_put(scratch);

out:

	return node;

}

fs/nfs/callback.c

+4 −6
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc 
		return;



	dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum);

	svc_xprt_destroy_all(serv, net);

	svc_xprt_destroy_all(serv, net, false);

}



static int nfs_callback_up_net(int minorversion, struct svc_serv *serv,
@@ -153,7 +153,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 
	ret = svc_bind(serv, net);

	if (ret < 0) {

		printk(KERN_WARNING "NFS: bind callback service failed\n");

		goto err_bind;

		goto err;

	}



	ret = 0;
@@ -166,13 +166,11 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 


	if (ret < 0) {

		printk(KERN_ERR "NFS: callback service start failed\n");

		goto err_socks;

		goto err;

	}

	return 0;



err_socks:

	svc_rpcb_cleanup(serv, net);

err_bind:

err:

	nn->cb_users[minorversion]--;

	dprintk("NFS: Couldn't create callback socket: err = %d; "

			"net = %x\n", ret, net->ns.inum);

fs/nfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -829,17 +829,17 @@ static int nfs_readdir_folio_filler(struct nfs_readdir_descriptor *desc, 
	struct address_space *mapping = desc->file->f_mapping;

	struct folio *new, *folio = *arrays;

	struct xdr_stream stream;

	struct page *scratch;

	struct folio *scratch;

	struct xdr_buf buf;

	u64 cookie;

	int status;



	scratch = alloc_page(GFP_KERNEL);

	scratch = folio_alloc(GFP_KERNEL, 0);

	if (scratch == NULL)

		return -ENOMEM;



	xdr_init_decode_pages(&stream, &buf, xdr_pages, buflen);

	xdr_set_scratch_page(&stream, scratch);

	xdr_set_scratch_folio(&stream, scratch);



	do {

		status = nfs_readdir_entry_decode(desc, entry, &stream);
@@ -891,7 +891,7 @@ static int nfs_readdir_folio_filler(struct nfs_readdir_descriptor *desc, 
	if (folio != *arrays)

		nfs_readdir_folio_unlock_and_put(folio);



	put_page(scratch);

	folio_put(scratch);

	return status;

}