Commit 82f0a41e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.16-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull more NFS client updates from Trond Myklebust:
 "A few bugfixes and some small sunrpc latency/performance improvements
  before the merge window closes:

  Stable fixes:

   - fix an incorrect calculation of the RDMA send scatter gather
     element limit

   - fix an Oops when attempting to free resources after RDMA device
     removal

  Bugfixes:

   - SUNRPC: Ensure we always release the TCP socket in a timely fashion
     when the connection is shut down.

   - SUNRPC: Don't call __UDPX_INC_STATS() from a preemptible context

  Latency/Performance:

   - SUNRPC: Queue latency sensitive socket tasks to the less contended
     xprtiod queue

   - SUNRPC: Make the xprtiod workqueue unbounded.

   - SUNRPC: Make the rpciod workqueue unbounded"

* tag 'nfs-for-4.16-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Don't call __UDPX_INC_STATS() from a preemptible context
  fix parallelism for rpc tasks
  Make the xprtiod workqueue unbounded.
  SUNRPC: Queue latency-sensitive socket tasks to xprtiod
  SUNRPC: Ensure we always close the socket after a connection shuts down
  xprtrdma: Fix BUG after a device removal
  xprtrdma: Fix calculation of ri_max_send_sges
parents 858f45bf 0afa6b44

include/linux/sunrpc/sched.h

+3 −0
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ void rpc_sleep_on_priority(struct rpc_wait_queue *, 
					struct rpc_task *,

					rpc_action action,

					int priority);

void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq,

		struct rpc_wait_queue *queue,

		struct rpc_task *task);

void		rpc_wake_up_queued_task(struct rpc_wait_queue *,

					struct rpc_task *);

void		rpc_wake_up(struct rpc_wait_queue *);

net/sunrpc/sched.c

+14 −2
Original line number Diff line number Diff line
@@ -458,6 +458,18 @@ static void rpc_wake_up_task_queue_locked(struct rpc_wait_queue *queue, struct r 
	rpc_wake_up_task_on_wq_queue_locked(rpciod_workqueue, queue, task);

}



/*

 * Wake up a task on a specific queue

 */

void rpc_wake_up_queued_task_on_wq(struct workqueue_struct *wq,

		struct rpc_wait_queue *queue,

		struct rpc_task *task)

{

	spin_lock_bh(&queue->lock);

	rpc_wake_up_task_on_wq_queue_locked(wq, queue, task);

	spin_unlock_bh(&queue->lock);

}



/*

 * Wake up a task on a specific queue

 */
@@ -1092,12 +1104,12 @@ static int rpciod_start(void) 
	 * Create the rpciod thread and wait for it to start.

	 */

	dprintk("RPC:       creating workqueue rpciod\n");

	wq = alloc_workqueue("rpciod", WQ_MEM_RECLAIM, 0);

	wq = alloc_workqueue("rpciod", WQ_MEM_RECLAIM | WQ_UNBOUND, 0);

	if (!wq)

		goto out_failed;

	rpciod_workqueue = wq;

	/* Note: highpri because network receive is latency sensitive */

	wq = alloc_workqueue("xprtiod", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);

	wq = alloc_workqueue("xprtiod", WQ_UNBOUND|WQ_MEM_RECLAIM|WQ_HIGHPRI, 0);

	if (!wq)

		goto free_rpciod;

	xprtiod_workqueue = wq;

net/sunrpc/xprt.c

+2 −1
Original line number Diff line number Diff line
@@ -517,7 +517,8 @@ void xprt_write_space(struct rpc_xprt *xprt) 
	if (xprt->snd_task) {

		dprintk("RPC:       write space: waking waiting task on "

				"xprt %p\n", xprt);

		rpc_wake_up_queued_task(&xprt->pending, xprt->snd_task);

		rpc_wake_up_queued_task_on_wq(xprtiod_workqueue,

				&xprt->pending, xprt->snd_task);

	}

	spin_unlock_bh(&xprt->transport_lock);

}

net/sunrpc/xprtrdma/rpc_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static bool rpcrdma_args_inline(struct rpcrdma_xprt *r_xprt, 
	if (xdr->page_len) {

		remaining = xdr->page_len;

		offset = offset_in_page(xdr->page_base);

		count = 0;

		count = RPCRDMA_MIN_SEND_SGES;

		while (remaining) {

			remaining -= min_t(unsigned int,

					   PAGE_SIZE - offset, remaining);

net/sunrpc/xprtrdma/verbs.c

+4 −4
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
		pr_warn("rpcrdma: HCA provides only %d send SGEs\n", max_sge);

		return -ENOMEM;

	}

	ia->ri_max_send_sges = max_sge - RPCRDMA_MIN_SEND_SGES;

	ia->ri_max_send_sges = max_sge;



	if (ia->ri_device->attrs.max_qp_wr <= RPCRDMA_BACKWARD_WRS) {

		dprintk("RPC:       %s: insufficient wqe's available\n",
@@ -1502,6 +1502,9 @@ __rpcrdma_dma_map_regbuf(struct rpcrdma_ia *ia, struct rpcrdma_regbuf *rb) 
static void

rpcrdma_dma_unmap_regbuf(struct rpcrdma_regbuf *rb)

{

	if (!rb)

		return;



	if (!rpcrdma_regbuf_is_mapped(rb))

		return;
@@ -1517,9 +1520,6 @@ rpcrdma_dma_unmap_regbuf(struct rpcrdma_regbuf *rb) 
void

rpcrdma_free_regbuf(struct rpcrdma_regbuf *rb)

{

	if (!rb)

		return;



	rpcrdma_dma_unmap_regbuf(rb);

	kfree(rb);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE