Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abde9cc6 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe
Browse files

drbd: Improve asender performance 



Shorten receive path in the asender thread. Reduces CPU utilisation
of asender when receiving packets, and with that increases IOPs.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent b47a06d1

drivers/block/drbd/drbd_receiver.c

+6 −0
Original line number Diff line number Diff line
@@ -5561,6 +5561,7 @@ int drbd_asender(struct drbd_thread *thi) 
		 * rv <  expected: "woken" by signal during receive

		 * rv == 0	 : "connection shut down by peer"

		 */

received_more:

		if (likely(rv > 0)) {

			received += rv;

			buf	 += rv;
@@ -5636,6 +5637,11 @@ int drbd_asender(struct drbd_thread *thi) 
			expect	 = header_size;

			cmd	 = NULL;

		}

		if (test_bit(SEND_PING, &connection->flags))

			continue;

		rv = drbd_recv_short(connection->meta.socket, buf, expect-received, MSG_DONTWAIT);

		if (rv > 0)

			goto received_more;

	}



	if (0) {

drivers/block/drbd/drbd_worker.c

+1 −10
Original line number Diff line number Diff line
@@ -1994,22 +1994,13 @@ static bool dequeue_work_batch(struct drbd_work_queue *queue, struct list_head * 
	return !list_empty(work_list);

}



static bool dequeue_work_item(struct drbd_work_queue *queue, struct list_head *work_list)

{

	spin_lock_irq(&queue->q_lock);

	if (!list_empty(&queue->q))

		list_move(queue->q.next, work_list);

	spin_unlock_irq(&queue->q_lock);

	return !list_empty(work_list);

}



static void wait_for_work(struct drbd_connection *connection, struct list_head *work_list)

{

	DEFINE_WAIT(wait);

	struct net_conf *nc;

	int uncork, cork;



	dequeue_work_item(&connection->sender_work, work_list);

	dequeue_work_batch(&connection->sender_work, work_list);

	if (!list_empty(work_list))

		return;