net/iavf: fix stats reset
Checks
Commit Message
stats_reset has been missed when support stats in iavf driver.
This patch add statistics reset function.
Fixes: f4a41a6953af ("net/avf: support stats")
Cc: stable@dpdk.org
Signed-off-by: Qiming Yang <qiming.yang@intel.com>
---
drivers/net/iavf/iavf.h | 6 ++++
drivers/net/iavf/iavf_ethdev.c | 75 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
Comments
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qiming Yang
> Sent: Monday, April 22, 2019 10:19 AM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/iavf: fix stats reset
>
> stats_reset has been missed when support stats in iavf driver.
> This patch add statistics reset function.
>
> Fixes: f4a41a6953af ("net/avf: support stats")
> Cc: stable@dpdk.org
>
> Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
On 4/22/2019 3:18 AM, Qiming Yang wrote:
> stats_reset has been missed when support stats in iavf driver.
> This patch add statistics reset function.
>
> Fixes: f4a41a6953af ("net/avf: support stats")
> Cc: stable@dpdk.org
>
> Signed-off-by: Qiming Yang <qiming.yang@intel.com>
<...>
> @@ -977,16 +979,71 @@ iavf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
> return 0;
> }
>
> +static void
> +iavf_stat_update_48(uint64_t *offset,
> + uint64_t *stat)
> +{
> + if (*stat >= *offset)
> + *stat = *stat - *offset;
> + else
> + *stat = (uint64_t)((*stat +
> + ((uint64_t)1 << IAVF_48_BIT_WIDTH)) - *offset);
> +
> + *stat &= IAVF_48_BIT_MASK;
> +}
> +
> +static void
> +iavf_stat_update_32(uint64_t *offset,
> + uint64_t *stat)
> +{
> + if (*stat >= *offset)
> + *stat = (uint64_t)(*stat - *offset);
> + else
> + *stat = (uint64_t)((*stat +
> + ((uint64_t)1 << IAVF_32_BIT_WIDTH)) - *offset);
> +}
> +
> +static void
> +iavf_update_stats(struct iavf_vsi *vsi,
> + struct virtchnl_eth_stats *nes)
This syntax looks odd, will fix while merging, similar to above functions, no
need to break parameter lines into multiple line, will update them too.
On 22/04/2019 03:18, Qiming Yang wrote:
> stats_reset has been missed when support stats in iavf driver.
> This patch add statistics reset function.
>
> Fixes: f4a41a6953af ("net/avf: support stats")
> Cc: stable@dpdk.org
>
> Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Hi - This won't apply on 18.11 branch. Please send a backport, or let me
know if it's not needed. Btw, adding an "i" prefix to every
filename/define/struct/function is a pain for backports :/
@@ -6,6 +6,7 @@
#define _IAVF_ETHDEV_H_
#include <rte_kvargs.h>
+#include "base/iavf_type.h"
#define IAVF_AQ_LEN 32
#define IAVF_AQ_BUF_SZ 4096
@@ -58,6 +59,10 @@
#define IAVF_ETH_OVERHEAD \
(ETHER_HDR_LEN + ETHER_CRC_LEN + IAVF_VLAN_TAG_SIZE * 2)
+#define IAVF_32_BIT_WIDTH (CHAR_BIT * 4)
+#define IAVF_48_BIT_WIDTH (CHAR_BIT * 6)
+#define IAVF_48_BIT_MASK RTE_LEN2MASK(IAVF_48_BIT_WIDTH, uint64_t)
+
struct iavf_adapter;
struct iavf_rx_queue;
struct iavf_tx_queue;
@@ -71,6 +76,7 @@ struct iavf_vsi {
uint16_t max_macaddrs; /* Maximum number of MAC addresses */
uint16_t base_vector;
uint16_t msix_intr; /* The MSIX interrupt binds to VSI */
+ struct virtchnl_eth_stats eth_stats_offset;
};
/* TODO: is that correct to assume the max number to be 16 ?*/
@@ -42,6 +42,7 @@ static void iavf_dev_info_get(struct rte_eth_dev *dev,
static const uint32_t *iavf_dev_supported_ptypes_get(struct rte_eth_dev *dev);
static int iavf_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats);
+static void iavf_dev_stats_reset(struct rte_eth_dev *dev);
static void iavf_dev_promiscuous_enable(struct rte_eth_dev *dev);
static void iavf_dev_promiscuous_disable(struct rte_eth_dev *dev);
static void iavf_dev_allmulticast_enable(struct rte_eth_dev *dev);
@@ -89,6 +90,7 @@ static const struct eth_dev_ops iavf_eth_dev_ops = {
.dev_supported_ptypes_get = iavf_dev_supported_ptypes_get,
.link_update = iavf_dev_link_update,
.stats_get = iavf_dev_stats_get,
+ .stats_reset = iavf_dev_stats_reset,
.promiscuous_enable = iavf_dev_promiscuous_enable,
.promiscuous_disable = iavf_dev_promiscuous_disable,
.allmulticast_enable = iavf_dev_allmulticast_enable,
@@ -977,16 +979,71 @@ iavf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
return 0;
}
+static void
+iavf_stat_update_48(uint64_t *offset,
+ uint64_t *stat)
+{
+ if (*stat >= *offset)
+ *stat = *stat - *offset;
+ else
+ *stat = (uint64_t)((*stat +
+ ((uint64_t)1 << IAVF_48_BIT_WIDTH)) - *offset);
+
+ *stat &= IAVF_48_BIT_MASK;
+}
+
+static void
+iavf_stat_update_32(uint64_t *offset,
+ uint64_t *stat)
+{
+ if (*stat >= *offset)
+ *stat = (uint64_t)(*stat - *offset);
+ else
+ *stat = (uint64_t)((*stat +
+ ((uint64_t)1 << IAVF_32_BIT_WIDTH)) - *offset);
+}
+
+static void
+iavf_update_stats(struct iavf_vsi *vsi,
+ struct virtchnl_eth_stats *nes)
+{
+ struct virtchnl_eth_stats *oes = &vsi->eth_stats_offset;
+
+ iavf_stat_update_48(&oes->rx_bytes,
+ &nes->rx_bytes);
+ iavf_stat_update_48(&oes->rx_unicast,
+ &nes->rx_unicast);
+ iavf_stat_update_48(&oes->rx_multicast,
+ &nes->rx_multicast);
+ iavf_stat_update_48(&oes->rx_broadcast,
+ &nes->rx_broadcast);
+ iavf_stat_update_32(&oes->rx_discards,
+ &nes->rx_discards);
+ iavf_stat_update_48(&oes->tx_bytes,
+ &nes->tx_bytes);
+ iavf_stat_update_48(&oes->tx_unicast,
+ &nes->tx_unicast);
+ iavf_stat_update_48(&oes->tx_multicast,
+ &nes->tx_multicast);
+ iavf_stat_update_48(&oes->tx_broadcast,
+ &nes->tx_broadcast);
+ iavf_stat_update_32(&oes->tx_errors, &nes->tx_errors);
+ iavf_stat_update_32(&oes->tx_discards, &nes->tx_discards);
+}
+
static int
iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
struct iavf_adapter *adapter =
IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+ struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+ struct iavf_vsi *vsi = &vf->vsi;
struct virtchnl_eth_stats *pstats = NULL;
int ret;
ret = iavf_query_stats(adapter, &pstats);
if (ret == 0) {
+ iavf_update_stats(vsi, pstats);
stats->ipackets = pstats->rx_unicast + pstats->rx_multicast +
pstats->rx_broadcast;
stats->opackets = pstats->tx_broadcast + pstats->tx_multicast +
@@ -1001,6 +1058,24 @@ iavf_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
return -EIO;
}
+static void
+iavf_dev_stats_reset(struct rte_eth_dev *dev)
+{
+ int ret;
+ struct iavf_adapter *adapter =
+ IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+ struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+ struct iavf_vsi *vsi = &vf->vsi;
+ struct virtchnl_eth_stats *pstats = NULL;
+
+ /* read stat values to clear hardware registers */
+ ret = iavf_query_stats(adapter, &pstats);
+
+ /* set stats offset base on current values */
+ if (ret == 0)
+ vsi->eth_stats_offset = *pstats;
+}
+
static int
iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
{