ice: implement VF stats NDO

Implement the VF stats gathering via the kernel via ndo_get_vf_stats().
The driver will show per-VF stats in the output of the
ip -s link show dev <PF> command.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index ea577588b2745c3296abb0a87067888010870edc..d282eb05c2e0ba76110a9c3662d49f518c569250 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5219,6 +5219,7 @@ static const struct net_device_ops ice_netdev_ops = {
        .ndo_set_vf_trust = ice_set_vf_trust,
        .ndo_set_vf_vlan = ice_set_vf_port_vlan,
        .ndo_set_vf_link_state = ice_set_vf_link_state,
+       .ndo_get_vf_stats = ice_get_vf_stats,
        .ndo_vlan_rx_add_vid = ice_vlan_rx_add_vid,
        .ndo_vlan_rx_kill_vid = ice_vlan_rx_kill_vid,
        .ndo_set_features = ice_set_features,

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index aa99d7cb7d8e0b305700f9ff42125cd5c54f1561..edb374296d1f372ab8e638a93d1b146f98feb6d4 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -3391,3 +3391,48 @@ int ice_set_vf_link_state(struct net_device *netdev, int vf_id, int link_state)
 
        return 0;
 }
+
+/**
+ * ice_get_vf_stats - populate some stats for the VF
+ * @netdev: the netdev of the PF
+ * @vf_id: the host OS identifier (0-255)
+ * @vf_stats: pointer to the OS memory to be initialized
+ */
+int ice_get_vf_stats(struct net_device *netdev, int vf_id,
+                    struct ifla_vf_stats *vf_stats)
+{
+       struct ice_pf *pf = ice_netdev_to_pf(netdev);
+       struct ice_eth_stats *stats;
+       struct ice_vsi *vsi;
+       struct ice_vf *vf;
+
+       if (ice_validate_vf_id(pf, vf_id))
+               return -EINVAL;
+
+       vf = &pf->vf[vf_id];
+
+       if (ice_check_vf_init(pf, vf))
+               return -EBUSY;
+
+       vsi = pf->vsi[vf->lan_vsi_idx];
+       if (!vsi)
+               return -EINVAL;
+
+       ice_update_eth_stats(vsi);
+       stats = &vsi->eth_stats;
+
+       memset(vf_stats, 0, sizeof(*vf_stats));
+
+       vf_stats->rx_packets = stats->rx_unicast + stats->rx_broadcast +
+               stats->rx_multicast;
+       vf_stats->tx_packets = stats->tx_unicast + stats->tx_broadcast +
+               stats->tx_multicast;
+       vf_stats->rx_bytes   = stats->rx_bytes;
+       vf_stats->tx_bytes   = stats->tx_bytes;
+       vf_stats->broadcast  = stats->rx_broadcast;
+       vf_stats->multicast  = stats->rx_multicast;
+       vf_stats->rx_dropped = stats->rx_discards;
+       vf_stats->tx_dropped = stats->tx_discards;
+
+       return 0;
+}

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
index 2e867ad2e81d944f1f0d0fe8e09fdc7b17e8fc95..88aa65d5cb317b10245dfb4757d3104e0eeedb94 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
@@ -122,6 +122,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena);
 int ice_calc_vf_reg_idx(struct ice_vf *vf, struct ice_q_vector *q_vector);
 
 void ice_set_vf_state_qs_dis(struct ice_vf *vf);
+int
+ice_get_vf_stats(struct net_device *netdev, int vf_id,
+                struct ifla_vf_stats *vf_stats);
 #else /* CONFIG_PCI_IOV */
 #define ice_process_vflr_event(pf) do {} while (0)
 #define ice_free_vfs(pf) do {} while (0)
@@ -194,5 +197,13 @@ ice_calc_vf_reg_idx(struct ice_vf __always_unused *vf,
 {
        return 0;
 }
+
+static inline int
+ice_get_vf_stats(struct net_device __always_unused *netdev,
+                int __always_unused vf_id,
+                struct ifla_vf_stats __always_unused *vf_stats)
+{
+       return -EOPNOTSUPP;
+}
 #endif /* CONFIG_PCI_IOV */
 #endif /* _ICE_VIRTCHNL_PF_H_ */