Enhance current features in ena driver
Subsystems (3)
v3 cover Enhance current features in ena driver
From: Sameeh Jubran <[email protected]>
Difference from v2:
* dropped patch "net: ena: move llq configuration from ena_probe to ena_device_init()"
* reworked patch ""net: ena: implement ena_com_get_admin_polling_mode() to drop the prototype
Difference from v1:
* reodered paches #01 and #02.
* dropped adding Rx/Tx drops to ethtool in patch #08
V1:
This patchset introduces the following:
* minor changes to RSS feature
* add total rx and tx drop counter
* add unmask_interrupt counter for ethtool statistics
* add missing implementation for ena_com_get_admin_polling_mode()
* some minor code clean-up and cosmetics
* use SHUTDOWN as reset reason when closing interface
Arthur Kiyanovski (5):
net: ena: avoid unnecessary admin command when RSS function set fails
net: ena: fix error returning in ena_com_get_hash_function()
net: ena: change default RSS hash function to Toeplitz
net: ena: drop superfluous prototype
net: ena: cosmetic: extract code to ena_indirection_table_set()
Sameeh Jubran (7):
net: ena: allow setting the hash function without changing the key
net: ena: changes to RSS hash key allocation
net: ena: remove code that does nothing
net: ena: add unmask interrupts statistics to ethtool
net: ena: add support for reporting of packet drops
net: ena: use SHUTDOWN as reset reason when closing interface
net: ena: cosmetic: remove unnecessary spaces and tabs in ena_com.h
macros
.../net/ethernet/amazon/ena/ena_admin_defs.h | 8 +++ drivers/net/ethernet/amazon/ena/ena_com.c | 39 ++++++----- drivers/net/ethernet/amazon/ena/ena_com.h | 47 +++++++------ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 66 +++++++++++-------- drivers/net/ethernet/amazon/ena/ena_netdev.c | 13 +++- drivers/net/ethernet/amazon/ena/ena_netdev.h | 2 + 6 files changed, 105 insertions(+), 70 deletions(-)
Signature · 1 line
2.24.1.AMZN
PATCH v3 1/12 net: ena: avoid unnecessary admin command when RSS function set fails
From: Arthur Kiyanovski <[email protected]>
Currently when ena_set_hash_function() fails the hash function is restored to the previous value by calling an admin command to get the hash function from the device.
In this commit we avoid the admin command, by saving the previous hash function before calling ena_set_hash_function() and using this previous value to restore the hash function in case of failure of ena_set_hash_function().
--- drivers/net/ethernet/amazon/ena/ena_com.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_com.c +3 -1
@@ -2286,6 +2286,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,struct ena_admin_get_feat_resp get_resp;struct ena_admin_feature_rss_flow_hash_control *hash_key = rss->hash_key; +enum ena_admin_hash_functions old_func;int rc;/* Make sure size is a mult of DWs */
@@ -2325,12 +2326,13 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,return -EINVAL ; } + old_func = rss->hash_func; rss->hash_func = func; rc =ena_com_set_hash_function (ena_dev);/* Restore the old function */ if (unlikely (rc)) -ena_com_get_hash_function (ena_dev,NULL ,NULL ); + rss->hash_func = old_func;return rc; }
Signature · 1 line
2.24.1.AMZN
PATCH v3 2/12 net: ena: fix error returning in ena_com_get_hash_function()
In reply to [email protected]From: Arthur Kiyanovski <[email protected]>
In case the "func" parameter is NULL we now return "-EINVAL". This shouldn't happen in general, but when it does happen, this is the proper way to handle it.
We also check func for NULL in the beginning of the function, as there is no reason to do all the work and realize in the end of the function it was useless.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.c +4 -2
@@ -2347,6 +2347,9 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev, rss->hash_key;int rc; +if (unlikely (!func)) +return -EINVAL ; + rc = ena_com_get_feature_ex(ena_dev, &get_resp, ENA_ADMIN_RSS_HASH_FUNCTION, rss->hash_key_dma_addr,
@@ -2359,8 +2362,7 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev,if (rss->hash_func) rss->hash_func--; -if (func) - *func = rss->hash_func; + *func = rss->hash_func;if (key)memcpy (key, hash_key->key, (size_t )(hash_key->keys_num) <<2 );
Signature · 1 line
2.24.1.AMZN
PATCH v3 3/12 net: ena: allow setting the hash function without changing the key
In reply to [email protected]From: Sameeh Jubran <[email protected]>
Current code does not allow setting the hash function without changing the key. This commit enables it.
To achieve this we separate ena_com_get_hash_function() to 2 functions:ena_com_get_hash_function() - which gets only the hash function, and ena_com_get_hash_key() - which gets only the hash key.
Also return 0 instead of rc at the end of ena_get_rxfh() since all previous operations succeeded.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 13 ++++++++---- drivers/net/ethernet/amazon/ena/ena_com.h | 21 +++++++++++++------ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 12 +++++++---- 3 files changed, 32 insertions(+), 14 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.c +9 -4
@@ -2338,13 +2338,10 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev, }int ena_com_get_hash_function (struct ena_com_dev *ena_dev, -enum ena_admin_hash_functions *func, -u8 *key) +enum ena_admin_hash_functions *func) {struct ena_rss *rss = &ena_dev->rss;struct ena_admin_get_feat_resp get_resp; -struct ena_admin_feature_rss_flow_hash_control *hash_key = - rss->hash_key;int rc;if (unlikely (!func))
@@ -2364,6 +2361,14 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev, *func = rss->hash_func; +return 0 ; +} + +int ena_com_get_hash_key (struct ena_com_dev *ena_dev,u8 *key) +{ +struct ena_admin_feature_rss_flow_hash_control *hash_key = + ena_dev->rss.hash_key; +if (key)memcpy (key, hash_key->key, (size_t )(hash_key->keys_num) <<2 );
drivers/net/ethernet/amazon/ena/ena_com.h +15 -6
@@ -695,13 +695,11 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,*/ int ena_com_set_hash_function (struct ena_com_dev *ena_dev); -/* ena_com_get_hash_function - Retrieve the hash function and the hash key -* from the device. +/* ena_com_get_hash_function - Retrieve the hash function from the device. * @ena_dev: ENA communication layer struct * @func: hash function -* @key: hash key * -* Retrieve the hash function and the hash key from the device. +* Retrieve the hash function from the device. * * @note: If the caller called ena_com_fill_hash_function but didn't flash * it to the device, the new configuration will be lost.
@@ -709,9 +707,20 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev);* @return: 0 on Success and negative value otherwise. */ int ena_com_get_hash_function (struct ena_com_dev *ena_dev, -enum ena_admin_hash_functions *func, -u8 *key); +enum ena_admin_hash_functions *func); +/* ena_com_get_hash_key - Retrieve the hash key +* @ena_dev: ENA communication layer struct +* @key: hash key +* +* Retrieve the hash key. +* +* @note: If the caller called ena_com_fill_hash_key but didn't flash +* it to the device, the new configuration will be lost. +* +* @return: 0 on Success and negative value otherwise. +*/ +int ena_com_get_hash_key (struct ena_com_dev *ena_dev,u8 *key);/* ena_com_fill_hash_ctrl - Fill RSS hash control * @ena_dev: ENA communication layer struct. * @proto: The protocol to configure.
drivers/net/ethernet/amazon/ena/ena_ethtool.c +8 -4
@@ -672,7 +672,7 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,/* We call this function in order to check if the device * supports getting/setting the hash function. */ - rc =ena_com_get_hash_function (adapter->ena_dev, &ena_func, key); + rc =ena_com_get_hash_function (adapter->ena_dev, &ena_func);if (rc) {if (rc == -EOPNOTSUPP ) { key =NULL ;
@@ -683,6 +683,10 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,return rc; } + rc =ena_com_get_hash_key (adapter->ena_dev, key); +if (rc) +return rc; +switch (ena_func) {case ENA_ADMIN_TOEPLITZ : func =ETH_RSS_HASH_TOP ;
@@ -699,7 +703,7 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,if (hfunc) *hfunc = func; -return rc; +return 0 ; } static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,
@@ -707,7 +711,7 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir, {struct ena_adapter *adapter =netdev_priv (netdev);struct ena_com_dev *ena_dev = adapter->ena_dev; -enum ena_admin_hash_functions func; +enum ena_admin_hash_functions func =0 ;int rc, i;if (indir) {
@@ -746,7 +750,7 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,return -EOPNOTSUPP ; } -if (key) { +if (key || func) { rc =ena_com_fill_hash_function (ena_dev, func, key,ENA_HASH_KEY_SIZE ,0xFFFFFFFF );
Signature · 1 line
2.24.1.AMZN
PATCH v3 4/12 net: ena: change default RSS hash function to Toeplitz
In reply to [email protected]From: Arthur Kiyanovski <[email protected]>
Currently in the driver we are setting the hash function to be CRC32. Starting with this commit we want to change the default behaviour so that we set the hash function to be Toeplitz instead.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
@@ -3991,7 +3991,7 @@ static int ena_rss_init_default(struct ena_adapter *adapter) } } - rc =ena_com_fill_hash_function (ena_dev,ENA_ADMIN_CRC32 ,NULL , + rc =ena_com_fill_hash_function (ena_dev,ENA_ADMIN_TOEPLITZ ,NULL ,ENA_HASH_KEY_SIZE ,0xFFFFFFFF );if (unlikely (rc && (rc != -EOPNOTSUPP ))) {dev_err (dev,"Cannot fill hash function\n" );
Signature · 1 line
2.24.1.AMZN
PATCH v3 5/12 net: ena: changes to RSS hash key allocation
In reply to [email protected]From: Sameeh Jubran <[email protected]>
This commit contains 2 cosmetic changes:
1. Use ena_com_check_supported_feature_id() in ena_com_hash_key_fill_default_key() instead of rewriting its implementation. This also saves us a superfluous admin command by using the cached value.
2. Change if conditions in ena_com_rss_init() to be clearer.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.c +5 -11
@@ -1067,16 +1067,10 @@ static void ena_com_hash_key_fill_default_key(struct ena_com_dev *ena_dev)static int ena_com_hash_key_allocate (struct ena_com_dev *ena_dev) {struct ena_rss *rss = &ena_dev->rss; -struct ena_admin_get_feat_resp get_resp; -int rc; - rc =ena_com_get_feature_ex (ena_dev, &get_resp, -ENA_ADMIN_RSS_HASH_FUNCTION , - ena_dev->rss.hash_key_dma_addr, -sizeof (ena_dev->rss.hash_key),0 ); -if (unlikely (rc)) { +if (!ena_com_check_supported_feature_id (ena_dev, +ENA_ADMIN_RSS_HASH_FUNCTION ))return -EOPNOTSUPP ; - } rss->hash_key = dma_alloc_coherent(ena_dev->dmadev, sizeof(*rss->hash_key),
@@ -2650,10 +2644,10 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 indr_tbl_log_size)* ignore this error and have indirection table support only. */ rc =ena_com_hash_key_allocate (ena_dev); -if (unlikely (rc) && rc != -EOPNOTSUPP ) - goto err_hash_key; -else if (rc != -EOPNOTSUPP ) +if (likely (!rc))ena_com_hash_key_fill_default_key (ena_dev); +else if (rc != -EOPNOTSUPP ) + goto err_hash_key; rc =ena_com_hash_ctrl_init (ena_dev);if (unlikely (rc))
Signature · 1 line
2.24.1.AMZN
PATCH v3 6/12 net: ena: remove code that does nothing
In reply to [email protected]From: Sameeh Jubran <[email protected]>
Both key and func parameters are pointers on the stack. Setting them to NULL does nothing.
The original intent was to leave the key and func unset in this case, but for this to happen nothing needs to be done as the calling function ethtool_get_rxfh() already clears key and func.
This commit removes the above described useless code.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +1 -4
@@ -674,11 +674,8 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,*/ rc =ena_com_get_hash_function (adapter->ena_dev, &ena_func);if (rc) { -if (rc == -EOPNOTSUPP ) { - key =NULL ; - hfunc =NULL ; +if (rc == -EOPNOTSUPP ) rc =0 ; - }return rc; }
Signature · 1 line
2.24.1.AMZN
PATCH v3 7/12 net: ena: add unmask interrupts statistics to ethtool
In reply to [email protected]From: Sameeh Jubran <[email protected]>
Add unmask interrupts statistics to ethtool.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 1 + drivers/net/ethernet/amazon/ena/ena_netdev.c | 3 +++ drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + 3 files changed, 5 insertions(+)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +1 -0
@@ -83,6 +83,7 @@ static const struct ena_stats ena_stats_tx_strings[] = {ENA_STAT_TX_ENTRY (bad_req_id),ENA_STAT_TX_ENTRY (llq_buffer_copy ),ENA_STAT_TX_ENTRY (missed_tx ), + ENA_STAT_TX_ENTRY(unmask_interrupt), };static const struct ena_stats ena_stats_rx_strings[] = {
drivers/net/ethernet/amazon/ena/ena_netdev.c +3 -0
@@ -1762,6 +1762,9 @@ static void ena_unmask_interrupt(struct ena_ring *tx_ring, tx_ring->smoothed_interval, true); +u64_stats_update_begin (&tx_ring->syncp); + tx_ring->tx_stats.unmask_interrupt++; +u64_stats_update_end (&tx_ring->syncp);/* It is a shared MSI-X. * Tx and Rx CQ have pointer to it. * So we use one of them to reach the intr reg
drivers/net/ethernet/amazon/ena/ena_netdev.h +1 -0
@@ -248,6 +248,7 @@ struct ena_stats_tx {u64 bad_req_id;u64 llq_buffer_copy;u64 missed_tx; +u64 unmask_interrupt; };struct ena_stats_rx {
Signature · 1 line
2.24.1.AMZN
PATCH v3 8/12 net: ena: add support for reporting of packet drops
In reply to [email protected]From: Sameeh Jubran <[email protected]>
1. Add support for getting tx drops from the device and saving them in the driver.
2. Report tx via netdev stats.
--- drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 8 ++++++++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 ++++++ drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + 3 files changed, 15 insertions(+)
drivers/net/ethernet/amazon/ena/ena_admin_defs.h +8 -0
@@ -404,6 +404,10 @@ struct ena_admin_basic_stats {u32 rx_drops_low;u32 rx_drops_high; + +u32 tx_drops_low; + +u32 tx_drops_high; };struct ena_admin_acq_get_stats_resp {
@@ -1017,6 +1021,10 @@ struct ena_admin_aenq_keep_alive_desc {u32 rx_drops_low;u32 rx_drops_high; + +u32 tx_drops_low; + +u32 tx_drops_high; };struct ena_admin_ena_mmio_req_read_less_resp {
drivers/net/ethernet/amazon/ena/ena_netdev.c +6 -0
@@ -3172,6 +3172,7 @@ static void ena_get_stats64(struct net_device *netdev,struct ena_ring *rx_ring, *tx_ring;unsigned int start;u64 rx_drops; +u64 tx_drops;int i;if (!test_bit (ENA_FLAG_DEV_UP , &adapter->flags))
@@ -3206,9 +3207,11 @@ static void ena_get_stats64(struct net_device *netdev,do { start =u64_stats_fetch_begin_irq (&adapter->syncp); rx_drops = adapter->dev_stats.rx_drops; + tx_drops = adapter->dev_stats.tx_drops; }while (u64_stats_fetch_retry_irq (&adapter->syncp, start)); stats->rx_dropped = rx_drops; + stats->tx_dropped = tx_drops; stats->multicast =0 ; stats->collisions =0 ;
@@ -4517,14 +4520,17 @@ static void ena_keep_alive_wd(void *adapter_data,struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;struct ena_admin_aenq_keep_alive_desc *desc;u64 rx_drops; +u64 tx_drops; desc = (struct ena_admin_aenq_keep_alive_desc *)aenq_e; adapter->last_keep_alive_jiffies = jiffies; rx_drops = ((u64 )desc->rx_drops_high <<32 ) | desc->rx_drops_low; + tx_drops = ((u64 )desc->tx_drops_high <<32 ) | desc->tx_drops_low;u64_stats_update_begin (&adapter->syncp); adapter->dev_stats.rx_drops = rx_drops; + adapter->dev_stats.tx_drops = tx_drops;u64_stats_update_end (&adapter->syncp); }
drivers/net/ethernet/amazon/ena/ena_netdev.h +1 -0
@@ -334,6 +334,7 @@ struct ena_stats_dev {u64 interface_down;u64 admin_q_pause;u64 rx_drops; +u64 tx_drops; };enum ena_flags_t {
Signature · 1 line
2.24.1.AMZN
PATCH v3 9/12 net: ena: drop superfluous prototype
In reply to [email protected]From: Arthur Kiyanovski <[email protected]>
Before this commit there was a function prototype named ena_com_get_ena_admin_polling_mode() that was never implemented.
This patch simply deletes it.
--- drivers/net/ethernet/amazon/ena/ena_com.h | 12 ------------ 1 file changed, 12 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.h +0 -12
@@ -501,18 +501,6 @@ bool ena_com_get_admin_running_state(struct ena_com_dev *ena_dev);*/ void ena_com_set_admin_polling_mode (struct ena_com_dev *ena_dev,bool polling); -/* ena_com_set_admin_polling_mode - Get the admin completion queue polling mode -* @ena_dev: ENA communication layer struct -* -* Get the admin completion mode. -* If polling mode is on, ena_com_execute_admin_command will perform a -* polling on the admin completion queue for the commands completion, -* otherwise it will wait on wait event. -* -* @return state -*/ -bool ena_com_get_ena_admin_polling_mode (struct ena_com_dev *ena_dev); -/* ena_com_set_admin_auto_polling_mode - Enable autoswitch to polling mode * @ena_dev: ENA communication layer struct * @polling: Enable/Disable polling mode
Signature · 1 line
2.24.1.AMZN
PATCH v3 10/12 net: ena: use SHUTDOWN as reset reason when closing interface
In reply to [email protected]From: Sameeh Jubran <[email protected]>
The 'ENA_REGS_RESET_SHUTDOWN' enum indicates a normal driver shutdown / removal procedure.
Also, a comment is added to one of the reset reason assignments for code clarity.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/amazon/ena/ena_netdev.c +2 -0
@@ -3439,6 +3439,7 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)ena_com_mmio_reg_read_request_destroy (ena_dev); +/* return reset reason to default value */ adapter->reset_reason =ENA_REGS_RESET_NORMAL ;clear_bit (ENA_FLAG_TRIGGER_RESET , &adapter->flags);
@@ -4362,6 +4363,7 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown)cancel_work_sync (&adapter->reset_task);rtnl_lock ();/* lock released inside the below if-else block */ + adapter->reset_reason =ENA_REGS_RESET_SHUTDOWN ;ena_destroy_device (adapter, true);if (shutdown) {netif_device_detach (netdev);
Signature · 1 line
2.24.1.AMZN
PATCH v3 11/12 net: ena: cosmetic: remove unnecessary spaces and tabs in ena_com.h macros
In reply to [email protected]From: Sameeh Jubran <[email protected]>
The macros in ena_com.h have inconsistent spaces between the macro name and it's value.
This commit sets all the macros to have a single space between the name and value.
--- drivers/net/ethernet/amazon/ena/ena_com.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.h +7 -7
@@ -54,9 +54,9 @@#undef pr_fmt#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#define ENA_MAX_NUM_IO_QUEUES 128U +#define ENA_MAX_NUM_IO_QUEUES 128U/* We need to queues for each IO (on for Tx and one for Rx) */ -#define ENA_TOTAL_NUM_QUEUES (2 * (ENA_MAX_NUM_IO_QUEUES)) +#define ENA_TOTAL_NUM_QUEUES (2 * (ENA_MAX_NUM_IO_QUEUES))#define ENA_MAX_HANDLERS 256
@@ -73,13 +73,13 @@/*****************************************************************************/ /* ENA adaptive interrupt moderation settings */ -#define ENA_INTR_INITIAL_TX_INTERVAL_USECS 64 -#define ENA_INTR_INITIAL_RX_INTERVAL_USECS 0 -#define ENA_DEFAULT_INTR_DELAY_RESOLUTION 1 +#define ENA_INTR_INITIAL_TX_INTERVAL_USECS 64 +#define ENA_INTR_INITIAL_RX_INTERVAL_USECS 0 +#define ENA_DEFAULT_INTR_DELAY_RESOLUTION 1 -#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF +#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF -#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 +#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1struct ena_llq_configurations {enum ena_admin_llq_header_location llq_header_location;
Signature · 1 line
2.24.1.AMZN
PATCH v3 12/12 net: ena: cosmetic: extract code to ena_indirection_table_set()
In reply to [email protected]From: Arthur Kiyanovski <[email protected]>
Extract code to ena_indirection_table_set() to make the code cleaner.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +30 -18
@@ -636,6 +636,32 @@ static u32 ena_get_rxfh_key_size(struct net_device *netdev)return ENA_HASH_KEY_SIZE ; } +static int ena_indirection_table_set (struct ena_adapter *adapter, +const u32 *indir) +{ +struct ena_com_dev *ena_dev = adapter->ena_dev; +int i, rc; + +for (i =0 ; i <ENA_RX_RSS_TABLE_SIZE ; i++) { + rc =ena_com_indirect_table_fill_entry (ena_dev, + i, +ENA_IO_RXQ_IDX (indir[i])); +if (unlikely (rc)) { +netif_err (adapter, drv, adapter->netdev, +"Cannot fill indirect table (index is too large)\n" ); +return rc; + } + } + + rc =ena_com_indirect_table_set (ena_dev); +if (rc) { +netif_err (adapter, drv, adapter->netdev, +"Cannot set indirect table\n" ); +return rc == -EPERM ? -EOPNOTSUPP : rc; + } +return rc; +} +static int ena_indirection_table_get (struct ena_adapter *adapter,u32 *indir) {struct ena_com_dev *ena_dev = adapter->ena_dev;
@@ -710,26 +736,12 @@ static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,struct ena_adapter *adapter =netdev_priv (netdev);struct ena_com_dev *ena_dev = adapter->ena_dev;enum ena_admin_hash_functions func =0 ; -int rc, i; +int rc;if (indir) { -for (i =0 ; i <ENA_RX_RSS_TABLE_SIZE ; i++) { - rc =ena_com_indirect_table_fill_entry (ena_dev, - i, -ENA_IO_RXQ_IDX (indir[i])); -if (unlikely (rc)) { -netif_err (adapter, drv, netdev, -"Cannot fill indirect table (index is too large)\n" ); -return rc; - } - } - - rc =ena_com_indirect_table_set (ena_dev); -if (rc) { -netif_err (adapter, drv, netdev, -"Cannot set indirect table\n" ); -return rc == -EPERM ? -EOPNOTSUPP : rc; - } + rc =ena_indirection_table_set (adapter, indir); +if (rc) +return rc; }switch (hfunc) {
Signature · 1 line
2.24.1.AMZN
David Miller
maintainerFrom: <[email protected]>
Date: Sun, 3 May 2020 09:52:09 +0000
Quoted 11 lines
From: Sameeh Jubran <[email protected]>
Difference from v2:
* dropped patch "net: ena: move llq configuration fromena_probetoena_device_init()"
* reworked patch ""net: ena: implementena_com_get_admin_polling_mode()to drop the prototypeDifference from v1:
* reodered paches #01 and #02.
* dropped adding Rx/Tx drops to ethtool in patch #08
Quoted 8 lines
V1:
This patchset introduces the following:
* minor changes to RSS feature
* add total rx and tx drop counter
* addunmask_interruptcounter for ethtool statistics
* add missing implementation forena_com_get_admin_polling_mode()
* some minor code clean-up and cosmetics
* use SHUTDOWN as reset reason when closing interface
Series applied, thank you.