i40e and i40evf currently use two different names for the statistic on dropped packets on the rx and tx sides. Let's prefer i40evf so that all statistics are suffixed with _packets. This also avoids a statistic name conflict in OVS. Fixes: f4a91c38b4ad ("i40e: add extended stats") Cc: stable@dpdk.org Signed-off-by: David Marchand <david.marchand@redhat.com> --- drivers/net/i40e/i40e_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 7fa9e1b..2384d4d 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -526,13 +526,13 @@ struct rte_i40e_xstats_name_off { {"rx_unicast_packets", offsetof(struct i40e_eth_stats, rx_unicast)}, {"rx_multicast_packets", offsetof(struct i40e_eth_stats, rx_multicast)}, {"rx_broadcast_packets", offsetof(struct i40e_eth_stats, rx_broadcast)}, - {"rx_dropped", offsetof(struct i40e_eth_stats, rx_discards)}, + {"rx_dropped_packets", offsetof(struct i40e_eth_stats, rx_discards)}, {"rx_unknown_protocol_packets", offsetof(struct i40e_eth_stats, rx_unknown_protocol)}, {"tx_unicast_packets", offsetof(struct i40e_eth_stats, tx_unicast)}, {"tx_multicast_packets", offsetof(struct i40e_eth_stats, tx_multicast)}, {"tx_broadcast_packets", offsetof(struct i40e_eth_stats, tx_broadcast)}, - {"tx_dropped", offsetof(struct i40e_eth_stats, tx_discards)}, + {"tx_dropped_packets", offsetof(struct i40e_eth_stats, tx_discards)}, }; #define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \ -- 1.8.3.1
Copy/paste from i40e, let's align with the fix on i40e. Fixes: a37bde56314d ("net/ice: support statistics") Cc: stable@dpdk.org Signed-off-by: David Marchand <david.marchand@redhat.com> --- drivers/net/ice/ice_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index bdbceb4..6cd1c74 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -153,13 +153,13 @@ struct ice_xstats_name_off { {"rx_unicast_packets", offsetof(struct ice_eth_stats, rx_unicast)}, {"rx_multicast_packets", offsetof(struct ice_eth_stats, rx_multicast)}, {"rx_broadcast_packets", offsetof(struct ice_eth_stats, rx_broadcast)}, - {"rx_dropped", offsetof(struct ice_eth_stats, rx_discards)}, + {"rx_dropped_packets", offsetof(struct ice_eth_stats, rx_discards)}, {"rx_unknown_protocol_packets", offsetof(struct ice_eth_stats, rx_unknown_protocol)}, {"tx_unicast_packets", offsetof(struct ice_eth_stats, tx_unicast)}, {"tx_multicast_packets", offsetof(struct ice_eth_stats, tx_multicast)}, {"tx_broadcast_packets", offsetof(struct ice_eth_stats, tx_broadcast)}, - {"tx_dropped", offsetof(struct ice_eth_stats, tx_discards)}, + {"tx_dropped_packets", offsetof(struct ice_eth_stats, tx_discards)}, }; #define ICE_NB_ETH_XSTATS (sizeof(ice_stats_strings) / \ -- 1.8.3.1
Looks good to me…
Acked-by: Eelco Chaudron <echaudro@redhat.com>
On 3 Jun 2019, at 10:31, David Marchand wrote:
> i40e and i40evf currently use two different names for the statistic on
> dropped packets on the rx and tx sides.
> Let's prefer i40evf so that all statistics are suffixed with _packets.
>
> This also avoids a statistic name conflict in OVS.
>
> Fixes: f4a91c38b4ad ("i40e: add extended stats")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c
> b/drivers/net/i40e/i40e_ethdev.c
> index 7fa9e1b..2384d4d 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -526,13 +526,13 @@ struct rte_i40e_xstats_name_off {
> {"rx_unicast_packets", offsetof(struct i40e_eth_stats, rx_unicast)},
> {"rx_multicast_packets", offsetof(struct i40e_eth_stats,
> rx_multicast)},
> {"rx_broadcast_packets", offsetof(struct i40e_eth_stats,
> rx_broadcast)},
> - {"rx_dropped", offsetof(struct i40e_eth_stats, rx_discards)},
> + {"rx_dropped_packets", offsetof(struct i40e_eth_stats,
> rx_discards)},
> {"rx_unknown_protocol_packets", offsetof(struct i40e_eth_stats,
> rx_unknown_protocol)},
> {"tx_unicast_packets", offsetof(struct i40e_eth_stats, tx_unicast)},
> {"tx_multicast_packets", offsetof(struct i40e_eth_stats,
> tx_multicast)},
> {"tx_broadcast_packets", offsetof(struct i40e_eth_stats,
> tx_broadcast)},
> - {"tx_dropped", offsetof(struct i40e_eth_stats, tx_discards)},
> + {"tx_dropped_packets", offsetof(struct i40e_eth_stats,
> tx_discards)},
> };
>
> #define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \
> --
> 1.8.3.1
Looks good to me…
Acked-by: Eelco Chaudron <echaudro@redhat.com>
On 3 Jun 2019, at 10:31, David Marchand wrote:
> Copy/paste from i40e, let's align with the fix on i40e.
>
> Fixes: a37bde56314d ("net/ice: support statistics")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/ice/ice_ethdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index bdbceb4..6cd1c74 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -153,13 +153,13 @@ struct ice_xstats_name_off {
> {"rx_unicast_packets", offsetof(struct ice_eth_stats, rx_unicast)},
> {"rx_multicast_packets", offsetof(struct ice_eth_stats, rx_multicast)},
> {"rx_broadcast_packets", offsetof(struct ice_eth_stats, rx_broadcast)},
> - {"rx_dropped", offsetof(struct ice_eth_stats, rx_discards)},
> + {"rx_dropped_packets", offsetof(struct ice_eth_stats, rx_discards)},
> {"rx_unknown_protocol_packets", offsetof(struct ice_eth_stats,
> rx_unknown_protocol)},
> {"tx_unicast_packets", offsetof(struct ice_eth_stats, tx_unicast)},
> {"tx_multicast_packets", offsetof(struct ice_eth_stats, tx_multicast)},
> {"tx_broadcast_packets", offsetof(struct ice_eth_stats, tx_broadcast)},
> - {"tx_dropped", offsetof(struct ice_eth_stats, tx_discards)},
> + {"tx_dropped_packets", offsetof(struct ice_eth_stats, tx_discards)},
> };
>
> #define ICE_NB_ETH_XSTATS (sizeof(ice_stats_strings) / \
> --
> 1.8.3.1
Hello guys,
Can you review this patch please?
Thanks.
On Mon, Jun 3, 2019 at 10:32 AM David Marchand <david.marchand@redhat.com>
wrote:
> i40e and i40evf currently use two different names for the statistic on
> dropped packets on the rx and tx sides.
> Let's prefer i40evf so that all statistics are suffixed with _packets.
>
> This also avoids a statistic name conflict in OVS.
>
> Fixes: f4a91c38b4ad ("i40e: add extended stats")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c
> b/drivers/net/i40e/i40e_ethdev.c
> index 7fa9e1b..2384d4d 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -526,13 +526,13 @@ struct rte_i40e_xstats_name_off {
> {"rx_unicast_packets", offsetof(struct i40e_eth_stats,
> rx_unicast)},
> {"rx_multicast_packets", offsetof(struct i40e_eth_stats,
> rx_multicast)},
> {"rx_broadcast_packets", offsetof(struct i40e_eth_stats,
> rx_broadcast)},
> - {"rx_dropped", offsetof(struct i40e_eth_stats, rx_discards)},
> + {"rx_dropped_packets", offsetof(struct i40e_eth_stats,
> rx_discards)},
> {"rx_unknown_protocol_packets", offsetof(struct i40e_eth_stats,
> rx_unknown_protocol)},
> {"tx_unicast_packets", offsetof(struct i40e_eth_stats,
> tx_unicast)},
> {"tx_multicast_packets", offsetof(struct i40e_eth_stats,
> tx_multicast)},
> {"tx_broadcast_packets", offsetof(struct i40e_eth_stats,
> tx_broadcast)},
> - {"tx_dropped", offsetof(struct i40e_eth_stats, tx_discards)},
> + {"tx_dropped_packets", offsetof(struct i40e_eth_stats,
> tx_discards)},
> };
>
> #define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \
> --
> 1.8.3.1
>
>
--
David Marchand
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of David Marchand
> Sent: Monday, June 3, 2019 4:31 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Subject: [dpdk-dev] [PATCH 1/2] net/i40e: fix dropped packets statistics
> name
>
> i40e and i40evf currently use two different names for the statistic on
> dropped packets on the rx and tx sides.
> Let's prefer i40evf so that all statistics are suffixed with _packets.
>
> This also avoids a statistic name conflict in OVS.
>
> Fixes: f4a91c38b4ad ("i40e: add extended stats")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 7fa9e1b..2384d4d 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -526,13 +526,13 @@ struct rte_i40e_xstats_name_off {
> {"rx_unicast_packets", offsetof(struct i40e_eth_stats, rx_unicast)},
> {"rx_multicast_packets", offsetof(struct i40e_eth_stats,
> rx_multicast)},
> {"rx_broadcast_packets", offsetof(struct i40e_eth_stats,
> rx_broadcast)},
> - {"rx_dropped", offsetof(struct i40e_eth_stats, rx_discards)},
> + {"rx_dropped_packets", offsetof(struct i40e_eth_stats, rx_discards)},
> {"rx_unknown_protocol_packets", offsetof(struct i40e_eth_stats,
> rx_unknown_protocol)},
> {"tx_unicast_packets", offsetof(struct i40e_eth_stats, tx_unicast)},
> {"tx_multicast_packets", offsetof(struct i40e_eth_stats, tx_multicast)},
> {"tx_broadcast_packets", offsetof(struct i40e_eth_stats,
> tx_broadcast)},
> - {"tx_dropped", offsetof(struct i40e_eth_stats, tx_discards)},
> + {"tx_dropped_packets", offsetof(struct i40e_eth_stats, tx_discards)},
> };
>
> #define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \
> --
> 1.8.3.1
Acked-by: Beilei Xing <beilei.xing@intel.com>
> -----Original Message-----
> From: Xing, Beilei
> Sent: Wednesday, June 12, 2019 9:35 AM
> To: David Marchand <david.marchand@redhat.com>; dev@dpdk.org
> Cc: stable@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>
> Subject: RE: [dpdk-dev] [PATCH 1/2] net/i40e: fix dropped packets statistics
> name
>
>
>
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of David Marchand
> > Sent: Monday, June 3, 2019 4:31 PM
> > To: dev@dpdk.org
> > Cc: stable@dpdk.org; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>
> > Subject: [dpdk-dev] [PATCH 1/2] net/i40e: fix dropped packets
> > statistics name
> >
> > i40e and i40evf currently use two different names for the statistic on
> > dropped packets on the rx and tx sides.
> > Let's prefer i40evf so that all statistics are suffixed with _packets.
> >
> > This also avoids a statistic name conflict in OVS.
> >
> > Fixes: f4a91c38b4ad ("i40e: add extended stats")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
>
> Acked-by: Beilei Xing <beilei.xing@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Eelco Chaudron
> Sent: Monday, June 3, 2019 4:53 PM
> To: David Marchand <david.marchand@redhat.com>
> Cc: dev@dpdk.org; stable@dpdk.org; Yang, Qiming <qiming.yang@intel.com>;
> Lu, Wenzhuo <wenzhuo.lu@intel.com>
> Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] net/ice: fix dropped packets
> statistics name
>
> Looks good to me…
>
> Acked-by: Eelco Chaudron <echaudro@redhat.com>
>
> On 3 Jun 2019, at 10:31, David Marchand wrote:
>
> > Copy/paste from i40e, let's align with the fix on i40e.
> >
> > Fixes: a37bde56314d ("net/ice: support statistics")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> > drivers/net/ice/ice_ethdev.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c
> > b/drivers/net/ice/ice_ethdev.c index bdbceb4..6cd1c74 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -153,13 +153,13 @@ struct ice_xstats_name_off {
> > {"rx_unicast_packets", offsetof(struct ice_eth_stats, rx_unicast)},
> > {"rx_multicast_packets", offsetof(struct ice_eth_stats, rx_multicast)},
> > {"rx_broadcast_packets", offsetof(struct ice_eth_stats, rx_broadcast)},
> > - {"rx_dropped", offsetof(struct ice_eth_stats, rx_discards)},
> > + {"rx_dropped_packets", offsetof(struct ice_eth_stats, rx_discards)},
> > {"rx_unknown_protocol_packets", offsetof(struct ice_eth_stats,
> > rx_unknown_protocol)},
> > {"tx_unicast_packets", offsetof(struct ice_eth_stats, tx_unicast)},
> > {"tx_multicast_packets", offsetof(struct ice_eth_stats, tx_multicast)},
> > {"tx_broadcast_packets", offsetof(struct ice_eth_stats, tx_broadcast)},
> > - {"tx_dropped", offsetof(struct ice_eth_stats, tx_discards)},
> > + {"tx_dropped_packets", offsetof(struct ice_eth_stats, tx_discards)},
> > };
> >
> > #define ICE_NB_ETH_XSTATS (sizeof(ice_stats_strings) / \
> > --
> > 1.8.3.1
Applied to dpdk-next-next-intel.
Thanks
Qi