git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/sfc: destroy event queue when Rx queue is released
[dpdk.git]
/
drivers
/
net
/
sfc
/
sfc_rx.c
diff --git
a/drivers/net/sfc/sfc_rx.c
b/drivers/net/sfc/sfc_rx.c
index
56e48ab
..
403e991
100644
(file)
--- a/
drivers/net/sfc/sfc_rx.c
+++ b/
drivers/net/sfc/sfc_rx.c
@@
-95,17
+95,23
@@
sfc_efx_rx_qrefill(struct sfc_efx_rxq *rxq)
return;
bulks = free_space / RTE_DIM(objs);
return;
bulks = free_space / RTE_DIM(objs);
+ /* refill_threshold guarantees that bulks is positive */
+ SFC_ASSERT(bulks > 0);
id = added & rxq->ptr_mask;
id = added & rxq->ptr_mask;
-
while (bulks-- > 0)
{
- if (rte_mempool_get_bulk(rxq->refill_mb_pool, objs,
-
RTE_DIM(objs)) < 0
) {
+
do
{
+ if (
unlikely(
rte_mempool_get_bulk(rxq->refill_mb_pool, objs,
+
RTE_DIM(objs)) < 0)
) {
/*
* It is hardly a safe way to increment counter
* from different contexts, but all PMDs do it.
*/
rxq->evq->sa->eth_dev->data->rx_mbuf_alloc_failed +=
RTE_DIM(objs);
/*
* It is hardly a safe way to increment counter
* from different contexts, but all PMDs do it.
*/
rxq->evq->sa->eth_dev->data->rx_mbuf_alloc_failed +=
RTE_DIM(objs);
+ /* Return if we have posted nothing yet */
+ if (added == rxq->added)
+ return;
+ /* Push posted */
break;
}
break;
}
@@
-128,13
+134,11
@@
sfc_efx_rx_qrefill(struct sfc_efx_rxq *rxq)
efx_rx_qpost(rxq->common, addr, rxq->buf_size,
RTE_DIM(objs), rxq->completed, added);
added += RTE_DIM(objs);
efx_rx_qpost(rxq->common, addr, rxq->buf_size,
RTE_DIM(objs), rxq->completed, added);
added += RTE_DIM(objs);
- }
+ }
while (--bulks > 0);
- /* Push doorbell if something is posted */
- if (rxq->added != added) {
- rxq->added = added;
- efx_rx_qpush(rxq->common, added, &rxq->pushed);
- }
+ SFC_ASSERT(added != rxq->added);
+ rxq->added = added;
+ efx_rx_qpush(rxq->common, added, &rxq->pushed);
}
static uint64_t
}
static uint64_t
@@
-914,7
+918,8
@@
sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
rxq->evq = evq;
rxq->hw_index = sw_index;
rxq->evq = evq;
rxq->hw_index = sw_index;
- rxq->refill_threshold = rx_conf->rx_free_thresh;
+ rxq->refill_threshold =
+ RTE_MAX(rx_conf->rx_free_thresh, SFC_RX_REFILL_BULK);
rxq->refill_mb_pool = mb_pool;
rc = sfc_dma_alloc(sa, "rxq", sw_index, EFX_RXQ_SIZE(rxq_info->entries),
rxq->refill_mb_pool = mb_pool;
rc = sfc_dma_alloc(sa, "rxq", sw_index, EFX_RXQ_SIZE(rxq_info->entries),
@@
-935,6
+940,11
@@
sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
#endif
info.rxq_entries = rxq_info->entries;
#endif
info.rxq_entries = rxq_info->entries;
+ info.rxq_hw_ring = rxq->mem.esm_base;
+ info.evq_entries = rxq_info->entries;
+ info.evq_hw_ring = evq->mem.esm_base;
+ info.hw_index = rxq->hw_index;
+ info.mem_bar = sa->mem_bar.esb_base;
rc = sa->dp_rx->qcreate(sa->eth_dev->data->port_id, sw_index,
&SFC_DEV_TO_PCI(sa->eth_dev)->addr,
rc = sa->dp_rx->qcreate(sa->eth_dev->data->port_id, sw_index,
&SFC_DEV_TO_PCI(sa->eth_dev)->addr,
@@
-989,6
+999,8
@@
sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
sfc_dma_free(sa, &rxq->mem);
rte_free(rxq);
sfc_dma_free(sa, &rxq->mem);
rte_free(rxq);
+
+ sfc_ev_qfini(sa, sfc_evq_index_by_rxq_sw_index(sa, sw_index));
}
#if EFSYS_OPT_RX_SCALE
}
#if EFSYS_OPT_RX_SCALE