From 56fa279124091648e4502bdead1667f30ec22fa4 Mon Sep 17 00:00:00 2001 From: Balazs Nemeth Date: Tue, 13 Apr 2021 15:31:03 +0200 Subject: [PATCH] vhost: remove remaining packets count The remained variable stores the same information as the difference between count and pkt_idx. Remove the remained variable to simplify. Signed-off-by: Balazs Nemeth Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index 9197b82b33..61bf0d6237 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -1355,16 +1355,14 @@ virtio_dev_rx_packed(struct virtio_net *dev, uint32_t count) { uint32_t pkt_idx = 0; - uint32_t remained = count; do { rte_prefetch0(&vq->desc_packed[vq->last_avail_idx]); - if (remained >= PACKED_BATCH_SIZE) { + if (count - pkt_idx >= PACKED_BATCH_SIZE) { if (!virtio_dev_rx_batch_packed(dev, vq, &pkts[pkt_idx])) { pkt_idx += PACKED_BATCH_SIZE; - remained -= PACKED_BATCH_SIZE; continue; } } @@ -1372,7 +1370,6 @@ virtio_dev_rx_packed(struct virtio_net *dev, if (virtio_dev_rx_single_packed(dev, vq, pkts[pkt_idx])) break; pkt_idx++; - remained--; } while (pkt_idx < count); @@ -2463,16 +2460,14 @@ virtio_dev_tx_packed(struct virtio_net *dev, uint32_t count) { uint32_t pkt_idx = 0; - uint32_t remained = count; do { rte_prefetch0(&vq->desc_packed[vq->last_avail_idx]); - if (remained >= PACKED_BATCH_SIZE) { + if (count - pkt_idx >= PACKED_BATCH_SIZE) { if (!virtio_dev_tx_batch_packed(dev, vq, mbuf_pool, &pkts[pkt_idx])) { pkt_idx += PACKED_BATCH_SIZE; - remained -= PACKED_BATCH_SIZE; continue; } } @@ -2481,9 +2476,7 @@ virtio_dev_tx_packed(struct virtio_net *dev, &pkts[pkt_idx])) break; pkt_idx++; - remained--; - - } while (remained); + } while (pkt_idx < count); if (vq->shadow_used_idx) { do_data_copy_dequeue(vq); -- 2.20.1