Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vhost_net: introduce vhost_exceeds_weight()

Browse source 
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Wang 2018-07-20 08:15:15 +08:00 • committed by David S. Miller
parent b0d0ea50e7
commit 272f35cba5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/vhost/net.c
View file

@ -478,6 +478,12 @@ static size_t init_iov_iter(struct vhost_virtqueue *vq, struct iov_iter *iter,
return iov_iter_count(iter); return iov_iter_count(iter);
} }
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 /* Expects to be always run from workqueue - which acts as
* read-size critical section for our kind of RCU. */ * read-size critical section for our kind of RCU. */
static void handle_tx(struct vhost_net *net) static void handle_tx(struct vhost_net *net)
@ -576,7 +582,6 @@ static void handle_tx(struct vhost_net *net)
msg.msg_control = NULL; msg.msg_control = NULL;
ubufs = NULL; ubufs = NULL;
} }
total_len += len; total_len += len;
if (total_len < VHOST_NET_WEIGHT && if (total_len < VHOST_NET_WEIGHT &&
!vhost_vq_avail_empty(&net->dev, vq) && !vhost_vq_avail_empty(&net->dev, vq) &&
@ -606,8 +611,7 @@ static void handle_tx(struct vhost_net *net)
else else
vhost_zerocopy_signal_used(net, vq); vhost_zerocopy_signal_used(net, vq);
vhost_net_tx_packet(net); vhost_net_tx_packet(net);
if (unlikely(total_len >= VHOST_NET_WEIGHT) || if (unlikely(vhost_exceeds_weight(++sent_pkts, total_len))) {
unlikely(++sent_pkts >= VHOST_NET_PKT_WEIGHT)) {
vhost_poll_queue(&vq->poll); vhost_poll_queue(&vq->poll);
break; break;
} }
@ -918,8 +922,7 @@ static void handle_rx(struct vhost_net *net)
if (unlikely(vq_log)) if (unlikely(vq_log))
vhost_log_write(vq, vq_log, log, vhost_len); vhost_log_write(vq, vq_log, log, vhost_len);
total_len += vhost_len; total_len += vhost_len;
if (unlikely(total_len >= VHOST_NET_WEIGHT) || if (unlikely(vhost_exceeds_weight(++recv_pkts, total_len))) {
unlikely(++recv_pkts >= VHOST_NET_PKT_WEIGHT)) {
vhost_poll_queue(&vq->poll); vhost_poll_queue(&vq->poll);
goto out; goto out;
} }