[dpdk-stable] [PATCH 01/12] net/af_packet: fix incorrect rxq errors stat

[dpdk-stable] [PATCH 01/12] net/af_packet: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual devices")
Cc: stable@dpdk.org
Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 264cfc0..ec90cc0 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -328,10 +328,9 @@ struct pmd_internals {
 	        internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);
 	for (i = 0; i < imax; i++) {
 		igb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts;
-		igb_stats->q_errors[i] = internal->tx_queue[i].err_pkts;
 		igb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes;
 		tx_total += igb_stats->q_opackets[i];
-		tx_err_total += igb_stats->q_errors[i];
+		tx_err_total += internal->tx_queue[i].err_pkts;
 		tx_bytes_total += igb_stats->q_obytes[i];
 	}
 
-- 
1.8.3.1

[dpdk-stable] [PATCH 02/12] net/avp: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 5a5abe2de94b ("net/avp: add device statistics operations")
Cc: stable@dpdk.org
Cc: Allain Legacy <allain.legacy@windriver.com>
Cc: Matt Peters <matt.peters@windriver.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/avp/avp_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 09388d0..5d069a2 100644
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -2228,7 +2228,6 @@ struct avp_queue {
 
 			stats->q_opackets[i] += txq->packets;
 			stats->q_obytes[i] += txq->bytes;
-			stats->q_errors[i] += txq->errors;
 		}
 	}
 
-- 
1.8.3.1

[dpdk-stable] [PATCH 03/12] net/bnxt: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 577d3dced0dc ("net/bnxt: refactor the query stats")
Cc: stable@dpdk.org
Cc: Ajit Khaparde <ajit.khaparde@broadcom.com>
Cc: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 9999760..8853391 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3186,7 +3186,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
 		stats->q_obytes[idx] = rte_le_to_cpu_64(resp->tx_ucast_bytes);
 		stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_mcast_bytes);
 		stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_bcast_bytes);
-		stats->q_errors[idx] += rte_le_to_cpu_64(resp->tx_err_pkts);
 	}
 
 
-- 
1.8.3.1

[dpdk-stable] [PATCH 04/12] net/cxgbe: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 856505d303f4 ("cxgbe: add port statistics")
Fixes: a0a344a8f728 ("net/cxgbe: add VF port statistics")
Cc: stable@dpdk.org
Cc: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/cxgbe/cxgbe_ethdev.c   | 1 -
 drivers/net/cxgbe/cxgbevf_ethdev.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 010a818..7c7a51d 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -705,7 +705,6 @@ static int cxgbe_dev_stats_get(struct rte_eth_dev *eth_dev,
 
 		eth_stats->q_opackets[i] = txq->stats.pkts;
 		eth_stats->q_obytes[i] = txq->stats.tx_bytes;
-		eth_stats->q_errors[i] = txq->stats.mapping_err;
 	}
 	return 0;
 }
diff --git a/drivers/net/cxgbe/cxgbevf_ethdev.c b/drivers/net/cxgbe/cxgbevf_ethdev.c
index 0e93d99..0af9dd9 100644
--- a/drivers/net/cxgbe/cxgbevf_ethdev.c
+++ b/drivers/net/cxgbe/cxgbevf_ethdev.c
@@ -69,7 +69,6 @@ static int cxgbevf_dev_stats_get(struct rte_eth_dev *eth_dev,
 
 		eth_stats->q_opackets[i] = txq->stats.pkts;
 		eth_stats->q_obytes[i] = txq->stats.tx_bytes;
-		eth_stats->q_errors[i] = txq->stats.mapping_err;
 	}
 	return 0;
 }
-- 
1.8.3.1

[dpdk-stable] [PATCH 05/12] net/kni: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 75e2bc54c018 ("net/kni: add KNI PMD")
Cc: stable@dpdk.org
Cc: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/kni/rte_eth_kni.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index a1e9970..363f80d 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -285,10 +285,9 @@ struct pmd_internals {
 		q = data->tx_queues[i];
 		stats->q_opackets[i] = q->tx.pkts;
 		stats->q_obytes[i] = q->tx.bytes;
-		stats->q_errors[i] = q->tx.err_pkts;
 		tx_packets_total += stats->q_opackets[i];
 		tx_bytes_total += stats->q_obytes[i];
-		tx_packets_err_total += stats->q_errors[i];
+		tx_packets_err_total += q->tx.err_pkts;
 	}
 
 	stats->ipackets = rx_packets_total;
-- 
1.8.3.1

[dpdk-stable] [PATCH 06/12] net/mlx4: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 7fae69eeff13 ("mlx4: new poll mode driver")
Cc: stable@dpdk.org
Cc: Matan Azrad <matan@mellanox.com>
Cc: Shahaf Shuler <shahafs@mellanox.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/mlx4/mlx4_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
index 4dae67a..41c46d3 100644
--- a/drivers/net/mlx4/mlx4_ethdev.c
+++ b/drivers/net/mlx4/mlx4_ethdev.c
@@ -661,7 +661,6 @@ int mlx4_fw_version_get(struct rte_eth_dev *dev, char *fw_ver, size_t fw_size)
 		if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
 			tmp.q_opackets[idx] += txq->stats.opackets;
 			tmp.q_obytes[idx] += txq->stats.obytes;
-			tmp.q_errors[idx] += txq->stats.odropped;
 		}
 		tmp.opackets += txq->stats.opackets;
 		tmp.obytes += txq->stats.obytes;
-- 
1.8.3.1

[dpdk-stable] [PATCH 07/12] net/mlx5: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 87011737b715 ("mlx5: add software counters")
Fixes: 9f9a48eb2978 ("net/mlx5: fix Tx stats error counter definition")
Cc: stable@dpdk.org
Cc: Shahaf Shuler <shahafs@mellanox.com>
Cc: Yongseok Koh <yskoh@mellanox.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/mlx5/mlx5_stats.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index 6906dc8..ef7bc14 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -409,7 +409,6 @@
 			tmp.q_opackets[idx] += txq->stats.opackets;
 			tmp.q_obytes[idx] += txq->stats.obytes;
 #endif
-			tmp.q_errors[idx] += txq->stats.oerrors;
 		}
 #ifdef MLX5_PMD_SOFT_COUNTERS
 		tmp.opackets += txq->stats.opackets;
-- 
1.8.3.1

[dpdk-stable] [PATCH 08/12] net/null: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: c743e50c475f ("null: new poll mode driver")
Cc: stable@dpdk.org
Cc: Tetsuya Mukawa <mtetsuyah@gmail.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/null/rte_eth_null.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 159c1c1..0e30886 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -333,10 +333,8 @@ struct pmd_internals {
 	for (i = 0; i < num_stats; i++) {
 		igb_stats->q_opackets[i] =
 			internal->tx_null_queues[i].tx_pkts.cnt;
-		igb_stats->q_errors[i] =
-			internal->tx_null_queues[i].err_pkts.cnt;
 		tx_total += igb_stats->q_opackets[i];
-		tx_err_total += igb_stats->q_errors[i];
+		tx_err_total += internal->tx_null_queues[i].err_pkts.cnt;
 	}
 
 	igb_stats->ipackets = rx_total;
-- 
1.8.3.1

[dpdk-stable] [PATCH 09/12] net/pcap: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 4c173302c307 ("pcap: add new driver")
Cc: stable@dpdk.org
Cc: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/pcap/rte_eth_pcap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 65bbd7e..4d5e6ba 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -605,10 +605,9 @@ struct pmd_devargs {
 			i < dev->data->nb_tx_queues; i++) {
 		stats->q_opackets[i] = internal->tx_queue[i].tx_stat.pkts;
 		stats->q_obytes[i] = internal->tx_queue[i].tx_stat.bytes;
-		stats->q_errors[i] = internal->tx_queue[i].tx_stat.err_pkts;
 		tx_packets_total += stats->q_opackets[i];
 		tx_bytes_total += stats->q_obytes[i];
-		tx_packets_err_total += stats->q_errors[i];
+		tx_packets_err_total += internal->tx_queue[i].tx_stat.err_pkts;
 	}
 
 	stats->ipackets = rx_packets_total;
-- 
1.8.3.1

[dpdk-stable] [PATCH 10/12] net/ring: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: e1e4017751f1 ("ring: add new driver")
Cc: stable@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/ring/rte_eth_ring.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index aeb48f5..4865763 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -182,9 +182,8 @@ struct pmd_internals {
 	for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&
 			i < dev->data->nb_tx_queues; i++) {
 		stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt;
-		stats->q_errors[i] = internal->tx_ring_queues[i].err_pkts.cnt;
 		tx_total += stats->q_opackets[i];
-		tx_err_total += stats->q_errors[i];
+		tx_err_total += internal->tx_ring_queues[i].err_pkts.cnt;
 	}
 
 	stats->ipackets = rx_total;
-- 
1.8.3.1

[dpdk-stable] [PATCH 11/12] net/szedata2: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: abef3dd62e7a ("szedata2: add new poll mode driver")
Cc: stable@dpdk.org
Cc: Jan Remes <remes@netcope.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/szedata2/rte_eth_szedata2.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index 88448ef..a6fbfe3 100644
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -1093,7 +1093,6 @@ struct szedata2_tx_queue {
 		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;
-- 
1.8.3.1

[dpdk-stable] [PATCH 12/12] net/tap: fix incorrect rxq errors stat

[David Marchand]

Transmit errors must not be reported in q_errors[] which is for
reception.

Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")
Cc: stable@dpdk.org
Cc: Keith Wiles <keith.wiles@intel.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/tap/rte_eth_tap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 6f5109f..94c728f 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -968,10 +968,9 @@ struct ipc_queues {
 
 	for (i = 0; i < imax; i++) {
 		tap_stats->q_opackets[i] = pmd->txq[i].stats.opackets;
-		tap_stats->q_errors[i] = pmd->txq[i].stats.errs;
 		tap_stats->q_obytes[i] = pmd->txq[i].stats.obytes;
 		tx_total += tap_stats->q_opackets[i];
-		tx_err_total += tap_stats->q_errors[i];
+		tx_err_total += pmd->txq[i].stats.errs;
 		tx_bytes_total += tap_stats->q_obytes[i];
 	}
 
-- 
1.8.3.1

Re: [dpdk-stable] [PATCH 02/12] net/avp: fix incorrect rxq errors stat

[Legacy, Allain]

> -----Original Message-----
> From: David Marchand [mailto:david.marchand@redhat.com]
> Sent: Monday, March 04, 2019 6:18 AM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Legacy, Allain; Peters, Matt
> Subject: [PATCH 02/12] net/avp: fix incorrect rxq errors stat
> 
> Transmit errors must not be reported in q_errors[] which is for reception.
> 
> Fixes: 5a5abe2de94b ("net/avp: add device statistics operations")
> Cc: stable@dpdk.org
> Cc: Allain Legacy <allain.legacy@windriver.com>
> Cc: Matt Peters <matt.peters@windriver.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
Acked-by:  Allain Legacy <allain.legacy@windriver.com>

Re: [dpdk-stable] [PATCH 12/12] net/tap: fix incorrect rxq errors stat

[Wiles, Keith]

> On Mar 4, 2019, at 5:18 AM, David Marchand <david.marchand@redhat.com> wrote:
> 
> Transmit errors must not be reported in q_errors[] which is for
> reception.
> 
> Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")
> Cc: stable@dpdk.org
> Cc: Keith Wiles <keith.wiles@intel.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/tap/rte_eth_tap.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index 6f5109f..94c728f 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -968,10 +968,9 @@ struct ipc_queues {
> 
> 	for (i = 0; i < imax; i++) {
> 		tap_stats->q_opackets[i] = pmd->txq[i].stats.opackets;
> -		tap_stats->q_errors[i] = pmd->txq[i].stats.errs;
> 		tap_stats->q_obytes[i] = pmd->txq[i].stats.obytes;
> 		tx_total += tap_stats->q_opackets[i];
> -		tx_err_total += tap_stats->q_errors[i];
> +		tx_err_total += pmd->txq[i].stats.errs;
> 		tx_bytes_total += tap_stats->q_obytes[i];
> 	}
> 
> -- 
> 1.8.3.1
> 
Acked-by: Keith Wiles <keith.wiles@intel.com>

Regards,
Keith

Re: [dpdk-stable] [PATCH 07/12] net/mlx5: fix incorrect rxq errors stat

[Shahaf Shuler]

Monday, March 4, 2019 1:19 PM, David Marchand:
> Subject: [PATCH 07/12] net/mlx5: fix incorrect rxq errors stat
> 
> Transmit errors must not be reported in q_errors[] which is for reception.
> 
> Fixes: 87011737b715 ("mlx5: add software counters")
> Fixes: 9f9a48eb2978 ("net/mlx5: fix Tx stats error counter definition")
> Cc: stable@dpdk.org
> Cc: Shahaf Shuler <shahafs@mellanox.com>
> Cc: Yongseok Koh <yskoh@mellanox.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  drivers/net/mlx5/mlx5_stats.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
> index 6906dc8..ef7bc14 100644
> --- a/drivers/net/mlx5/mlx5_stats.c
> +++ b/drivers/net/mlx5/mlx5_stats.c
> @@ -409,7 +409,6 @@
>  			tmp.q_opackets[idx] += txq->stats.opackets;
>  			tmp.q_obytes[idx] += txq->stats.obytes;  #endif
> -			tmp.q_errors[idx] += txq->stats.oerrors;
>  		}
>  #ifdef MLX5_PMD_SOFT_COUNTERS
>  		tmp.opackets += txq->stats.opackets;
> --
> 1.8.3.1

Acked-by: Shahaf Shuler <shahafs@mellanox.com>

Re: [dpdk-stable] [PATCH 06/12] net/mlx4: fix incorrect rxq errors stat

[Shahaf Shuler]

Monday, March 4, 2019 1:18 PM, David Marchand:
> Subject: [PATCH 06/12] net/mlx4: fix incorrect rxq errors stat
> 
> Transmit errors must not be reported in q_errors[] which is for reception.
> 
> Fixes: 7fae69eeff13 ("mlx4: new poll mode driver")
> Cc: stable@dpdk.org
> Cc: Matan Azrad <matan@mellanox.com>
> Cc: Shahaf Shuler <shahafs@mellanox.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  drivers/net/mlx4/mlx4_ethdev.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/mlx4/mlx4_ethdev.c
> b/drivers/net/mlx4/mlx4_ethdev.c index 4dae67a..41c46d3 100644
> --- a/drivers/net/mlx4/mlx4_ethdev.c
> +++ b/drivers/net/mlx4/mlx4_ethdev.c
> @@ -661,7 +661,6 @@ int mlx4_fw_version_get(struct rte_eth_dev *dev,
> char *fw_ver, size_t fw_size)
>  		if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
>  			tmp.q_opackets[idx] += txq->stats.opackets;
>  			tmp.q_obytes[idx] += txq->stats.obytes;
> -			tmp.q_errors[idx] += txq->stats.odropped;
>  		}
>  		tmp.opackets += txq->stats.opackets;
>  		tmp.obytes += txq->stats.obytes;

Acked-by: Shahaf Shuler <shahafs@mellanox.com>

> --
> 1.8.3.1