* [dpdk-dev] [PATCH] net/i40e: exclude LLDP packet count
@ 2017-12-05 1:29 Qi Zhang
2017-12-11 8:49 ` Xing, Beilei
0 siblings, 1 reply; 3+ messages in thread
From: Qi Zhang @ 2017-12-05 1:29 UTC (permalink / raw)
To: beilei.xing; +Cc: dev, Qi Zhang
When use port stats register to calcuate the packet count, LLDP packets
are counted in statistics which is not expected, the patch exclude this
number from total number.
Fixes: 763de290cbd1 ("net/i40e: fix packet count for PF")
Cc stable@dpdk.org
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 58 +++++++++++++++++++++++++++++++++++++++---
1 file changed, 55 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 811cc9f..4cbb259 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2531,6 +2531,22 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
pf->offset_loaded,
&pf->internal_stats_offset.rx_broadcast,
&pf->internal_stats.rx_broadcast);
+ /* Get total internal tx packet count */
+ i40e_stat_update_48(hw, I40E_GLV_UPTCH(hw->port),
+ I40E_GLV_UPTCL(hw->port),
+ pf->offset_loaded,
+ &pf->internal_stats_offset.tx_unicast,
+ &pf->internal_stats.tx_unicast);
+ i40e_stat_update_48(hw, I40E_GLV_MPTCH(hw->port),
+ I40E_GLV_MPTCL(hw->port),
+ pf->offset_loaded,
+ &pf->internal_stats_offset.tx_multicast,
+ &pf->internal_stats.tx_multicast);
+ i40e_stat_update_48(hw, I40E_GLV_BPTCH(hw->port),
+ I40E_GLV_BPTCL(hw->port),
+ pf->offset_loaded,
+ &pf->internal_stats_offset.tx_broadcast,
+ &pf->internal_stats.tx_broadcast);
/* exclude CRC size */
pf->internal_stats.rx_bytes -= (pf->internal_stats.rx_unicast +
@@ -2560,16 +2576,32 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
ns->eth.rx_bytes -= (ns->eth.rx_unicast + ns->eth.rx_multicast +
ns->eth.rx_broadcast) * ETHER_CRC_LEN;
- /* Workaround: it is possible I40E_GLV_GORCH[H/L] is updated before
+ /* exlude internal rx bytes
+ * Workaround: it is possible I40E_GLV_GORCH[H/L] is updated before
* I40E_GLPRT_GORCH[H/L], so there is a small window that cause negtive
* value.
+ * same to I40E_GLV_UPRC[H/L], I40E_GLV_MPRC[H/L], I40E_GLV_BPRC[H/L].
*/
if (ns->eth.rx_bytes < pf->internal_stats.rx_bytes)
ns->eth.rx_bytes = 0;
- /* exlude internal rx bytes */
else
ns->eth.rx_bytes -= pf->internal_stats.rx_bytes;
+ if (ns->eth.rx_unicast < pf->internal_stats.rx_unicast)
+ ns->eth.rx_unicast = 0;
+ else
+ ns->eth.rx_unicast -= pf->internal_stats.rx_unicast;
+
+ if (ns->eth.rx_multicast < pf->internal_stats.rx_multicast)
+ ns->eth.rx_multicast = 0;
+ else
+ ns->eth.rx_multicast -= pf->internal_stats.rx_multicast;
+
+ if (ns->eth.rx_broadcast < pf->internal_stats.rx_broadcast)
+ ns->eth.rx_broadcast = 0;
+ else
+ ns->eth.rx_broadcast -= pf->internal_stats.rx_broadcast;
+
i40e_stat_update_32(hw, I40E_GLPRT_RDPC(hw->port),
pf->offset_loaded, &os->eth.rx_discards,
&ns->eth.rx_discards);
@@ -2598,12 +2630,32 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
ns->eth.tx_bytes -= (ns->eth.tx_unicast + ns->eth.tx_multicast +
ns->eth.tx_broadcast) * ETHER_CRC_LEN;
- /* exclude internal tx bytes */
+ /* exlude internal tx bytes
+ * Workaround: it is possible I40E_GLV_GOTCH[H/L] is updated before
+ * I40E_GLPRT_GOTCH[H/L], so there is a small window that cause negtive
+ * value.
+ * same to I40E_GLV_UPTC[H/L], I40E_GLV_MPTC[H/L], I40E_GLV_BPTC[H/L].
+ */
if (ns->eth.tx_bytes < pf->internal_stats.tx_bytes)
ns->eth.tx_bytes = 0;
else
ns->eth.tx_bytes -= pf->internal_stats.tx_bytes;
+ if (ns->eth.tx_unicast < pf->internal_stats.tx_unicast)
+ ns->eth.tx_unicast = 0;
+ else
+ ns->eth.tx_unicast -= pf->internal_stats.tx_unicast;
+
+ if (ns->eth.tx_multicast < pf->internal_stats.tx_multicast)
+ ns->eth.tx_multicast = 0;
+ else
+ ns->eth.tx_multicast -= pf->internal_stats.tx_multicast;
+
+ if (ns->eth.tx_broadcast < pf->internal_stats.tx_broadcast)
+ ns->eth.tx_broadcast = 0;
+ else
+ ns->eth.tx_broadcast -= pf->internal_stats.tx_broadcast;
+
/* GLPRT_TEPC not supported */
/* additional port specific stats */
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH] net/i40e: exclude LLDP packet count
2017-12-05 1:29 [dpdk-dev] [PATCH] net/i40e: exclude LLDP packet count Qi Zhang
@ 2017-12-11 8:49 ` Xing, Beilei
2017-12-11 8:51 ` Zhang, Qi Z
0 siblings, 1 reply; 3+ messages in thread
From: Xing, Beilei @ 2017-12-11 8:49 UTC (permalink / raw)
To: Zhang, Qi Z; +Cc: dev
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Tuesday, December 5, 2017 9:30 AM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>
> Subject: [PATCH] net/i40e: exclude LLDP packet count
>
> When use port stats register to calcuate the packet count, LLDP packets are
Patch looks OK for me except some typos.
calcuate -> calculate
> counted in statistics which is not expected, the patch exclude this number
> from total number.
>
> Fixes: 763de290cbd1 ("net/i40e: fix packet count for PF") Cc stable@dpdk.org
>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 58
> +++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 55 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 811cc9f..4cbb259 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -2531,6 +2531,22 @@ i40e_read_stats_registers(struct i40e_pf *pf,
> struct i40e_hw *hw)
> pf->offset_loaded,
> &pf->internal_stats_offset.rx_broadcast,
> &pf->internal_stats.rx_broadcast);
> + /* Get total internal tx packet count */
> + i40e_stat_update_48(hw, I40E_GLV_UPTCH(hw->port),
> + I40E_GLV_UPTCL(hw->port),
> + pf->offset_loaded,
> + &pf->internal_stats_offset.tx_unicast,
> + &pf->internal_stats.tx_unicast);
> + i40e_stat_update_48(hw, I40E_GLV_MPTCH(hw->port),
> + I40E_GLV_MPTCL(hw->port),
> + pf->offset_loaded,
> + &pf->internal_stats_offset.tx_multicast,
> + &pf->internal_stats.tx_multicast);
> + i40e_stat_update_48(hw, I40E_GLV_BPTCH(hw->port),
> + I40E_GLV_BPTCL(hw->port),
> + pf->offset_loaded,
> + &pf->internal_stats_offset.tx_broadcast,
> + &pf->internal_stats.tx_broadcast);
>
> /* exclude CRC size */
> pf->internal_stats.rx_bytes -= (pf->internal_stats.rx_unicast + @@ -
> 2560,16 +2576,32 @@ i40e_read_stats_registers(struct i40e_pf *pf, struct
> i40e_hw *hw)
> ns->eth.rx_bytes -= (ns->eth.rx_unicast + ns->eth.rx_multicast +
> ns->eth.rx_broadcast) * ETHER_CRC_LEN;
>
> - /* Workaround: it is possible I40E_GLV_GORCH[H/L] is updated
> before
> + /* exlude internal rx bytes
exclude
> + * Workaround: it is possible I40E_GLV_GORCH[H/L] is updated
> before
> * I40E_GLPRT_GORCH[H/L], so there is a small window that cause
> negtive
negative
> * value.
> + * same to I40E_GLV_UPRC[H/L], I40E_GLV_MPRC[H/L],
> I40E_GLV_BPRC[H/L].
> */
> if (ns->eth.rx_bytes < pf->internal_stats.rx_bytes)
> ns->eth.rx_bytes = 0;
> - /* exlude internal rx bytes */
> else
> ns->eth.rx_bytes -= pf->internal_stats.rx_bytes;
>
> + if (ns->eth.rx_unicast < pf->internal_stats.rx_unicast)
> + ns->eth.rx_unicast = 0;
> + else
> + ns->eth.rx_unicast -= pf->internal_stats.rx_unicast;
> +
> + if (ns->eth.rx_multicast < pf->internal_stats.rx_multicast)
> + ns->eth.rx_multicast = 0;
> + else
> + ns->eth.rx_multicast -= pf->internal_stats.rx_multicast;
> +
> + if (ns->eth.rx_broadcast < pf->internal_stats.rx_broadcast)
> + ns->eth.rx_broadcast = 0;
> + else
> + ns->eth.rx_broadcast -= pf->internal_stats.rx_broadcast;
> +
> i40e_stat_update_32(hw, I40E_GLPRT_RDPC(hw->port),
> pf->offset_loaded, &os->eth.rx_discards,
> &ns->eth.rx_discards);
> @@ -2598,12 +2630,32 @@ i40e_read_stats_registers(struct i40e_pf *pf,
> struct i40e_hw *hw)
> ns->eth.tx_bytes -= (ns->eth.tx_unicast + ns->eth.tx_multicast +
> ns->eth.tx_broadcast) * ETHER_CRC_LEN;
>
> - /* exclude internal tx bytes */
> + /* exlude internal tx bytes
exclude
> + * Workaround: it is possible I40E_GLV_GOTCH[H/L] is updated
> before
> + * I40E_GLPRT_GOTCH[H/L], so there is a small window that cause
> negtive
negative.
> + * value.
> + * same to I40E_GLV_UPTC[H/L], I40E_GLV_MPTC[H/L],
> I40E_GLV_BPTC[H/L].
> + */
> if (ns->eth.tx_bytes < pf->internal_stats.tx_bytes)
> ns->eth.tx_bytes = 0;
> else
> ns->eth.tx_bytes -= pf->internal_stats.tx_bytes;
>
> + if (ns->eth.tx_unicast < pf->internal_stats.tx_unicast)
> + ns->eth.tx_unicast = 0;
> + else
> + ns->eth.tx_unicast -= pf->internal_stats.tx_unicast;
> +
> + if (ns->eth.tx_multicast < pf->internal_stats.tx_multicast)
> + ns->eth.tx_multicast = 0;
> + else
> + ns->eth.tx_multicast -= pf->internal_stats.tx_multicast;
> +
> + if (ns->eth.tx_broadcast < pf->internal_stats.tx_broadcast)
> + ns->eth.tx_broadcast = 0;
> + else
> + ns->eth.tx_broadcast -= pf->internal_stats.tx_broadcast;
> +
> /* GLPRT_TEPC not supported */
>
> /* additional port specific stats */
> --
> 2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH] net/i40e: exclude LLDP packet count
2017-12-11 8:49 ` Xing, Beilei
@ 2017-12-11 8:51 ` Zhang, Qi Z
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Qi Z @ 2017-12-11 8:51 UTC (permalink / raw)
To: Xing, Beilei; +Cc: dev
Thanks will fix.
> -----Original Message-----
> From: Xing, Beilei
> Sent: Monday, December 11, 2017 4:50 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org
> Subject: RE: [PATCH] net/i40e: exclude LLDP packet count
>
>
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Tuesday, December 5, 2017 9:30 AM
> > To: Xing, Beilei <beilei.xing@intel.com>
> > Cc: dev@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>
> > Subject: [PATCH] net/i40e: exclude LLDP packet count
> >
> > When use port stats register to calcuate the packet count, LLDP
> > packets are
>
> Patch looks OK for me except some typos.
> calcuate -> calculate
>
> > counted in statistics which is not expected, the patch exclude this
> > number from total number.
> >
> > Fixes: 763de290cbd1 ("net/i40e: fix packet count for PF") Cc
> > stable@dpdk.org
> >
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> > ---
> > drivers/net/i40e/i40e_ethdev.c | 58
> > +++++++++++++++++++++++++++++++++++++++---
> > 1 file changed, 55 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > b/drivers/net/i40e/i40e_ethdev.c index 811cc9f..4cbb259 100644
> > --- a/drivers/net/i40e/i40e_ethdev.c
> > +++ b/drivers/net/i40e/i40e_ethdev.c
> > @@ -2531,6 +2531,22 @@ i40e_read_stats_registers(struct i40e_pf *pf,
> > struct i40e_hw *hw)
> > pf->offset_loaded,
> > &pf->internal_stats_offset.rx_broadcast,
> > &pf->internal_stats.rx_broadcast);
> > + /* Get total internal tx packet count */
> > + i40e_stat_update_48(hw, I40E_GLV_UPTCH(hw->port),
> > + I40E_GLV_UPTCL(hw->port),
> > + pf->offset_loaded,
> > + &pf->internal_stats_offset.tx_unicast,
> > + &pf->internal_stats.tx_unicast);
> > + i40e_stat_update_48(hw, I40E_GLV_MPTCH(hw->port),
> > + I40E_GLV_MPTCL(hw->port),
> > + pf->offset_loaded,
> > + &pf->internal_stats_offset.tx_multicast,
> > + &pf->internal_stats.tx_multicast);
> > + i40e_stat_update_48(hw, I40E_GLV_BPTCH(hw->port),
> > + I40E_GLV_BPTCL(hw->port),
> > + pf->offset_loaded,
> > + &pf->internal_stats_offset.tx_broadcast,
> > + &pf->internal_stats.tx_broadcast);
> >
> > /* exclude CRC size */
> > pf->internal_stats.rx_bytes -= (pf->internal_stats.rx_unicast + @@ -
> > 2560,16 +2576,32 @@ i40e_read_stats_registers(struct i40e_pf *pf,
> > struct i40e_hw *hw)
> > ns->eth.rx_bytes -= (ns->eth.rx_unicast + ns->eth.rx_multicast +
> > ns->eth.rx_broadcast) * ETHER_CRC_LEN;
> >
> > - /* Workaround: it is possible I40E_GLV_GORCH[H/L] is updated
> > before
> > + /* exlude internal rx bytes
>
> exclude
>
> > + * Workaround: it is possible I40E_GLV_GORCH[H/L] is updated
> > before
> > * I40E_GLPRT_GORCH[H/L], so there is a small window that cause
> > negtive
>
> negative
>
> > * value.
> > + * same to I40E_GLV_UPRC[H/L], I40E_GLV_MPRC[H/L],
> > I40E_GLV_BPRC[H/L].
> > */
> > if (ns->eth.rx_bytes < pf->internal_stats.rx_bytes)
> > ns->eth.rx_bytes = 0;
> > - /* exlude internal rx bytes */
> > else
> > ns->eth.rx_bytes -= pf->internal_stats.rx_bytes;
> >
> > + if (ns->eth.rx_unicast < pf->internal_stats.rx_unicast)
> > + ns->eth.rx_unicast = 0;
> > + else
> > + ns->eth.rx_unicast -= pf->internal_stats.rx_unicast;
> > +
> > + if (ns->eth.rx_multicast < pf->internal_stats.rx_multicast)
> > + ns->eth.rx_multicast = 0;
> > + else
> > + ns->eth.rx_multicast -= pf->internal_stats.rx_multicast;
> > +
> > + if (ns->eth.rx_broadcast < pf->internal_stats.rx_broadcast)
> > + ns->eth.rx_broadcast = 0;
> > + else
> > + ns->eth.rx_broadcast -= pf->internal_stats.rx_broadcast;
> > +
> > i40e_stat_update_32(hw, I40E_GLPRT_RDPC(hw->port),
> > pf->offset_loaded, &os->eth.rx_discards,
> > &ns->eth.rx_discards);
> > @@ -2598,12 +2630,32 @@ i40e_read_stats_registers(struct i40e_pf *pf,
> > struct i40e_hw *hw)
> > ns->eth.tx_bytes -= (ns->eth.tx_unicast + ns->eth.tx_multicast +
> > ns->eth.tx_broadcast) * ETHER_CRC_LEN;
> >
> > - /* exclude internal tx bytes */
> > + /* exlude internal tx bytes
>
> exclude
>
> > + * Workaround: it is possible I40E_GLV_GOTCH[H/L] is updated
> > before
> > + * I40E_GLPRT_GOTCH[H/L], so there is a small window that cause
> > negtive
>
> negative.
>
> > + * value.
> > + * same to I40E_GLV_UPTC[H/L], I40E_GLV_MPTC[H/L],
> > I40E_GLV_BPTC[H/L].
> > + */
> > if (ns->eth.tx_bytes < pf->internal_stats.tx_bytes)
> > ns->eth.tx_bytes = 0;
> > else
> > ns->eth.tx_bytes -= pf->internal_stats.tx_bytes;
> >
> > + if (ns->eth.tx_unicast < pf->internal_stats.tx_unicast)
> > + ns->eth.tx_unicast = 0;
> > + else
> > + ns->eth.tx_unicast -= pf->internal_stats.tx_unicast;
> > +
> > + if (ns->eth.tx_multicast < pf->internal_stats.tx_multicast)
> > + ns->eth.tx_multicast = 0;
> > + else
> > + ns->eth.tx_multicast -= pf->internal_stats.tx_multicast;
> > +
> > + if (ns->eth.tx_broadcast < pf->internal_stats.tx_broadcast)
> > + ns->eth.tx_broadcast = 0;
> > + else
> > + ns->eth.tx_broadcast -= pf->internal_stats.tx_broadcast;
> > +
> > /* GLPRT_TEPC not supported */
> >
> > /* additional port specific stats */
> > --
> > 2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-11 8:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-05 1:29 [dpdk-dev] [PATCH] net/i40e: exclude LLDP packet count Qi Zhang
2017-12-11 8:49 ` Xing, Beilei
2017-12-11 8:51 ` Zhang, Qi Z
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).