vhost_net: introduce vhost_exceeds_weight()

BugLink: https://bugs.launchpad.net/bugs/1838824
commit 272f35cba53d088085e5952fd81d7a133ab90789 upstream.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Balbir Singh <sblbir@amzn.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e899fe5723a3219fe43c1ba87249416ac787f937..24314135636d9545a182822e74e846a7b5e3d0e4 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -450,6 +450,12 @@ static bool vhost_exceeds_maxpend(struct vhost_net *net)
               min_t(unsigned int, VHOST_MAX_PEND, vq->num >> 2);
 }
 
+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)
@@ -553,7 +559,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) &&
@@ -583,8 +588,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;
                }
@@ -868,8 +872,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;
                }