From 7e6c824307025ffe3fd315a2691bd17928c6fc70 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 24 Jul 2018 14:08:51 -0700 Subject: [PATCH] net/netvsc: avoid over filling Rx descriptor ring If the number of packets requested are already present in the rx_ring then skip reading the ring buffer from the host. If the ring between the poll and receive side is full, then don't poll (let incoming packets stay on host). If no more transmit descriptors are available, then still try and flush any outstanding data. Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 597a9dd415..3c03dc84f5 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -878,11 +878,11 @@ void hn_process_events(struct hn_data *hv, uint16_t queue_id) PMD_DRV_LOG(ERR, "unknown chan pkt %u", pkt->type); break; } + + if (rxq->rx_ring && rte_ring_full(rxq->rx_ring)) + break; } rte_spinlock_unlock(&rxq->ring_lock); - - if (unlikely(ret != -EAGAIN)) - PMD_DRV_LOG(ERR, "channel receive failed: %d", ret); } static void hn_append_to_chim(struct hn_tx_queue *txq, @@ -1248,7 +1248,7 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) pkt = hn_try_txagg(hv, txq, pkt_size); if (unlikely(!pkt)) - goto fail; + break; hn_encap(pkt, txq->queue_id, m); hn_append_to_chim(txq, pkt, m); @@ -1269,7 +1269,7 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) } else { txd = hn_new_txd(hv, txq); if (unlikely(!txd)) - goto fail; + break; } pkt = txd->rndis_pkt; @@ -1310,8 +1310,9 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) if (unlikely(hv->closed)) return 0; - /* Get all outstanding receive completions */ - hn_process_events(hv, rxq->queue_id); + /* If ring is empty then process more */ + if (rte_ring_count(rxq->rx_ring) < nb_pkts) + hn_process_events(hv, rxq->queue_id); /* Get mbufs off staging ring */ return rte_ring_sc_dequeue_burst(rxq->rx_ring, (void **)rx_pkts, -- 2.20.1