From: Yuanhan Liu <yliu@fridaylinux.org>
To: Qi Zhang <qi.z.zhang@intel.com>
Cc: Beilei Xing <beilei.xing@intel.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/i40e: exclude internal packet's byte count' has been queued to stable release 17.05.1
Date: Tue, 20 Jun 2017 19:35:38 +0800 [thread overview]
Message-ID: <1497958550-13600-26-git-send-email-yliu@fridaylinux.org> (raw)
In-Reply-To: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org>
Hi,
FYI, your patch has been queued to stable release 17.05.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/22/17. So please
shout if anyone has objections.
Thanks.
--yliu
---
>From ec5d186a14f826c0404ad489ecf242fdfbd5420d Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Thu, 1 Jun 2017 13:55:45 -0400
Subject: [PATCH] net/i40e: exclude internal packet's byte count
[ upstream commit 0bcdc44510ef5efd7c0069cdd0161e6f446c254b ]
Tx/Rx byte counts of internal managed packet should be
excluded from the total rx/tx bytes.
Fixes: 9aace75fc82e ("i40e: fix statistics")
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 21 +++++++++++++++++++--
drivers/net/i40e/i40e_ethdev.h | 5 +++++
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index c18a93b..2d648c2 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2379,6 +2379,19 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
struct i40e_hw_port_stats *ns = &pf->stats; /* new stats */
struct i40e_hw_port_stats *os = &pf->stats_offset; /* old stats */
+ /* Get rx/tx bytes of internal transfer packets */
+ i40e_stat_update_48(hw, I40E_GLV_GORCH(hw->port),
+ I40E_GLV_GORCL(hw->port),
+ pf->offset_loaded,
+ &pf->internal_rx_bytes_offset,
+ &pf->internal_rx_bytes);
+
+ i40e_stat_update_48(hw, I40E_GLV_GOTCH(hw->port),
+ I40E_GLV_GOTCL(hw->port),
+ pf->offset_loaded,
+ &pf->internal_tx_bytes_offset,
+ &pf->internal_tx_bytes);
+
/* Get statistics of struct i40e_eth_stats */
i40e_stat_update_48(hw, I40E_GLPRT_GORCH(hw->port),
I40E_GLPRT_GORCL(hw->port),
@@ -2400,7 +2413,7 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
* so subtract ETHER_CRC_LEN from the byte counter for each rx packet.
*/
ns->eth.rx_bytes -= (ns->eth.rx_unicast + ns->eth.rx_multicast +
- ns->eth.rx_broadcast) * ETHER_CRC_LEN;
+ ns->eth.rx_broadcast) * ETHER_CRC_LEN + pf->internal_rx_bytes;
i40e_stat_update_32(hw, I40E_GLPRT_RDPC(hw->port),
pf->offset_loaded, &os->eth.rx_discards,
@@ -2428,7 +2441,7 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
pf->offset_loaded, &os->eth.tx_broadcast,
&ns->eth.tx_broadcast);
ns->eth.tx_bytes -= (ns->eth.tx_unicast + ns->eth.tx_multicast +
- ns->eth.tx_broadcast) * ETHER_CRC_LEN;
+ ns->eth.tx_broadcast) * ETHER_CRC_LEN + pf->internal_tx_bytes;
/* GLPRT_TEPC not supported */
/* additional port specific stats */
@@ -5196,6 +5209,10 @@ i40e_pf_setup(struct i40e_pf *pf)
pf->offset_loaded = FALSE;
memset(&pf->stats, 0, sizeof(struct i40e_hw_port_stats));
memset(&pf->stats_offset, 0, sizeof(struct i40e_hw_port_stats));
+ pf->internal_rx_bytes = 0;
+ pf->internal_tx_bytes = 0;
+ pf->internal_rx_bytes_offset = 0;
+ pf->internal_tx_bytes_offset = 0;
ret = i40e_pf_get_switch_config(pf);
if (ret != I40E_SUCCESS) {
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 2ff8282..b0d963c 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -639,6 +639,11 @@ struct i40e_pf {
struct i40e_hw_port_stats stats_offset;
struct i40e_hw_port_stats stats;
+ /* internal packet byte count, it should be excluded from the total */
+ uint64_t internal_rx_bytes;
+ uint64_t internal_tx_bytes;
+ uint64_t internal_rx_bytes_offset;
+ uint64_t internal_tx_bytes_offset;
bool offset_loaded;
struct rte_eth_dev_data *dev_data; /* Pointer to the device data */
--
2.7.4
next prev parent reply other threads:[~2017-06-20 11:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-20 11:35 [dpdk-stable] patch 'examples/vhost: fix uninitialized descriptor indexes' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'kni: fix build on RHEL 7.4' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'drivers/net: fix vfio kmod dependency' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vfio: fix array bounds check' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'app/testpmd: fix creating E-Tag and NVGRE flow rules' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix buffer not null terminated' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix return code not checked' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix null pointer dereference' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ark: fix return value of null not checked' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e/base: fix Tx error stats on VF' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/af_packet: handle possible null pointer' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/af_packet: fix packet bytes counting' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix completion buffer size' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/igb: fix add/delete of flex filters' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/tap: fix some flow collision' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/cxgbe: fix port statistics' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/cxgbe: fix rxq default params for ports under same PF' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/sfc/base: fix error code usage in common code' " Yuanhan Liu
2017-06-20 16:26 ` Andrew Rybchenko
2017-06-22 2:19 ` Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/sfc: add Tx queue flush failed flag for sanity' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix flow application order on stop/start' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ring: fix adding MAC addresses' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix exception handling' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: fix redundant free of Tx buffer' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/igb: fix checksum valid flags' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/ixgbe: fix fdir mask not be reset' " Yuanhan Liu
2017-06-20 11:35 ` Yuanhan Liu [this message]
2017-06-20 11:35 ` [dpdk-stable] patch 'net/i40e: fix VF statistics' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/qede: fix VXLAN tunnel Tx offload flag setting' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/liquidio: fix MTU calculation from port configuration' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/bnxt: fix reporting of link status' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'kni: fix build with gcc 7.1' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/enic: " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/mlx5: " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix malloc size too small' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix guest pages memory leak' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'vhost: fix crash on NUMA' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'net/virtio: zero the whole memory zone' " Yuanhan Liu
2017-06-20 11:35 ` [dpdk-stable] patch 'lpm: fix index of tbl8' " Yuanhan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1497958550-13600-26-git-send-email-yliu@fridaylinux.org \
--to=yliu@fridaylinux.org \
--cc=beilei.xing@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).