* [dpdk-stable] [PATCH 1/4] net/szedata2: fix total stats [not found] <1522849341-49049-1-git-send-email-vido@cesnet.cz> @ 2018-04-04 13:42 ` Matej Vido 2018-04-04 13:42 ` [dpdk-stable] [PATCH 4/4] net/szedata2: fix format string for pci address Matej Vido 1 sibling, 0 replies; 2+ messages in thread From: Matej Vido @ 2018-04-04 13:42 UTC (permalink / raw) To: dev; +Cc: remes, stable Counters from all queues have to be summed up for total stats even though the number of queue stats counters is not sufficient. Fixes: 83556fd2c0fc ("szedata2: change to physical device type") Cc: stable@dpdk.org Signed-off-by: Matej Vido <vido@cesnet.cz> --- drivers/net/szedata2/rte_eth_szedata2.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index 3cfe388..fc11d68 100644 --- a/drivers/net/szedata2/rte_eth_szedata2.c +++ b/drivers/net/szedata2/rte_eth_szedata2.c @@ -1058,22 +1058,29 @@ struct pmd_internals { uint64_t tx_err_total = 0; uint64_t rx_total_bytes = 0; uint64_t tx_total_bytes = 0; - const struct pmd_internals *internals = dev->data->dev_private; - for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && i < nb_rx; i++) { - stats->q_ipackets[i] = internals->rx_queue[i].rx_pkts; - stats->q_ibytes[i] = internals->rx_queue[i].rx_bytes; - rx_total += stats->q_ipackets[i]; - rx_total_bytes += stats->q_ibytes[i]; + for (i = 0; i < nb_rx; i++) { + struct szedata2_rx_queue *rxq = dev->data->rx_queues[i]; + + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { + stats->q_ipackets[i] = rxq->rx_pkts; + stats->q_ibytes[i] = rxq->rx_bytes; + } + rx_total += rxq->rx_pkts; + rx_total_bytes += rxq->rx_bytes; } - for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && i < nb_tx; i++) { - stats->q_opackets[i] = internals->tx_queue[i].tx_pkts; - stats->q_obytes[i] = internals->tx_queue[i].tx_bytes; - stats->q_errors[i] = internals->tx_queue[i].err_pkts; - tx_total += stats->q_opackets[i]; - tx_total_bytes += stats->q_obytes[i]; - tx_err_total += stats->q_errors[i]; + for (i = 0; i < nb_tx; i++) { + struct szedata2_tx_queue *txq = dev->data->tx_queues[i]; + + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { + stats->q_opackets[i] = txq->tx_pkts; + stats->q_obytes[i] = txq->tx_bytes; + stats->q_errors[i] = txq->err_pkts; + } + tx_total += txq->tx_pkts; + tx_total_bytes += txq->tx_bytes; + tx_err_total += txq->err_pkts; } stats->ipackets = rx_total; -- 1.8.3.1 ^ permalink raw reply [flat|nested] 2+ messages in thread
* [dpdk-stable] [PATCH 4/4] net/szedata2: fix format string for pci address [not found] <1522849341-49049-1-git-send-email-vido@cesnet.cz> 2018-04-04 13:42 ` [dpdk-stable] [PATCH 1/4] net/szedata2: fix total stats Matej Vido @ 2018-04-04 13:42 ` Matej Vido 1 sibling, 0 replies; 2+ messages in thread From: Matej Vido @ 2018-04-04 13:42 UTC (permalink / raw) To: dev; +Cc: remes, stable For fscanf() function SCN macros should be used but PRI macros were wrongly used. Also use correct sizes of variables for read values. Fixes: 83556fd2c0fc ("szedata2: change to physical device type") Cc: stable@dpdk.org Signed-off-by: Matej Vido <vido@cesnet.cz> --- drivers/net/szedata2/rte_eth_szedata2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index 8278780..04dc8bf 100644 --- a/drivers/net/szedata2/rte_eth_szedata2.c +++ b/drivers/net/szedata2/rte_eth_szedata2.c @@ -1488,9 +1488,9 @@ struct szedata2_tx_queue { FILE *fd; char pcislot_path[PATH_MAX]; uint32_t domain; - uint32_t bus; - uint32_t devid; - uint32_t function; + uint8_t bus; + uint8_t devid; + uint8_t function; dir = opendir("/sys/class/combo"); if (dir == NULL) @@ -1515,7 +1515,7 @@ struct szedata2_tx_queue { if (fd == NULL) continue; - ret = fscanf(fd, "%4" PRIx16 ":%2" PRIx8 ":%2" PRIx8 ".%" PRIx8, + ret = fscanf(fd, "%8" SCNx32 ":%2" SCNx8 ":%2" SCNx8 ".%" SCNx8, &domain, &bus, &devid, &function); fclose(fd); if (ret != 4) -- 1.8.3.1 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-04 13:42 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <1522849341-49049-1-git-send-email-vido@cesnet.cz> 2018-04-04 13:42 ` [dpdk-stable] [PATCH 1/4] net/szedata2: fix total stats Matej Vido 2018-04-04 13:42 ` [dpdk-stable] [PATCH 4/4] net/szedata2: fix format string for pci address Matej Vido
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).