Commit 394c48e0 authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by Jakub Kicinski
Browse files

net: ena: Change ENI stats support check to use capabilities field 



Use the capabilities field to query the device for ENI stats
support.

This replaces the previous method that tried to get the ENI stats
during ena_probe() and used the success or failure as an indication
for support by the device.

Remove eni_stats_supported field from struct ena_adapter. This field
was used for the previous method of queriying for ENI stats support.

Change the severity level of the print in case of
ena_com_get_eni_stats() failure from info to error.
With the previous method of querying form ENI stats support, failure
to get ENI stats was normal for devices that don't support it.
With the use of the capabilities field such a failure is unexpected,
as it is called only if the device reported that it supports ENI
stats.

Signed-off-by: default avatarShay Agroskin <shayagr@amazon.com>
Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a2d5d6a7

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+8 −5
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ static const struct ena_stats ena_stats_ena_com_strings[] = { 
#define ENA_STATS_ARRAY_TX		ARRAY_SIZE(ena_stats_tx_strings)

#define ENA_STATS_ARRAY_RX		ARRAY_SIZE(ena_stats_rx_strings)

#define ENA_STATS_ARRAY_ENA_COM		ARRAY_SIZE(ena_stats_ena_com_strings)

#define ENA_STATS_ARRAY_ENI(adapter)	\

	(ARRAY_SIZE(ena_stats_eni_strings) * (adapter)->eni_stats_supported)

#define ENA_STATS_ARRAY_ENI(adapter)	ARRAY_SIZE(ena_stats_eni_strings)



static void ena_safe_update_stat(u64 *src, u64 *dst,

				 struct u64_stats_sync *syncp)
@@ -213,8 +212,9 @@ static void ena_get_ethtool_stats(struct net_device *netdev, 
				  u64 *data)

{

	struct ena_adapter *adapter = netdev_priv(netdev);

	struct ena_com_dev *dev = adapter->ena_dev;



	ena_get_stats(adapter, data, adapter->eni_stats_supported);

	ena_get_stats(adapter, data, ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS));

}



static int ena_get_sw_stats_count(struct ena_adapter *adapter)
@@ -226,7 +226,9 @@ static int ena_get_sw_stats_count(struct ena_adapter *adapter) 


static int ena_get_hw_stats_count(struct ena_adapter *adapter)

{

	return ENA_STATS_ARRAY_ENI(adapter);

	bool supported = ena_com_get_cap(adapter->ena_dev, ENA_ADMIN_ENI_STATS);



	return ENA_STATS_ARRAY_ENI(adapter) * supported;

}



int ena_get_sset_count(struct net_device *netdev, int sset)
@@ -316,10 +318,11 @@ static void ena_get_ethtool_strings(struct net_device *netdev, 
				    u8 *data)

{

	struct ena_adapter *adapter = netdev_priv(netdev);

	struct ena_com_dev *dev = adapter->ena_dev;



	switch (sset) {

	case ETH_SS_STATS:

		ena_get_strings(adapter, data, adapter->eni_stats_supported);

		ena_get_strings(adapter, data, ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS));

		break;

	}

}

drivers/net/ethernet/amazon/ena/ena_netdev.c

+2 −7
Original line number Diff line number Diff line
@@ -3253,11 +3253,11 @@ static void ena_config_debug_area(struct ena_adapter *adapter) 


int ena_update_hw_stats(struct ena_adapter *adapter)

{

	int rc = 0;

	int rc;



	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");

		netdev_err(adapter->netdev, "Failed to get ENI stats\n");

		return rc;

	}
@@ -4385,11 +4385,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ 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;