vhost_net: introduce vhost_exceeds_weight()
Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b0d0ea50e7
commit
272f35cba5
1 changed files with 8 additions and 5 deletions
|
@ -478,6 +478,12 @@ static size_t init_iov_iter(struct vhost_virtqueue *vq, struct iov_iter *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
|
||||
* read-size critical section for our kind of RCU. */
|
||||
static void handle_tx(struct vhost_net *net)
|
||||
|
@ -576,7 +582,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) &&
|
||||
|
@ -606,8 +611,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;
|
||||
}
|
||||
|
@ -918,8 +922,7 @@ static void handle_rx(struct vhost_net *net)
|
|||
if (unlikely(vq_log))
|
||||
vhost_log_write(vq, vq_log, log, vhost_len);
|
||||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue