Commit e394ff83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd updates from Chuck Lever:
 "Work on 'courteous server', which was introduced in 5.19, continues
  apace. This release introduces a more flexible limit on the number of
  NFSv4 clients that NFSD allows, now that NFSv4 clients can remain in
  courtesy state long after the lease expiration timeout. The client
  limit is adjusted based on the physical memory size of the server.

  The NFSD filecache is a cache of files held open by NFSv4 clients or
  recently touched by NFSv2 or NFSv3 clients. This cache had some
  significant scalability constraints that have been relieved in this
  release. Thanks to all who contributed to this work.

  A data corruption bug found during the most recent NFS bake-a-thon
  that involves NFSv3 and NFSv4 clients writing the same file has been
  addressed in this release.

  This release includes several improvements in CPU scalability for
  NFSv4 operations. In addition, Neil Brown provided patches that
  simplify locking during file lookup, creation, rename, and removal
  that enables subsequent work on making these operations more scalable.
  We expect to see that work materialize in the next release.

  There are also numerous single-patch fixes, clean-ups, and the usual
  improvements in observability"

* tag 'nfsd-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (78 commits)
  lockd: detect and reject lock arguments that overflow
  NFSD: discard fh_locked flag and fh_lock/fh_unlock
  NFSD: use (un)lock_inode instead of fh_(un)lock for file operations
  NFSD: use explicit lock/unlock for directory ops
  NFSD: reduce locking in nfsd_lookup()
  NFSD: only call fh_unlock() once in nfsd_link()
  NFSD: always drop directory lock in nfsd_unlink()
  NFSD: change nfsd_create()/nfsd_symlink() to unlock directory before returning.
  NFSD: add posix ACLs to struct nfsd_attrs
  NFSD: add security label to struct nfsd_attrs
  NFSD: set attributes when creating symlinks
  NFSD: introduce struct nfsd_attrs
  NFSD: verify the opened dentry after setting a delegation
  NFSD: drop fh argument from alloc_init_deleg
  NFSD: Move copy offload callback arguments into a separate structure
  NFSD: Add nfsd4_send_cb_offload()
  NFSD: Remove kmalloc from nfsd4_do_async_copy()
  NFSD: Refactor nfsd4_do_copy()
  NFSD: Refactor nfsd4_cleanup_inter_ssc() (2/2)
  NFSD: Refactor nfsd4_cleanup_inter_ssc() (1/2)
  ...
parents 15205c28 6930bcbf

Documentation/fault-injection/fault-injection.rst

+7 −0
Original line number Diff line number Diff line
@@ -169,6 +169,13 @@ configuration of fault-injection capabilities. 
	default is 'N', setting it to 'Y' will disable disconnect

	injection on the RPC server.



- /sys/kernel/debug/fail_sunrpc/ignore-cache-wait:



	Format: { 'Y' | 'N' }



	default is 'N', setting it to 'Y' will disable cache wait

	injection on the RPC server.



- /sys/kernel/debug/fail_function/inject:



	Format: { 'function-name' | '!function-name' | '' }

fs/lockd/svc4proc.c

+11 −1
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
	if (!nlmsvc_ops)

		return nlm_lck_denied_nolocks;



	if (lock->lock_start > OFFSET_MAX ||

	    (lock->lock_len && ((lock->lock_len - 1) > (OFFSET_MAX - lock->lock_start))))

		return nlm4_fbig;



	/* Obtain host handle */

	if (!(host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len))

	 || (argp->monitor && nsm_monitor(host) < 0))
@@ -50,6 +54,10 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
		/* Set up the missing parts of the file_lock structure */

		lock->fl.fl_file  = file->f_file[mode];

		lock->fl.fl_pid = current->tgid;

		lock->fl.fl_start = (loff_t)lock->lock_start;

		lock->fl.fl_end = lock->lock_len ?

				   (loff_t)(lock->lock_start + lock->lock_len - 1) :

				   OFFSET_MAX;

		lock->fl.fl_lmops = &nlmsvc_lock_operations;

		nlmsvc_locks_init_private(&lock->fl, host, (pid_t)lock->svid);

		if (!lock->fl.fl_owner) {
@@ -87,6 +95,7 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) 
	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	struct nlm_lockowner *test_owner;

	__be32 rc = rpc_success;



	dprintk("lockd: TEST4        called\n");
@@ -96,6 +105,7 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) 
	if ((resp->status = nlm4svc_retrieve_args(rqstp, argp, &host, &file)))

		return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;



	test_owner = argp->lock.fl.fl_owner;

	/* Now check for conflicting locks */

	resp->status = nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie);

	if (resp->status == nlm_drop_reply)
@@ -103,7 +113,7 @@ __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) 
	else

		dprintk("lockd: TEST4        status %d\n", ntohl(resp->status));



	nlmsvc_release_lockowner(&argp->lock);

	nlmsvc_put_lockowner(test_owner);

	nlmsvc_release_host(host);

	nlm_release_file(file);

	return rc;

fs/lockd/svclock.c

+1 −9
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ nlmsvc_get_lockowner(struct nlm_lockowner *lockowner) 
	return lockowner;

}



static void nlmsvc_put_lockowner(struct nlm_lockowner *lockowner)

void nlmsvc_put_lockowner(struct nlm_lockowner *lockowner)

{

	if (!refcount_dec_and_lock(&lockowner->count, &lockowner->host->h_lock))

		return;
@@ -590,7 +590,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, 
	int			error;

	int			mode;

	__be32			ret;

	struct nlm_lockowner	*test_owner;



	dprintk("lockd: nlmsvc_testlock(%s/%ld, ty=%d, %Ld-%Ld)\n",

				nlmsvc_file_inode(file)->i_sb->s_id,
@@ -604,9 +603,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, 
		goto out;

	}



	/* If there's a conflicting lock, remember to clean up the test lock */

	test_owner = (struct nlm_lockowner *)lock->fl.fl_owner;



	mode = lock_to_openmode(&lock->fl);

	error = vfs_test_lock(file->f_file[mode], &lock->fl);

	if (error) {
@@ -635,10 +631,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file, 
	conflock->fl.fl_end = lock->fl.fl_end;

	locks_release_private(&lock->fl);



	/* Clean up the test lock */

	lock->fl.fl_owner = NULL;

	nlmsvc_put_lockowner(test_owner);



	ret = nlm_lck_denied;

out:

	return ret;

fs/lockd/svcproc.c

+4 −1
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) 
	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	struct nlm_lockowner *test_owner;

	__be32 rc = rpc_success;



	dprintk("lockd: TEST          called\n");
@@ -125,6 +126,8 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) 
	if ((resp->status = nlmsvc_retrieve_args(rqstp, argp, &host, &file)))

		return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;



	test_owner = argp->lock.fl.fl_owner;



	/* Now check for conflicting locks */

	resp->status = cast_status(nlmsvc_testlock(rqstp, file, host, &argp->lock, &resp->lock, &resp->cookie));

	if (resp->status == nlm_drop_reply)
@@ -133,7 +136,7 @@ __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp) 
		dprintk("lockd: TEST          status %d vers %d\n",

			ntohl(resp->status), rqstp->rq_vers);



	nlmsvc_release_lockowner(&argp->lock);

	nlmsvc_put_lockowner(test_owner);

	nlmsvc_release_host(host);

	nlm_release_file(file);

	return rc;

fs/lockd/xdr4.c

+2 −17
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 


#include "svcxdr.h"



static inline loff_t

s64_to_loff_t(__s64 offset)

{

	return (loff_t)offset;

}





static inline s64

loff_t_to_s64(loff_t offset)

{
@@ -70,8 +63,6 @@ static bool 
svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)

{

	struct file_lock *fl = &lock->fl;

	u64 len, start;

	s64 end;



	if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len))

		return false;
@@ -81,20 +72,14 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock) 
		return false;

	if (xdr_stream_decode_u32(xdr, &lock->svid) < 0)

		return false;

	if (xdr_stream_decode_u64(xdr, &start) < 0)

	if (xdr_stream_decode_u64(xdr, &lock->lock_start) < 0)

		return false;

	if (xdr_stream_decode_u64(xdr, &len) < 0)

	if (xdr_stream_decode_u64(xdr, &lock->lock_len) < 0)

		return false;



	locks_init_lock(fl);

	fl->fl_flags = FL_POSIX;

	fl->fl_type  = F_RDLCK;

	end = start + len - 1;

	fl->fl_start = s64_to_loff_t(start);

	if (len == 0 || end < 0)

		fl->fl_end = OFFSET_MAX;

	else

		fl->fl_end = s64_to_loff_t(end);



	return true;

}