d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mrvl: support basic stats

Browse Source 
Add support for both per queue and overall basic statistics.

Signed-off-by: Jacek Siuda <jck@semihalf.com>
Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
This commit is contained in:
Tomasz Duszynski 2017-10-09 17:00:42 +02:00 committed by Ferruh Yigit
parent f3f0d77db6
commit bdffe0c70a
2 changed files with 142 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/guides/nics/features/mrvl.ini
View File

@ -18,3 +18,4 @@ CRC offload = Y
L3 checksum offload = Y
L4 checksum offload = Y
Packet type parsing = Y
Basic stats = Y

142
drivers/net/mrvl/mrvl_ethdev.c
View File

@ -135,12 +135,15 @@ struct mrvl_rxq {
int queue_id;
int port_id;
int cksum_enabled;
uint64_t bytes_recv;
uint64_t drop_mac;
};
struct mrvl_txq {
struct mrvl_priv *priv;
int queue_id;
int port_id;
uint64_t bytes_sent;
};
/*
@ -280,6 +283,7 @@ mrvl_dev_configure(struct rte_eth_dev *dev)
return ret;
priv->ppio_params.outqs_params.num_outqs = dev->data->nb_tx_queues;
priv->ppio_params.maintain_stats = 1;
priv->nb_rx_queues = dev->data->nb_rx_queues;
if (dev->data->nb_rx_queues == 1 &&
@ -834,6 +838,131 @@ mrvl_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
pp2_ppio_enable(priv->ppio);
}
/**
* DPDK callback to get device statistics.
*
* @param dev
* Pointer to Ethernet device structure.
* @param stats
* Stats structure output buffer.
*/
static void
mrvl_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
struct mrvl_priv *priv = dev->data->dev_private;
struct pp2_ppio_statistics ppio_stats;
uint64_t drop_mac = 0;
unsigned int i, idx, ret;
for (i = 0; i < dev->data->nb_rx_queues; i++) {
struct mrvl_rxq *rxq = dev->data->rx_queues[i];
struct pp2_ppio_inq_statistics rx_stats;
if (!rxq)
continue;
idx = rxq->queue_id;
if (unlikely(idx >= RTE_ETHDEV_QUEUE_STAT_CNTRS)) {
RTE_LOG(ERR, PMD,
"rx queue %d stats out of range (0 - %d)\n",
idx, RTE_ETHDEV_QUEUE_STAT_CNTRS - 1);
continue;
}
ret = pp2_ppio_inq_get_statistics(priv->ppio,
priv->rxq_map[idx].tc,
priv->rxq_map[idx].inq,
&rx_stats, 0);
if (unlikely(ret)) {
RTE_LOG(ERR, PMD,
"Failed to update rx queue %d stats\n", idx);
break;
}
stats->q_ibytes[idx] = rxq->bytes_recv;
stats->q_ipackets[idx] = rx_stats.enq_desc - rxq->drop_mac;
stats->q_errors[idx] = rx_stats.drop_early +
rx_stats.drop_fullq +
rx_stats.drop_bm +
rxq->drop_mac;
stats->ibytes += rxq->bytes_recv;
drop_mac += rxq->drop_mac;
}
for (i = 0; i < dev->data->nb_tx_queues; i++) {
struct mrvl_txq *txq = dev->data->tx_queues[i];
struct pp2_ppio_outq_statistics tx_stats;
if (!txq)
continue;
idx = txq->queue_id;
if (unlikely(idx >= RTE_ETHDEV_QUEUE_STAT_CNTRS)) {
RTE_LOG(ERR, PMD,
"tx queue %d stats out of range (0 - %d)\n",
idx, RTE_ETHDEV_QUEUE_STAT_CNTRS - 1);
}
ret = pp2_ppio_outq_get_statistics(priv->ppio, idx,
&tx_stats, 0);
if (unlikely(ret)) {
RTE_LOG(ERR, PMD,
"Failed to update tx queue %d stats\n", idx);
break;
}
stats->q_opackets[idx] = tx_stats.deq_desc;
stats->q_obytes[idx] = txq->bytes_sent;
stats->obytes += txq->bytes_sent;
}
ret = pp2_ppio_get_statistics(priv->ppio, &ppio_stats, 0);
if (unlikely(ret)) {
RTE_LOG(ERR, PMD, "Failed to update port statistics\n");
return;
}
stats->ipackets += ppio_stats.rx_packets - drop_mac;
stats->opackets += ppio_stats.tx_packets;
stats->imissed += ppio_stats.rx_fullq_dropped +
ppio_stats.rx_bm_dropped +
ppio_stats.rx_early_dropped +
ppio_stats.rx_fifo_dropped +
ppio_stats.rx_cls_dropped;
stats->ierrors = drop_mac;
}
/**
* DPDK callback to clear device statistics.
*
* @param dev
* Pointer to Ethernet device structure.
*/
static void
mrvl_stats_reset(struct rte_eth_dev *dev)
{
struct mrvl_priv *priv = dev->data->dev_private;
int i;
for (i = 0; i < dev->data->nb_rx_queues; i++) {
struct mrvl_rxq *rxq = dev->data->rx_queues[i];
pp2_ppio_inq_get_statistics(priv->ppio, priv->rxq_map[i].tc,
priv->rxq_map[i].inq, NULL, 1);
rxq->bytes_recv = 0;
rxq->drop_mac = 0;
}
for (i = 0; i < dev->data->nb_tx_queues; i++) {
struct mrvl_txq *txq = dev->data->tx_queues[i];
pp2_ppio_outq_get_statistics(priv->ppio, i, NULL, 1);
txq->bytes_sent = 0;
}
pp2_ppio_get_statistics(priv->ppio, NULL, 1);
}
/**
* DPDK callback to get information about the device.
*
@ -1281,6 +1410,8 @@ static const struct eth_dev_ops mrvl_ops = {
.mac_addr_add = mrvl_mac_addr_add,
.mac_addr_set = mrvl_mac_addr_set,
.mtu_set = mrvl_mtu_set,
.stats_get = mrvl_stats_get,
.stats_reset = mrvl_stats_reset,
.dev_infos_get = mrvl_dev_infos_get,
.dev_supported_ptypes_get = mrvl_dev_supported_ptypes_get,
.rxq_info_get = mrvl_rxq_info_get,
@ -1464,6 +1595,7 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
pp2_bpool_put_buff(hifs[core_id], bpool, &binf);
mrvl_port_bpool_size
[bpool->pp2_id][bpool->id][core_id]++;
q->drop_mac++;
continue;
}
@ -1482,6 +1614,7 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
mbuf->ol_flags = mrvl_desc_to_ol_flags(&descs[i]);
rx_pkts[rx_done++] = mbuf;
q->bytes_recv += mbuf->pkt_len;
}
if (rte_spinlock_trylock(&q->priv->lock) == 1) {
@ -1677,8 +1810,9 @@ mrvl_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
struct mrvl_shadow_txq *sq = &shadow_txqs[q->port_id][rte_lcore_id()];
struct pp2_hif *hif = hifs[rte_lcore_id()];
struct pp2_ppio_desc descs[nb_pkts];
int i, ret;
int i, ret, bytes_sent = 0;
uint16_t num, sq_free_size;
uint64_t addr;
if (unlikely(!q->priv->ppio))
return 0;
@ -1724,6 +1858,7 @@ mrvl_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
pp2_ppio_outq_desc_set_pkt_len(&descs[i],
rte_pktmbuf_pkt_len(mbuf));
bytes_sent += rte_pktmbuf_pkt_len(mbuf);
/*
* in case unsupported ol_flags were passed
* do not update descriptor offload information
@ -1747,10 +1882,15 @@ mrvl_tx_pkt_burst(void *txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
for (i = nb_pkts; i < num; i++) {
sq->head = (MRVL_PP2_TX_SHADOWQ_SIZE + sq->head - 1) &
MRVL_PP2_TX_SHADOWQ_MASK;
addr = cookie_addr_high | sq->ent[sq->head].buff.cookie;
bytes_sent -=
rte_pktmbuf_pkt_len((struct rte_mbuf *)addr);
}
sq->size -= num - nb_pkts;
}
q->bytes_sent += bytes_sent;
return nb_pkts;
}