Enhance current features in ena driver
Subsystems (3)
cover Enhance current features in ena driver
From: Sameeh Jubran <[email protected]>
This series adds the following:
* Exposes new device stats using ethtool.
* Adds and exposes the stats of xdp TX queues through ethtool.
Sameeh Jubran (3):
net: ena: ethtool: Add new device statistics
net: ena: ethtool: add stats printing to XDP queues
net: ena: xdp: add queue counters for xdp actions
drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 37 +++++- drivers/net/ethernet/amazon/ena/ena_com.c | 19 ++- drivers/net/ethernet/amazon/ena/ena_com.h | 9 ++ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 158 +++++++++++++++++------ drivers/net/ethernet/amazon/ena/ena_netdev.c | 45 ++++++- drivers/net/ethernet/amazon/ena/ena_netdev.h | 9 ++ 6 files changed, 230 insertions(+), 47 deletions(-)
Signature · 1 line
2.16.6
PATCH 1/3 net: ena: ethtool: Add new device statistics
From: Sameeh Jubran <[email protected]>
The new metrics provide granular visibility along multiple network dimensions and enable troubleshooting and remediation of issues caused by instances exceeding network performance allowances.
The new statistics can be queried using ethtool command.
--- drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 37 +++++++- drivers/net/ethernet/amazon/ena/ena_com.c | 19 +++- drivers/net/ethernet/amazon/ena/ena_com.h | 9 ++ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 106 ++++++++++++++++++----- drivers/net/ethernet/amazon/ena/ena_netdev.c | 18 ++++ drivers/net/ethernet/amazon/ena/ena_netdev.h | 4 + 6 files changed, 170 insertions(+), 23 deletions(-)
drivers/net/ethernet/amazon/ena/ena_admin_defs.h +36 -1
@@ -117,6 +117,8 @@ enum ena_admin_completion_policy_type {enum ena_admin_get_stats_type {ENA_ADMIN_GET_STATS_TYPE_BASIC =0 ,ENA_ADMIN_GET_STATS_TYPE_EXTENDED =1 , +/* extra HW stats for specific network interface */ +ENA_ADMIN_GET_STATS_TYPE_ENI =2 , };enum ena_admin_get_stats_scope {
@@ -410,10 +412,43 @@ struct ena_admin_basic_stats {u32 tx_drops_high; }; +/* ENI Statistics Command. */ +struct ena_admin_eni_stats { +/* The number of packets shaped due to inbound aggregate BW +* allowance being exceeded +*/ +u64 bw_in_allowance_exceeded; + +/* The number of packets shaped due to outbound aggregate BW +* allowance being exceeded +*/ +u64 bw_out_allowance_exceeded; + +/* The number of packets shaped due to PPS allowance being exceeded */ +u64 pps_allowance_exceeded; + +/* The number of packets shaped due to connection tracking +* allowance being exceeded and leading to failure in establishment +* of new connections +*/ +u64 conntrack_allowance_exceeded; + +/* The number of packets shaped due to linklocal packet rate +* allowance being exceeded +*/ +u64 linklocal_allowance_exceeded; +}; +struct ena_admin_acq_get_stats_resp {struct ena_admin_acq_common_desc acq_common_desc; -struct ena_admin_basic_stats basic_stats; +union { +u64 raw[7 ]; + +struct ena_admin_basic_stats basic_stats; + +struct ena_admin_eni_stats eni_stats; + } u; };struct ena_admin_get_set_feature_common_desc {
drivers/net/ethernet/amazon/ena/ena_com.c +17 -2
@@ -2167,6 +2167,21 @@ static int ena_get_dev_stats(struct ena_com_dev *ena_dev,return ret; } +int ena_com_get_eni_stats (struct ena_com_dev *ena_dev, +struct ena_admin_eni_stats *stats) +{ +struct ena_com_stats_ctx ctx; +int ret; + +memset (&ctx,0x0 ,sizeof (ctx)); + ret =ena_get_dev_stats (ena_dev, &ctx,ENA_ADMIN_GET_STATS_TYPE_ENI ); +if (likely (ret ==0 )) +memcpy (stats, &ctx.get_resp.u.eni_stats, +sizeof (ctx.get_resp.u.eni_stats)); + +return ret; +} +int ena_com_get_dev_basic_stats (struct ena_com_dev *ena_dev,struct ena_admin_basic_stats *stats) {
@@ -2176,8 +2191,8 @@ int ena_com_get_dev_basic_stats(struct ena_com_dev *ena_dev,memset (&ctx,0x0 ,sizeof (ctx)); ret =ena_get_dev_stats (ena_dev, &ctx,ENA_ADMIN_GET_STATS_TYPE_BASIC );if (likely (ret ==0 )) -memcpy (stats, &ctx.get_resp.basic_stats, -sizeof (ctx.get_resp.basic_stats)); +memcpy (stats, &ctx.get_resp.u.basic_stats, +sizeof (ctx.get_resp.u.basic_stats));return ret; }
drivers/net/ethernet/amazon/ena/ena_com.h +9 -0
@@ -616,6 +616,15 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,int ena_com_get_dev_basic_stats (struct ena_com_dev *ena_dev,struct ena_admin_basic_stats *stats); +/* ena_com_get_eni_stats - Get extended network interface statistics +* @ena_dev: ENA communication layer struct +* @stats: stats return value +* +* @return: 0 on Success and negative value otherwise. +*/ +int ena_com_get_eni_stats (struct ena_com_dev *ena_dev, +struct ena_admin_eni_stats *stats); +/* ena_com_set_dev_mtu - Configure the device mtu. * @ena_dev: ENA communication layer struct * @mtu: mtu value
drivers/net/ethernet/amazon/ena/ena_ethtool.c +86 -20
195 lines not on this page · raw message
drivers/net/ethernet/amazon/ena/ena_netdev.c +18 -0
@@ -3187,6 +3187,19 @@ err:ena_com_delete_debug_area (adapter->ena_dev); } +int ena_update_hw_stats (struct ena_adapter *adapter) +{ +int rc =0 ; + + rc =ena_com_get_eni_stats (adapter->ena_dev, &adapter->eni_stats); +if (rc) { +dev_info_once (&adapter->pdev->dev,"Failed to get ENI stats\n" ); +return rc; + } + +return 0 ; +} +static void ena_get_stats64 (struct net_device *netdev,struct rtnl_link_stats64 *stats) {
@@ -4307,6 +4320,11 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)ena_config_debug_area (adapter); +if (!ena_update_hw_stats (adapter)) + adapter->eni_stats_supported = true; +else + adapter->eni_stats_supported = false; +memcpy (adapter->netdev->perm_addr, adapter->mac_addr, netdev->addr_len);netif_carrier_off (netdev);
drivers/net/ethernet/amazon/ena/ena_netdev.h +4 -0
@@ -405,6 +405,8 @@ struct ena_adapter {struct u64_stats_sync syncp;struct ena_stats_dev dev_stats; +struct ena_admin_eni_stats eni_stats; +bool eni_stats_supported;/* last queue index that was checked for uncompleted tx packets */ u32 last_monitored_tx_qid;
@@ -422,6 +424,8 @@ void ena_dump_stats_to_dmesg(struct ena_adapter *adapter);void ena_dump_stats_to_buf (struct ena_adapter *adapter,u8 *buf); +int ena_update_hw_stats (struct ena_adapter *adapter); +int ena_update_queue_sizes (struct ena_adapter *adapter,u32 new_tx_size,u32 new_rx_size);
Signature · 1 line
2.16.6
Jakub Kicinski
maintainerRe: [PATCH V1 net-next 1/3] net: ena: ethtool: Add new device statistics
drivers/net/ethernet/amazon/ena/ena_ethtool.c static void ena_get_ethtool_stats(struct net_device *netdev, · line 221
Quoted 7 lines · On Sat, 1 Aug 2020 14:21:28 +0000 [email protected] wrote:
drivers/net/ethernet/amazon/ena/ena_ethtool.c +7
-0+if (eni_stats_needed) { +ena_update_hw_stats (adapter); +for (i =0 ; i <ENA_STATS_ARRAY_ENI (adapter); i++) { + ena_stats = &ena_stats_eni_strings[i]; + + ptr = (u64 *)((uintptr_t )&adapter->eni_stats + + (uintptr_t )ena_stats->stat_offset);
In the kernel unsigned long is the type for doing maths on pointers.
Quoted 6 lines
drivers/net/ethernet/amazon/ena/ena_ethtool.c +4
-0+ena_safe_update_stat (ptr, data++, &adapter->syncp); + } + } +ena_queue_stats (adapter, &data);ena_dev_admin_queue_stats (adapter, &data);
drivers/net/ethernet/amazon/ena/ena_ethtool.c static void ena_get_ethtool_stats(struct net_device *netdev, · line 238
Quoted 10 lines
drivers/net/ethernet/amazon/ena/ena_ethtool.c +8
-0} +static void ena_get_ethtool_stats (struct net_device *netdev, +struct ethtool_stats *stats, +u64 *data) +{ +struct ena_adapter *adapter =netdev_priv (netdev); + +ena_get_stats (adapter, data, adapter->eni_stats_supported); +}
Why the indirections? You always pass adapter->eni_stats_supported as a parameter, why not just use it directly?
Other than the two nits, the set LGTM.
RE: [PATCH V1 net-next 1/3] net: ena: ethtool: Add new device statistics
Quoted 33 lines
-----Original Message-----
From: Jakub Kicinski <[email protected]>
Sent: Tuesday, August 4, 2020 1:18 AM
To: Jubran, Samih <[email protected]>
Cc: [email protected]; [email protected]; Woodhouse, David <[email protected]>; Machulsky, Zorik <[email protected]>; Matushevsky, Alexander <[email protected]>; Bshara, Saeed <[email protected]>; Wilson, Matt <[email protected]>; Liguori, Anthony <[email protected]>; Bshara, Nafea <[email protected]>; Tzalik, Guy <[email protected]>; Belgazal, Netanel <[email protected]>; Saidi, Ali <[email protected]>; Herrenschmidt, Benjamin <[email protected]>; Kiyanovski, Arthur <[email protected]>; Dagan, Noam <[email protected]>
Subject: RE: [EXTERNAL] [PATCH V1 net-next 1/3] net: ena: ethtool: Add new device statisticsCAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
drivers/net/ethernet/amazon/ena/ena_ethtool.c static void ena_get_ethtool_stats(struct net_device *netdev, · line 221
Quoted 7 lines · On Sat, 1 Aug 2020 14:21:28 +0000 [email protected] wrote:
drivers/net/ethernet/amazon/ena/ena_ethtool.c +7
-0+if (eni_stats_needed) { +ena_update_hw_stats (adapter); +for (i =0 ; i <ENA_STATS_ARRAY_ENI (adapter); i++) { + ena_stats = &ena_stats_eni_strings[i]; + + ptr = (u64 *)((uintptr_t )&adapter->eni_stats + + (uintptr_t )ena_stats->stat_offset);
Quoted 1 line
In the kernel unsigned long is the type for doing maths on pointers.
Ack, will fix in V2.
Quoted 8 lines
Quoted 8 lines
drivers/net/ethernet/amazon/ena/ena_ethtool.c +4
-0+ena_safe_update_stat (ptr, data++, &adapter->syncp); + } + } +ena_queue_stats (adapter, &data);ena_dev_admin_queue_stats (adapter, &data); }
Quoted 9 lines
drivers/net/ethernet/amazon/ena/ena_ethtool.c static void ena_get_ethtool_stats(struct net_device *netdev,
Quoted 6 lines
drivers/net/ethernet/amazon/ena/ena_ethtool.c +6
-0+static void ena_get_ethtool_stats (struct net_device *netdev, +struct ethtool_stats *stats, +u64 *data) { +struct ena_adapter *adapter =netdev_priv (netdev); + +ena_get_stats (adapter, data, adapter->eni_stats_supported); }Why the indirections? You always pass
adapter->eni_stats_supportedas a parameter, why not just use it directly?
please note that ena_dump_stats_ex(), ena_get_strings() and ena_get_stats()
are called with the parameter set to false. This is done to avoid sending an admin command, which sleeps, during the execution of this function.
This function is called from the timer interrupt handler, which is an atomic context, and we want to avoid sleeping during such context.
Quoted 2 lines
Other than the two nits, the set LGTM.
PATCH 2/3 net: ena: ethtool: add stats printing to XDP queues
In reply to [email protected]From: Sameeh Jubran <[email protected]>
Added statistics for TX queues that are used for XDP TX. The statistics are the same as the ones printed for regular non-XDP TX queues.
The XDP queue statistics can be queried usingethtool -S <ifname>
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 47 +++++++++++++++++---------- 1 file changed, 29 insertions(+), 18 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +29 -18
@@ -152,7 +152,7 @@ static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)u64 *ptr;int i, j; -for (i =0 ; i < adapter->num_io_queues; i++) { +for (i =0 ; i < adapter->num_io_queues + adapter->xdp_num_queues; i++) {/* Tx stats */ ring = &adapter->tx_ring[i];
@@ -164,17 +164,19 @@ static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)ena_safe_update_stat (ptr, (*data)++, &ring->syncp); } +/* XDP TX queues don't have a RX queue counterpart */ +if (!ENA_IS_XDP_INDEX (adapter, i)) { +/* Rx stats */ + ring = &adapter->rx_ring[i]; -/* Rx stats */ - ring = &adapter->rx_ring[i]; +for (j =0 ; j <ENA_STATS_ARRAY_RX ; j++) { + ena_stats = &ena_stats_rx_strings[j]; -for (j =0 ; j <ENA_STATS_ARRAY_RX ; j++) { - ena_stats = &ena_stats_rx_strings[j]; + ptr = (u64 *)((uintptr_t )&ring->rx_stats + + (uintptr_t )ena_stats->stat_offset); - ptr = (u64 *)((uintptr_t )&ring->rx_stats + - (uintptr_t )ena_stats->stat_offset); - -ena_safe_update_stat (ptr, (*data)++, &ring->syncp); +ena_safe_update_stat (ptr, (*data)++, &ring->syncp); + } } } }
@@ -240,6 +242,7 @@ static void ena_get_ethtool_stats(struct net_device *netdev,static int ena_get_sw_stats_count (struct ena_adapter *adapter) {return adapter->num_io_queues * (ENA_STATS_ARRAY_TX +ENA_STATS_ARRAY_RX ) + + adapter->xdp_num_queues *ENA_STATS_ARRAY_TX +ENA_STATS_ARRAY_GLOBAL +ENA_STATS_ARRAY_ENA_COM ; }
@@ -261,24 +264,32 @@ int ena_get_sset_count(struct net_device *netdev, int sset)static void ena_queue_strings (struct ena_adapter *adapter,u8 **data) {const struct ena_stats *ena_stats; +bool is_xdp;int i, j; -for (i =0 ; i < adapter->num_io_queues; i++) { +for (i =0 ; i < adapter->num_io_queues + adapter->xdp_num_queues; i++) { + is_xdp =ENA_IS_XDP_INDEX (adapter, i);/* Tx stats */ for (j =0 ; j <ENA_STATS_ARRAY_TX ; j++) { ena_stats = &ena_stats_tx_strings[j];snprintf (*data,ETH_GSTRING_LEN , -"queue_%u_tx_%s" , i, ena_stats->name); - (*data) +=ETH_GSTRING_LEN ; +"queue_%u_%s_%s" , i, + is_xdp ?"xdp_tx" :"tx" , ena_stats->name); + (*data) +=ETH_GSTRING_LEN ; } -/* Rx stats */ -for (j =0 ; j <ENA_STATS_ARRAY_RX ; j++) { - ena_stats = &ena_stats_rx_strings[j]; -snprintf (*data,ETH_GSTRING_LEN , -"queue_%u_rx_%s" , i, ena_stats->name); - (*data) +=ETH_GSTRING_LEN ; +if (!is_xdp) { +/* RX stats, in XDP there isn't a RX queue +* counterpart +*/ +for (j =0 ; j <ENA_STATS_ARRAY_RX ; j++) { + ena_stats = &ena_stats_rx_strings[j]; + +snprintf (*data,ETH_GSTRING_LEN , +"queue_%u_rx_%s" , i, ena_stats->name); + (*data) +=ETH_GSTRING_LEN ; + } } } }
Signature · 1 line
2.16.6
PATCH 3/3 net: ena: xdp: add queue counters for xdp actions
In reply to [email protected]From: Sameeh Jubran <[email protected]>
When using XDP every ingress packet is passed to an eBPF (xdp) program which returns an action for this packet.
This patch adds counters for the number of times each such action was received. It also counts all the invalid actions received from the eBPF program.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 5 +++++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 27 +++++++++++++++++++++------ drivers/net/ethernet/amazon/ena/ena_netdev.h | 5 +++++ 3 files changed, 31 insertions(+), 6 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +5 -0
@@ -116,6 +116,11 @@ static const struct ena_stats ena_stats_rx_strings[] = {ENA_STAT_RX_ENTRY (bad_req_id),ENA_STAT_RX_ENTRY (empty_rx_ring ),ENA_STAT_RX_ENTRY (csum_unchecked ), +ENA_STAT_RX_ENTRY (xdp_aborted ), +ENA_STAT_RX_ENTRY (xdp_drop ), +ENA_STAT_RX_ENTRY (xdp_pass ), +ENA_STAT_RX_ENTRY (xdp_tx ), + ENA_STAT_RX_ENTRY(xdp_invalid), };static const struct ena_stats ena_stats_ena_com_strings[] = {
drivers/net/ethernet/amazon/ena/ena_netdev.c +21 -6
@@ -365,6 +365,7 @@ static int ena_xdp_execute(struct ena_ring *rx_ring, {struct bpf_prog *xdp_prog;u32 verdict =XDP_PASS ; +u64 *xdp_stat;rcu_read_lock (); xdp_prog =READ_ONCE (rx_ring->xdp_bpf_prog);
@@ -374,17 +375,31 @@ static int ena_xdp_execute(struct ena_ring *rx_ring, verdict =bpf_prog_run_xdp (xdp_prog, xdp); -if (verdict ==XDP_TX ) +if (verdict ==XDP_TX ) {ena_xdp_xmit_buff (rx_ring->netdev, - xdp, - rx_ring->qid + rx_ring->adapter->num_io_queues, - rx_info); -else if (unlikely (verdict ==XDP_ABORTED )) + xdp, + rx_ring->qid + rx_ring->adapter->num_io_queues, + rx_info); + + xdp_stat = &rx_ring->rx_stats.xdp_tx; + }else if (unlikely (verdict ==XDP_ABORTED )) {trace_xdp_exception (rx_ring->netdev, xdp_prog, verdict); -else if (unlikely (verdict >XDP_TX )) + xdp_stat = &rx_ring->rx_stats.xdp_aborted; + }else if (unlikely (verdict ==XDP_DROP )) { + xdp_stat = &rx_ring->rx_stats.xdp_drop; + }else if (unlikely (verdict ==XDP_PASS )) { + xdp_stat = &rx_ring->rx_stats.xdp_pass; + }else {bpf_warn_invalid_xdp_action (verdict); + xdp_stat = &rx_ring->rx_stats.xdp_invalid; + } + +u64_stats_update_begin (&rx_ring->syncp); + (*xdp_stat)++; +u64_stats_update_end (&rx_ring->syncp); out:rcu_read_unlock (); +return verdict; }
drivers/net/ethernet/amazon/ena/ena_netdev.h +5 -0
@@ -261,6 +261,11 @@ struct ena_stats_rx {u64 bad_req_id;u64 empty_rx_ring;u64 csum_unchecked; +u64 xdp_aborted; +u64 xdp_drop; +u64 xdp_pass; +u64 xdp_tx; +u64 xdp_invalid; };struct ena_ring {
Signature · 1 line
2.16.6