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

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

Pull nfsd fixes from Chuck Lever:

 - Address a slow memory leak with RPC-over-TCP

 - Prevent another NFS4ERR_DELAY loop during CREATE_SESSION

* tag 'nfsd-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: hold a lighter-weight client reference over CB_RECALL_ANY
  SUNRPC: Fix a slow server-side memory leak with RPC-over-TCP
parents cf17b950 10396f4d

fs/nfsd/nfs4state.c

+2 −5
Original line number Diff line number Diff line
@@ -3042,12 +3042,9 @@ static void 
nfsd4_cb_recall_any_release(struct nfsd4_callback *cb)

{

	struct nfs4_client *clp = cb->cb_clp;

	struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id);



	spin_lock(&nn->client_lock);

	clear_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags);

	put_client_renew_locked(clp);

	spin_unlock(&nn->client_lock);

	drop_client(clp);

}



static int
@@ -6616,7 +6613,7 @@ deleg_reaper(struct nfsd_net *nn) 
		list_add(&clp->cl_ra_cblist, &cblist);



		/* release in nfsd4_cb_recall_any_release */

		atomic_inc(&clp->cl_rpc_users);

		kref_get(&clp->cl_nfsdfs.cl_ref);

		set_bit(NFSD4_CLIENT_CB_RECALL_ANY, &clp->cl_flags);

		clp->cl_ra_time = ktime_get_boottime_seconds();

	}

net/sunrpc/svcsock.c

+1 −9
Original line number Diff line number Diff line
@@ -1206,15 +1206,6 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) 
 * MSG_SPLICE_PAGES is used exclusively to reduce the number of

 * copy operations in this path. Therefore the caller must ensure

 * that the pages backing @xdr are unchanging.

 *

 * Note that the send is non-blocking. The caller has incremented

 * the reference count on each page backing the RPC message, and

 * the network layer will "put" these pages when transmission is

 * complete.

 *

 * This is safe for our RPC services because the memory backing

 * the head and tail components is never kmalloc'd. These always

 * come from pages in the svc_rqst::rq_pages array.

 */

static int svc_tcp_sendmsg(struct svc_sock *svsk, struct svc_rqst *rqstp,

			   rpc_fraghdr marker, unsigned int *sentp)
@@ -1244,6 +1235,7 @@ static int svc_tcp_sendmsg(struct svc_sock *svsk, struct svc_rqst *rqstp, 
	iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, rqstp->rq_bvec,

		      1 + count, sizeof(marker) + rqstp->rq_res.len);

	ret = sock_sendmsg(svsk->sk_sock, &msg);

	page_frag_free(buf);

	if (ret < 0)

		return ret;

	*sentp += ret;