From: Michal Jastrzebski <michalx.k.jastrzeb...@intel.com>
If-MIB xstats:
ifNumber
ifIndex
ifType
ifMtu
ifSpeed
ifPhysAddress
ifOperStatus
ifLastChange
ifHighSpeed
ifConnectorPresent
ifCounterDiscontinuityTime
EtherLike-MIB xstats:
dot3PauseOperMode
dot3StatsDuplexStatus
dot3StatsRateControlAbility
dot3StatsRateControlStatus
dot3ControlFunctionsSupported
-updated in v2: coding style
Signed-off-by: Piotr Azarewicz <piotrx.t.azarew...@intel.com>
Signed-off-by: Michal Jastrzebski <michalx.k.jastrzeb...@intel.com>
Signed-off-by: Radu Nicolau <radu.nico...@intel.com>
---
drivers/net/i40e/i40e_ethdev.c | 171 ++++++++++++++++++++++++++++++++++++++++-
drivers/net/i40e/i40e_ethdev.h | 60 +++++++++++++++
2 files changed, 230 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 4ee1113..1926ce7 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -630,6 +630,45 @@ static const struct rte_i40e_xstats_name_off
rte_i40e_txq_prio_strings[] = {
#define I40E_NB_TXQ_PRIO_XSTATS (sizeof(rte_i40e_txq_prio_strings) / \
sizeof(rte_i40e_txq_prio_strings[0]))
+static const struct rte_i40e_xstats_name_off i40e_if_mib_strings[] = {
+ {"ifNumber", offsetof(struct i40e_if_mib_stats, if_number)},
+ {"ifIndex", offsetof(struct i40e_if_mib_stats, if_index)},
+ {"ifType", offsetof(struct i40e_if_mib_stats, if_type)},
+ {"ifMtu", offsetof(struct i40e_if_mib_stats, if_mtu)},
+ {"ifSpeed", offsetof(struct i40e_if_mib_stats, if_speed)},
+ {"ifPhysAddress", offsetof(struct i40e_if_mib_stats, if_phys_address)},
+ {"ifOperStatus", offsetof(struct i40e_if_mib_stats, if_oper_status)},
+ {"ifLastChange", offsetof(struct i40e_if_mib_stats, if_last_change)},
+ {"ifHighSpeed", offsetof(struct i40e_if_mib_stats, if_high_speed)},
+ {"ifConnectorPresent", offsetof(struct i40e_if_mib_stats,
+ if_connector_present)},
+ {"ifCounterDiscontinuityTime", offsetof(struct i40e_if_mib_stats,
+ if_counter_discontinuity_time)},
+};
+
+#define I40E_NB_IF_MIB_XSTATS (sizeof(i40e_if_mib_strings) / \
+ sizeof(i40e_if_mib_strings[0]))
+
+static const struct rte_i40e_xstats_name_off i40e_ether_like_mib_strings[] = {
+ {"dot3PauseOperMode", offsetof(struct i40e_ether_like_mib_stats,
+ dot3_pause_oper_mode)},
+ {"dot3StatsDuplexStatus", offsetof(struct i40e_ether_like_mib_stats,
+ dot3_stats_duplex_status)},
+ {"dot3StatsRateControlAbility", offsetof(
+ struct i40e_ether_like_mib_stats,
+ dot3_stats_rate_control_ability)},
+ {"dot3StatsRateControlStatus", offsetof(
+ struct i40e_ether_like_mib_stats,
+ dot3_stats_rate_control_status)},
+ {"dot3ControlFunctionsSupported", offsetof(
+ struct i40e_ether_like_mib_stats,
+ dot3_control_functions_supported)},
+};
+
+#define I40E_NB_ETHER_LIKE_MIB_XSTATS \
+ (sizeof(i40e_ether_like_mib_strings) / \
+ sizeof(i40e_ether_like_mib_strings[0]))
+
static int eth_i40e_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
{
@@ -1273,6 +1312,11 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
/* initialize pf host driver to setup SRIOV resource if applicable */
i40e_pf_host_init(dev);
+ /* indicate sysUpTime start */
+ pf->adapter->sys_up_time_start = rte_rdtsc();
+ pf->adapter->if_last_change = 0;
+ pf->adapter->if_counter_discontinuity_time = 0;
+
/* register callback func to eal lib */
rte_intr_callback_register(intr_handle,
i40e_dev_interrupt_handler, dev);
@@ -2235,6 +2279,8 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
#define CHECK_INTERVAL 100 /* 100ms */
#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct i40e_adapter *adapter =
+ I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
struct i40e_link_status link_status;
struct rte_eth_link link, old;
int status;
@@ -2303,6 +2349,7 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
if (link.link_status == old.link_status)
return -1;
+ adapter->if_last_change = rte_rdtsc() - adapter->sys_up_time_start;
i40e_notify_all_vfs_link_status(dev);
return 0;
@@ -2703,6 +2750,9 @@ i40e_dev_stats_reset(struct rte_eth_dev *dev)
/* read the stats, reading current register values into offset */
i40e_read_stats_registers(pf, hw);
+
+ pf->adapter->if_counter_discontinuity_time =
+ rte_rdtsc() - pf->adapter->sys_up_time_start;
}
static uint32_t
@@ -2710,7 +2760,8 @@ i40e_xstats_calc_num(void)
{
return I40E_NB_ETH_XSTATS + I40E_NB_HW_PORT_XSTATS +
(I40E_NB_RXQ_PRIO_XSTATS * 8) +
- (I40E_NB_TXQ_PRIO_XSTATS * 8);
+ (I40E_NB_TXQ_PRIO_XSTATS * 8) +
+ I40E_NB_IF_MIB_XSTATS + I40E_NB_ETHER_LIKE_MIB_XSTATS;
}
static int i40e_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
@@ -2760,9 +2811,105 @@ static int i40e_dev_xstats_get_names(__rte_unused
struct rte_eth_dev *dev,
count++;
}
}
+
+ /* Get stats from IF-MIB objects */
+ for (i = 0; i < I40E_NB_IF_MIB_XSTATS; i++) {
+ snprintf(xstats_names[count].name,
+ sizeof(xstats_names[count].name),
+ "%s", i40e_if_mib_strings[i].name);
+ count++;
+ }
+
+ /* Get stats from Ethernet-like-MIB objects */
+ for (i = 0; i < I40E_NB_ETHER_LIKE_MIB_XSTATS; i++) {
+ snprintf(xstats_names[count].name,
+ sizeof(xstats_names[count].name),
+ "%s", i40e_ether_like_mib_strings[i].name);
+ count++;
+ }
+
return count;
}
+static void
+i40e_read_if_mib(struct rte_eth_dev *dev, struct i40e_if_mib_stats *stats)
+{
+ struct rte_eth_dev_data *data = dev->data;
+ struct rte_device *device = dev->device;
+ struct i40e_adapter *adapter =
+ I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+
+ stats->if_number = rte_eth_dev_count();
+ stats->if_index = data->port_id + 1;
+ stats->if_type = I40E_MIB_IF_TYPE_ETHERNETCSMACD;
+ stats->if_mtu = data->mtu;
+ stats->if_speed = (data->dev_link.link_speed < (UINT32_MAX / 1000000)) ?
+ (data->dev_link.link_speed * 1000000) : UINT32_MAX;
+ stats->if_phys_address = 0;
+ ether_addr_copy(data->mac_addrs,
+ (struct ether_addr *)&stats->if_phys_address);
+ stats->if_oper_status = data->dev_link.link_status ?
+ I40E_MIB_TRUTH_TRUE : I40E_MIB_TRUTH_FALSE;
+ stats->if_last_change = adapter->if_last_change /
+ (rte_get_tsc_hz() * 100);
+ stats->if_high_speed = data->dev_link.link_speed;
+ if (device->devargs)
+ stats->if_connector_present =
+ (device->devargs->type == RTE_DEVTYPE_VIRTUAL) ?
+ I40E_MIB_TRUTH_FALSE :
+ I40E_MIB_TRUTH_TRUE;
+ else
+ stats->if_connector_present = 0;
+ stats->if_counter_discontinuity_time =
+ adapter->if_counter_discontinuity_time /
+ (rte_get_tsc_hz() * 100);
+}
+
+static void
+i40e_read_ether_like_mib(struct rte_eth_dev *dev,
+ struct i40e_ether_like_mib_stats *stats)
+{
+ struct rte_eth_dev_data *data = dev->data;
+ struct i40e_hw *hw =
+ I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+ switch (hw->fc.current_mode) {
+ case I40E_FC_NONE:
+ stats->dot3_pause_oper_mode = I40E_DOT3_PAUSE_DISABLED;
+ break;
+ case I40E_FC_RX_PAUSE:
+ stats->dot3_pause_oper_mode = I40E_DOT3_PAUSE_ENABLEDRCV;
+ break;
+ case I40E_FC_TX_PAUSE:
+ stats->dot3_pause_oper_mode = I40E_DOT3_PAUSE_ENABLEDXMIT;
+ break;
+ case I40E_FC_FULL:
+ stats->dot3_pause_oper_mode =
+ I40E_DOT3_PAUSE_ENABLEDXMITANDRCV;
+ break;
+ default:
+ stats->dot3_pause_oper_mode = 0;
+ break;
+ }
+
+ switch (data->dev_link.link_duplex) {
+ case ETH_LINK_FULL_DUPLEX:
+ stats->dot3_stats_duplex_status = I40E_DOT3_DUPLEX_FULLDUPLEX;
+ break;
+ case ETH_LINK_HALF_DUPLEX:
+ stats->dot3_stats_duplex_status = I40E_DOT3_DUPLEX_HALFDUPLEX;
+ break;
+ default:
+ stats->dot3_stats_duplex_status = I40E_DOT3_DUPLEX_UNKNOWN;
+ break;
+ }
+
+ stats->dot3_stats_rate_control_ability = I40E_MIB_TRUTH_FALSE;
+ stats->dot3_stats_rate_control_status = I40E_DOT3_RATE_CONTROL_OFF;
+ stats->dot3_control_functions_supported = I40E_DOT3_CF_PAUSE |
+ I40E_DOT3_CF_PFC;
+}
+
static int
i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
unsigned n)
@@ -2771,6 +2918,8 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
unsigned i, count, prio;
struct i40e_hw_port_stats *hw_stats = &pf->stats;
+ struct i40e_if_mib_stats if_mib_stats;
+ struct i40e_ether_like_mib_stats ether_like_mib_stats;
count = i40e_xstats_calc_num();
if (n < count)
@@ -2778,6 +2927,9 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
i40e_read_stats_registers(pf, hw);
+ i40e_read_if_mib(dev, &if_mib_stats);
+ i40e_read_ether_like_mib(dev, ðer_like_mib_stats);
+
if (xstats == NULL)
return 0;
@@ -2821,6 +2973,23 @@ i40e_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
}
}
+ /* Get stats from IF-MIB objects */
+ for (i = 0; i < I40E_NB_IF_MIB_XSTATS; i++) {
+ xstats[count].value = *(uint64_t *)(((char *)&if_mib_stats) +
+ i40e_if_mib_strings[i].offset);
+ xstats[count].id = count;
+ count++;
+ }
+
+ /* Get stats from Ethernet-like-MIB objects */
+ for (i = 0; i < I40E_NB_ETHER_LIKE_MIB_XSTATS; i++) {
+ xstats[count].value =
+ *(uint64_t *)(((char *)ðer_like_mib_stats) +
+ i40e_ether_like_mib_strings[i].offset);
+ xstats[count].id = count;
+ count++;
+ }
+
return count;
}
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 183dc17..c8b6944 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -650,6 +650,62 @@ struct rte_flow {
TAILQ_HEAD(i40e_flow_list, rte_flow);
+#define I40E_MIB_IF_TYPE_ETHERNETCSMACD 6
+
+enum {
+ I40E_MIB_TRUTH_TRUE = 1,
+ I40E_MIB_TRUTH_FALSE
+};
+
+/* IF-MIB statistics */
+struct i40e_if_mib_stats {
+ uint64_t if_number; /* ifNumber */
+ uint64_t if_index; /* ifIndex */
+ uint64_t if_type; /* ifType */
+ uint64_t if_mtu; /* ifMtu */
+ uint64_t if_speed; /* ifSpeed */
+ uint64_t if_phys_address; /* ifPhysAddress */
+ uint64_t if_oper_status; /* ifOperStatus */
+ uint64_t if_last_change; /* ifLastChange */
+ uint64_t if_high_speed; /* ifHighSpeed */
+ uint64_t if_connector_present; /* ifConnectorPresent */
+ uint64_t if_counter_discontinuity_time; /* ifCounterDiscontinuityTime */
+};
+
+enum {
+ I40E_DOT3_PAUSE_DISABLED = 1,
+ I40E_DOT3_PAUSE_ENABLEDXMIT,
+ I40E_DOT3_PAUSE_ENABLEDRCV,
+ I40E_DOT3_PAUSE_ENABLEDXMITANDRCV
+};
+
+enum {
+ I40E_DOT3_DUPLEX_UNKNOWN = 1,
+ I40E_DOT3_DUPLEX_HALFDUPLEX,
+ I40E_DOT3_DUPLEX_FULLDUPLEX
+};
+
+enum {
+ I40E_DOT3_RATE_CONTROL_OFF = 1,
+ I40E_DOT3_RATE_CONTROL_ON,
+ I40E_DOT3_RATE_CONTROL_UNKNOWN
+};
+
+#define I40E_DOT3_CF_PAUSE (1 << 0) /* PAUSE command implemented */
+#define I40E_DOT3_CF_MPCP (1 << 1) /* MPCP implemented */
+#define I40E_DOT3_CF_PFC (1 << 2) /* PFC implemented */
+
+/* Ethernet-like-MIB statistics */
+struct i40e_ether_like_mib_stats {
+ uint64_t dot3_pause_oper_mode; /* dot3PauseOperMode */
+ uint64_t dot3_stats_duplex_status; /* dot3StatsDuplexStatus */
+ uint64_t dot3_stats_rate_control_ability;
+ /* dot3StatsRateControlAbility */
+ uint64_t dot3_stats_rate_control_status;/* dot3StatsRateControlStatus */
+ uint64_t dot3_control_functions_supported;
+ /* dot3ControlFunctionsSupported */
+};
+
/*
* Structure to store private data specific for PF instance.
*/
@@ -808,6 +864,10 @@ struct i40e_adapter {
struct rte_timecounter rx_tstamp_tc;
struct rte_timecounter tx_tstamp_tc;
+ uint64_t sys_up_time_start;
+ uint64_t if_last_change;
+ uint64_t if_counter_discontinuity_time;
+
/* ptype mapping table */
uint32_t ptype_tbl[I40E_MAX_PKT_TYPE] __rte_cache_min_aligned;
};
--
2.7.5
