| Message ID | 20211123163955.154512-6-alexandr.lobakin@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: introduce and use generic XDP stats | expand |
On Tue, Nov 23, 2021 at 05:39:34PM +0100, Alexander Lobakin wrote: > Similarly to dpaa2, enetc stores 5 per-channel counters for XDP. > Add necessary callbacks to be able to access them using new generic > XDP stats infra. > > Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> These counters can be dropped from ethtool, nobody depends on having them there. Side question: what does "nch" stand for?
From: Vladimir Oltean <vladimir.oltean@nxp.com> Date: Tue, 23 Nov 2021 17:09:20 +0000 > On Tue, Nov 23, 2021 at 05:39:34PM +0100, Alexander Lobakin wrote: > > Similarly to dpaa2, enetc stores 5 per-channel counters for XDP. > > Add necessary callbacks to be able to access them using new generic > > XDP stats infra. > > > > Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> > > Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > > --- > > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Thanks! > These counters can be dropped from ethtool, nobody depends on having > them there. Got it, thanks. I'll remove them in v3 or, in case v2 gets accepted, will send a follow-up patch(es) for removing redundant Ethtool stats. > Side question: what does "nch" stand for? "The number of channels". I was thinking of an intuitial, but short term, as get_xdp_stats_channels is too long and breaks Tab aligment of tons of net_device_ops across the tree. It was "nqs" /number of queues/ previously, but we usually use term "queue" referring to one-direction ring, in case of these stats and XDP in general "queue pair" or simply "channel" is more correct. Thanks, Al
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 504e12554079..ec62765377a7 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -2575,6 +2575,54 @@ struct net_device_stats *enetc_get_stats(struct net_device *ndev) return stats; } +int enetc_get_xdp_stats_nch(const struct net_device *ndev, u32 attr_id) +{ + const struct enetc_ndev_priv *priv = netdev_priv(ndev); + + switch (attr_id) { + case IFLA_XDP_XSTATS_TYPE_XDP: + return max(priv->num_rx_rings, priv->num_tx_rings); + default: + return -EOPNOTSUPP; + } +} + +int enetc_get_xdp_stats(const struct net_device *ndev, u32 attr_id, + void *attr_data) +{ + struct ifla_xdp_stats *xdp_iter, *xdp_stats = attr_data; + const struct enetc_ndev_priv *priv = netdev_priv(ndev); + const struct enetc_ring_stats *stats; + u32 i; + + switch (attr_id) { + case IFLA_XDP_XSTATS_TYPE_XDP: + break; + default: + return -EOPNOTSUPP; + } + + for (i = 0; i < priv->num_tx_rings; i++) { + stats = &priv->tx_ring[i]->stats; + xdp_iter = xdp_stats + i; + + xdp_iter->tx = stats->xdp_tx; + xdp_iter->tx_errors = stats->xdp_tx_drops; + } + + for (i = 0; i < priv->num_rx_rings; i++) { + stats = &priv->rx_ring[i]->stats; + xdp_iter = xdp_stats + i; + + xdp_iter->drop = stats->xdp_drops; + xdp_iter->redirect = stats->xdp_redirect; + xdp_iter->redirect_errors = stats->xdp_redirect_failures; + xdp_iter->redirect_errors += stats->xdp_redirect_sg; + } + + return 0; +} + static int enetc_set_rss(struct net_device *ndev, int en) { struct enetc_ndev_priv *priv = netdev_priv(ndev); diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h index fb39e406b7fc..8f175f0194e3 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.h +++ b/drivers/net/ethernet/freescale/enetc/enetc.h @@ -389,6 +389,9 @@ void enetc_start(struct net_device *ndev); void enetc_stop(struct net_device *ndev); netdev_tx_t enetc_xmit(struct sk_buff *skb, struct net_device *ndev); struct net_device_stats *enetc_get_stats(struct net_device *ndev); +int enetc_get_xdp_stats_nch(const struct net_device *ndev, u32 attr_id); +int enetc_get_xdp_stats(const struct net_device *ndev, u32 attr_id, + void *attr_data); int enetc_set_features(struct net_device *ndev, netdev_features_t features); int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd); diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c index fe6a544f37f0..c7776b842a91 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c @@ -729,6 +729,8 @@ static const struct net_device_ops enetc_ndev_ops = { .ndo_stop = enetc_close, .ndo_start_xmit = enetc_xmit, .ndo_get_stats = enetc_get_stats, + .ndo_get_xdp_stats_nch = enetc_get_xdp_stats_nch, + .ndo_get_xdp_stats = enetc_get_xdp_stats, .ndo_set_mac_address = enetc_pf_set_mac_addr, .ndo_set_rx_mode = enetc_pf_set_rx_mode, .ndo_vlan_rx_add_vid = enetc_vlan_rx_add_vid,