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

Commit 2c4e518f authored by Jason Wang's avatar Jason Wang Committed by Greg Kroah-Hartman
Browse files

vhost_net: introduce vhost_exceeds_weight() 



commit 272f35cb upstream.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBalbir Singh <sblbir@amzn.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e9dac4ca

drivers/vhost/net.c

+8 −5
Original line number Diff line number Diff line
@@ -446,6 +446,12 @@ static bool vhost_exceeds_maxpend(struct vhost_net *net) 
		== nvq->done_idx;

}



static bool vhost_exceeds_weight(int pkts, int total_len)

{

	return total_len >= VHOST_NET_WEIGHT ||

	       pkts >= VHOST_NET_PKT_WEIGHT;

}



/* Expects to be always run from workqueue - which acts as

 * read-size critical section for our kind of RCU. */

static void handle_tx(struct vhost_net *net)
@@ -550,7 +556,6 @@ static void handle_tx(struct vhost_net *net) 
			msg.msg_control = NULL;

			ubufs = NULL;

		}



		total_len += len;

		if (total_len < VHOST_NET_WEIGHT &&

		    !vhost_vq_avail_empty(&net->dev, vq) &&
@@ -579,8 +584,7 @@ static void handle_tx(struct vhost_net *net) 
		else

			vhost_zerocopy_signal_used(net, vq);

		vhost_net_tx_packet(net);

		if (unlikely(total_len >= VHOST_NET_WEIGHT) ||

		    unlikely(++sent_pkts >= VHOST_NET_PKT_WEIGHT)) {

		if (unlikely(vhost_exceeds_weight(++sent_pkts, total_len))) {

			vhost_poll_queue(&vq->poll);

			break;

		}
@@ -863,8 +867,7 @@ static void handle_rx(struct vhost_net *net) 
			vhost_log_write(vq, vq_log, log, vhost_len,

					vq->iov, in);

		total_len += vhost_len;

		if (unlikely(total_len >= VHOST_NET_WEIGHT) ||

		    unlikely(++recv_pkts >= VHOST_NET_PKT_WEIGHT)) {

		if (unlikely(vhost_exceeds_weight(++recv_pkts, total_len))) {

			vhost_poll_queue(&vq->poll);

			goto out;

		}