Signed-off-by: Nemanja Marjanovic <nemanja.marjano...@intel.com> Signed-off-by: Rory Sexton <rory.sex...@intel.com> Signed-off-by: David Hunt <david.h...@intel.com> --- drivers/net/i40e/i40e_ethdev.c | 1 + drivers/net/i40e/i40e_rxtx.c | 10 ++++++++++ drivers/net/i40e/i40e_rxtx.h | 1 + lib/librte_ether/rte_ethdev.h | 19 +++++++++++++++++++ 4 files changed, 31 insertions(+)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 8fb67d8..d9806fc 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -446,6 +446,7 @@ static const struct rte_pci_id pci_id_i40e_map[] = { static const struct eth_dev_ops i40e_eth_dev_ops = { .vfid_to_pfid = i40e_vf_mac_to_vsi, + .read_pf_stats = i40e_vsi_stats_read, .dev_configure = i40e_dev_configure, .dev_start = i40e_dev_start, .dev_stop = i40e_dev_stop, diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 1379d5e..b7b64d2 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -833,6 +833,16 @@ i40e_vf_mac_to_vsi(struct rte_eth_dev *dev, uint64_t vfid) { return -1; } +uint64_t +i40e_vsi_stats_read(struct rte_eth_dev *dev, uint8_t vsi_id) { + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + uint64_t glv_uprch = I40E_READ_REG(hw, + I40E_GLV_UPRCH(vsi_id)) & 0x0000FFFF; + uint64_t glv_uprcl = I40E_READ_REG(hw, I40E_GLV_UPRCL(vsi_id)); + return glv_uprcl + (glv_uprch << 32); +} + uint16_t i40e_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index bc6d355..db19153 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -193,6 +193,7 @@ union i40e_tx_offload { }; uint64_t i40e_vf_mac_to_vsi(struct rte_eth_dev *dev, uint64_t vfid); +uint64_t i40e_vsi_stats_read(struct rte_eth_dev *dev, uint8_t vsi_id); int i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id); int i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id); int i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id); diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index fec7e92..4917233 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1413,6 +1413,9 @@ typedef int (*eth_l2_tunnel_offload_set_t) typedef uint64_t (*vfid_to_pfid)(struct rte_eth_dev *dev, uint64_t vfid); +/**< @internal Ethernet device configuration. */ +typedef uint64_t (*read_pf_stats)(struct rte_eth_dev *dev, uint8_t pfid); + typedef int (*eth_filter_ctrl_t)(struct rte_eth_dev *dev, enum rte_filter_type filter_type, @@ -1432,6 +1435,7 @@ typedef int (*eth_get_dcb_info)(struct rte_eth_dev *dev, */ struct eth_dev_ops { vfid_to_pfid vfid_to_pfid; /**< Convert vfid to pfid */ + read_pf_stats read_pf_stats;/**<Read low-level pf stats .*/ eth_dev_configure_t dev_configure; /**< Configure device. */ eth_dev_start_t dev_start; /**< Start device. */ eth_dev_stop_t dev_stop; /**< Stop device. */ @@ -2939,6 +2943,21 @@ vfid_to_pfid_direct(uint8_t port_id, uint64_t vfid) return pfid; } +/* + * Reads the NIC occupancy if possible with device in use. + * @param port_id + * The port identifier of the Ethernet device. + * @return + * Nic occupany in bytes. + */ +static inline uint64_t +read_pf_stats_direct(uint8_t port_id, uint8_t pfid) +{ + struct rte_eth_dev *dev = &rte_eth_devices[port_id]; + uint64_t pkt_count = (*dev->dev_ops->read_pf_stats)(dev, pfid); + return pkt_count; +} + /** * Send a burst of output packets on a transmit queue of an Ethernet device. * -- 2.7.4