diff options
| author | Jason Wang <jasowang@redhat.com> | 2018-07-20 08:15:15 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-08-13 12:39:23 +0100 |
| commit | e22aecb0e563f5e9705dcfb55231fd079041ff1c (patch) | |
| tree | bfb2014f5209341014d31ddc7d211bfaebb0cb4e | |
| parent | e1c88f2d7b15ef771eb3604ebd66e2ab9be544cd (diff) | |
| download | linux-stable-e22aecb0e563f5e9705dcfb55231fd079041ff1c.tar.gz linux-stable-e22aecb0e563f5e9705dcfb55231fd079041ff1c.tar.bz2 linux-stable-e22aecb0e563f5e9705dcfb55231fd079041ff1c.zip | |
vhost_net: introduce vhost_exceeds_weight()
commit 272f35cba53d088085e5952fd81d7a133ab90789 upstream.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/vhost/net.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index bb7a1bdc805b..ab100669ceaa 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -335,6 +335,12 @@ static void vhost_zerocopy_callback(struct ubuf_info *ubuf, bool success) rcu_read_unlock_bh(); } +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) @@ -457,8 +463,7 @@ static void handle_tx(struct vhost_net *net) vhost_zerocopy_signal_used(net, vq); total_len += len; 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; } @@ -668,8 +673,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); break; } |