net/ena: release 2.12.0
cover net/ena: release 2.12.0
From: Shai Brandes <[email protected]>
Dear DPDK maintainers and contributors,
We would appreciate your review of the ENA driver 2.12.0 patchset, which includes readiness for the upcoming hardware generations. Your feedback and insights on the patchset would be highly appreciated.
Thank you in advance for your time and effort,
AWS ENA driver team
Shai Brandes (4):
net/ena/base: upgrade ena-com to the latest version net/ena: add support for mutable RSS table size net/ena: remove deprecated notifications net/ena: upgrade driver version to 2.12.0
doc/guides/rel_notes/release_25_03.rst | 4 + drivers/net/ena/base/ena_com.c | 84 +++++++++---------- drivers/net/ena/base/ena_com.h | 5 +- .../net/ena/base/ena_defs/ena_admin_defs.h | 3 + .../net/ena/base/ena_defs/ena_eth_io_defs.h | 7 +- drivers/net/ena/ena_ethdev.c | 84 +++++++------------ drivers/net/ena/ena_ethdev.h | 8 +- drivers/net/ena/ena_rss.c | 48 +++++++++-- 8 files changed, 123 insertions(+), 120 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/4 net/ena/base: upgrade ena-com to the latest version
From: Shai Brandes <[email protected]>
This update upgrades the ena-com module to the most recent version, which includes various cosmetic changes and the removal of obsolete routines.
--- drivers/net/ena/base/ena_com.c | 24 ++++++------------- drivers/net/ena/base/ena_com.h | 2 -- .../net/ena/base/ena_defs/ena_eth_io_defs.h | 7 +++--- 3 files changed, 11 insertions(+), 22 deletions(-)
drivers/net/ena/base/ena_com.c +7 -17
@@ -1799,7 +1799,9 @@ int ena_com_phc_config(struct ena_com_dev *ena_dev)ENA_ADMIN_PHC_CONFIG , ENA_ADMIN_PHC_FEATURE_VERSION_0);if (unlikely (ret)) { -ena_trc_err (ena_dev,"Failed to get PHC feature configuration, error: %d\n" , ret); +ena_trc_err (ena_dev, +"Failed to get PHC feature configuration, error: %d\n" , + ret);return ret; }
@@ -1833,7 +1835,9 @@ int ena_com_phc_config(struct ena_com_dev *ena_dev) set_feat_cmd.aq_common_descriptor.opcode =ENA_ADMIN_SET_FEATURE ; set_feat_cmd.feat_common.feature_id =ENA_ADMIN_PHC_CONFIG ; set_feat_cmd.u.phc.output_length =sizeof (*phc->virt_addr); - ret =ena_com_mem_addr_set (ena_dev, &set_feat_cmd.u.phc.output_address, phc->phys_addr); + ret =ena_com_mem_addr_set (ena_dev, + &set_feat_cmd.u.phc.output_address, + phc->phys_addr);if (unlikely (ret)) {ena_trc_err (ena_dev,"Failed setting PHC output address, error: %d\n" , ret);return ret;
@@ -2091,6 +2095,7 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev, admin_queue->q_depth =ENA_ADMIN_QUEUE_DEPTH ; admin_queue->bus = ena_dev->bus; + admin_queue->ena_dev = ena_dev; admin_queue->q_dmadev = ena_dev->dmadev; admin_queue->polling = false; admin_queue->curr_cmd_id =0 ;
@@ -2148,7 +2153,6 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,if (unlikely (ret)) goto error; - admin_queue->ena_dev = ena_dev; admin_queue->running_state = true; admin_queue->is_missing_admin_interrupt = false;
@@ -2728,23 +2732,9 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu)return ret; } -int ena_com_get_offload_settings (struct ena_com_dev *ena_dev, -struct ena_admin_feature_offload_desc *offload) -{ -int ret; -struct ena_admin_get_feat_resp resp; - ret =ena_com_get_feature (ena_dev, &resp, -ENA_ADMIN_STATELESS_OFFLOAD_CONFIG ,0 ); -if (unlikely (ret)) { -ena_trc_err (ena_dev,"Failed to get offload capabilities %d\n" , ret); -return ret; - } -memcpy (offload, &resp.u.offload,sizeof (resp.u.offload)); -return 0 ; -}int ena_com_set_hash_function (struct ena_com_dev *ena_dev) {
drivers/net/ena/base/ena_com.h +0 -2
@@ -768,8 +768,6 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu);* * @return: 0 on Success and negative value otherwise. */ -int ena_com_get_offload_settings (struct ena_com_dev *ena_dev, -struct ena_admin_feature_offload_desc *offload);/* ena_com_rss_init - Init RSS * @ena_dev: ENA communication layer struct
drivers/net/ena/base/ena_defs/ena_eth_io_defs.h +4 -3
@@ -965,14 +965,15 @@ static inline void set_ena_eth_io_intr_reg_intr_unmask(struct ena_eth_io_intr_re p->intr_control |= (val <<ENA_ETH_IO_INTR_REG_INTR_UNMASK_SHIFT ) &ENA_ETH_IO_INTR_REG_INTR_UNMASK_MASK ; } -static inline uint32_t get_ena_eth_io_intr_reg_no_mod_update (const struct ena_eth_io_intr_reg *p) +static inline +uint32_t get_ena_eth_io_intr_reg_no_moderation_update (const struct ena_eth_io_intr_reg *p) {return (p->intr_control &ENA_ETH_IO_INTR_REG_NO_MODERATION_UPDATE_MASK ) >>ENA_ETH_IO_INTR_REG_NO_MODERATION_UPDATE_SHIFT ; } -static inline void set_ena_eth_io_intr_reg_no_mod_update (struct ena_eth_io_intr_reg *p, -uint32_t val) +static inline +void set_ena_eth_io_intr_reg_no_moderation_update (struct ena_eth_io_intr_reg *p,uint32_t val) { p->intr_control |= (val <<ENA_ETH_IO_INTR_REG_NO_MODERATION_UPDATE_SHIFT ) &ENA_ETH_IO_INTR_REG_NO_MODERATION_UPDATE_MASK ;
Signature · 1 line
2.17.1
Re: [PATCH 1/4] net/ena/base: upgrade ena-com to the latest version
drivers/net/ena/base/ena_com.h int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu); · line 771
Quoted 7 lines · On Mon, 24 Feb 2025 13:40:08 +0200 <[email protected]> wrote:
drivers/net/ena/base/ena_com.h +0
-2@@ -768,8 +768,6 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu);* * @return: 0 on Success and negative value otherwise. */ -int ena_com_get_offload_settings (struct ena_com_dev *ena_dev, -struct ena_admin_feature_offload_desc *offload);
Don't you want to get rid of the comment as well?
PATCH 2/4 net/ena: add support for mutable RSS table size
In reply to [email protected]From: Shai Brandes <[email protected]>
This patch enables the configuration of a mutable RSS table size, allowing it to adapt to the device's capabilities instead of relying on a fixed 128 hardcoded value.
--- doc/guides/rel_notes/release_25_03.rst | 4 ++ drivers/net/ena/base/ena_com.c | 60 ++++++++++--------- drivers/net/ena/base/ena_com.h | 3 +- .../net/ena/base/ena_defs/ena_admin_defs.h | 3 + drivers/net/ena/ena_ethdev.c | 31 ++++++++-- drivers/net/ena/ena_ethdev.h | 8 +-- drivers/net/ena/ena_rss.c | 48 ++++++++++++--- 7 files changed, 111 insertions(+), 46 deletions(-)
doc/guides/rel_notes/release_25_03.rst +4 -0
@@ -97,6 +97,10 @@ New Features * Added ability to option to configure receive packet fanout mode. * Added statistics for failed buffer allocation and missed packets. +* **Updated Amazon ENA (Elastic Network Adapter) net driver.** + + * Added support for mutable RSS table size based on device capabilities. + * **Updated AMD axgbe driver.** * Added support for the TCP Segmentation Offload (TSO).
drivers/net/ena/base/ena_com.c +33 -27
113 lines not on this page · raw message
drivers/net/ena/base/ena_com.h +2 -1
@@ -779,7 +779,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu);* * @return: 0 on Success and negative value otherwise. */ -int ena_com_rss_init (struct ena_com_dev *ena_dev,u16 log_size); +int ena_com_rss_init (struct ena_com_dev *ena_dev);/* ena_com_rss_destroy - Destroy rss * @ena_dev: ENA communication layer struct
@@ -1144,6 +1144,7 @@ static inline void ena_com_disable_adaptive_moderation(struct ena_com_dev *ena_d ena_dev->adaptive_coalescing = false; } +bool ena_com_indirection_table_config_supported (struct ena_com_dev *ena_dev);/* ena_com_get_cap - query whether device supports a capability. * @ena_dev: ENA communication layer struct * @cap_id: enum value representing the capability
drivers/net/ena/base/ena_defs/ena_admin_defs.h +3 -0
@@ -840,6 +840,9 @@ struct ena_admin_feature_offload_desc {uint32_t rx_enabled; }; +enum ena_admin_rss_feature_version { +ENA_ADMIN_RSS_FEATURE_VERSION_1 =1 , +};enum ena_admin_hash_functions {ENA_ADMIN_TOEPLITZ =1 ,ENA_ADMIN_CRC32 =2 ,
drivers/net/ena/ena_ethdev.c +27 -4
@@ -603,7 +603,7 @@ __extension__ ({ENA_TOUCH (ena_dev);if (ind_tbl != adapter->indirect_table)rte_memcpy (ind_tbl, adapter->indirect_table, -sizeof (adapter->indirect_table)); +sizeof (u32) * adapter->indirect_table_size); }), struct ena_com_dev *ena_dev, u32 *ind_tbl);
@@ -889,6 +889,13 @@ static void ena_config_debug_area(struct ena_adapter *adapter)ena_com_delete_debug_area (&adapter->ena_dev); } +static inline void ena_indirect_table_release (struct ena_adapter *adapter) +{ +if (likely (adapter->indirect_table)) { +rte_free (adapter->indirect_table); + adapter->indirect_table =NULL ; + } +}static int ena_close (struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);
@@ -920,6 +927,7 @@ static int ena_close(struct rte_eth_dev *dev)ena_rx_queue_release_all (dev);ena_tx_queue_release_all (dev); +ena_indirect_table_release (adapter);rte_free (adapter->drv_stats); adapter->drv_stats =NULL ;
@@ -2278,6 +2286,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)int rc;static int adapters_found;bool disable_meta_caching; +size_t indirect_table_size; eth_dev->dev_ops = &ena_dev_ops; eth_dev->rx_pkt_burst = ð_ena_recv_pkts;
@@ -2413,12 +2422,24 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) get_feat_ctx.dev_attr.mac_addr, (struct rte_ether_addr *)adapter->mac_addr); - rc =ena_com_rss_init (ena_dev,ENA_RX_RSS_TABLE_LOG_SIZE ); + rc =ena_com_rss_init (ena_dev);if (unlikely (rc !=0 )) {PMD_DRV_LOG_LINE (ERR ,"Failed to initialize RSS in ENA device" ); goto err_delete_debug_area; } + indirect_table_size =ena_rss_get_indirection_table_size (adapter); +if (indirect_table_size) { + adapter->indirect_table =rte_zmalloc ("adapter RSS indirection table" , +sizeof (u32) * indirect_table_size, +RTE_CACHE_LINE_SIZE ); +if (!adapter->indirect_table) { +PMD_DRV_LOG_LINE (ERR , +"Failed to allocate memory for RSS indirection table" ); + rc = -ENOMEM ; + goto err_rss_destroy; + } + } adapter->drv_stats =rte_zmalloc ("adapter stats" ,sizeof (*adapter->drv_stats),RTE_CACHE_LINE_SIZE );
@@ -2426,7 +2447,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)PMD_DRV_LOG_LINE (ERR ,"Failed to allocate memory for adapter statistics" ); rc = -ENOMEM ; - goto err_rss_destroy; + goto err_indirect_table_destroy; }rte_spinlock_init (&adapter->admin_lock);
@@ -2454,6 +2475,8 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)return 0 ; err_control_path_destroy:rte_free (adapter->drv_stats); +err_indirect_table_destroy: +ena_indirect_table_release (adapter); err_rss_destroy:ena_com_rss_destroy (ena_dev); err_delete_debug_area:
@@ -2643,7 +2666,7 @@ static int ena_infos_get(struct rte_eth_dev *dev, dev_info->max_rx_queues = adapter->max_num_io_queues; dev_info->max_tx_queues = adapter->max_num_io_queues; - dev_info->reta_size =ENA_RX_RSS_TABLE_SIZE ; + dev_info->reta_size = adapter->indirect_table_size; dev_info->rx_desc_lim.nb_max = adapter->max_rx_ring_size; dev_info->rx_desc_lim.nb_min =ENA_MIN_RING_DESC ;
drivers/net/ena/ena_ethdev.h +3 -5
@@ -29,8 +29,6 @@#define ENA_RX_BUF_MIN_SIZE 1400#define ENA_DEFAULT_RING_SIZE 1024 -#define ENA_RX_RSS_TABLE_LOG_SIZE 7 -#define ENA_RX_RSS_TABLE_SIZE (1 << ENA_RX_RSS_TABLE_LOG_SIZE)#define ENA_MIN_MTU 128
@@ -65,8 +63,6 @@#define ENA_IDX_NEXT_MASKED (idx, mask) (((idx) + 1) & (mask))#define ENA_IDX_ADD_MASKED (idx, n, mask) (((idx) + (n)) & (mask)) -#define ENA_RX_RSS_TABLE_LOG_SIZE 7 -#define ENA_RX_RSS_TABLE_SIZE (1 << ENA_RX_RSS_TABLE_LOG_SIZE)#define ENA_HASH_KEY_SIZE 40
@@ -333,7 +329,8 @@ struct ena_adapter {struct ena_stats_dev dev_stats;struct ena_admin_basic_stats basic_stats; -u32 indirect_table[ENA_RX_RSS_TABLE_SIZE ]; +u32 *indirect_table; +size_t indirect_table_size;uint32_t all_aenq_groups;uint32_t active_aenq_groups;
@@ -360,6 +357,7 @@ struct ena_adapter { alignas(RTE_CACHE_LINE_SIZE )struct ena_stats_srd srd_stats; }; +size_t ena_rss_get_indirection_table_size (struct ena_adapter *adapter);int ena_mp_indirect_table_set (struct ena_adapter *adapter);int ena_mp_indirect_table_get (struct ena_adapter *adapter,uint32_t *indirect_table);
drivers/net/ena/ena_rss.c +39 -9
108 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/4 net/ena: remove deprecated notifications
In reply to [email protected]From: Shai Brandes <[email protected]>
Remove deprecated asynchronous event notifications that may arrive from the device. The removal ensures that only supported event handling mechanisms are in use.
--- drivers/net/ena/ena_ethdev.c | 51 ------------------------------------ 1 file changed, 51 deletions(-)
drivers/net/ena/ena_ethdev.c +0 -51
@@ -1924,10 +1924,7 @@ static int ena_device_init(struct ena_adapter *adapter, } aenq_groups =BIT (ENA_ADMIN_LINK_CHANGE ) | -BIT (ENA_ADMIN_NOTIFICATION ) |BIT (ENA_ADMIN_KEEP_ALIVE ) | -BIT (ENA_ADMIN_FATAL_ERROR ) | -BIT (ENA_ADMIN_WARNING ) |BIT (ENA_ADMIN_CONF_NOTIFICATIONS ); aenq_groups &= get_feat_ctx->aenq.supported_groups;
@@ -3050,29 +3047,6 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,return i; } -static void ena_update_hints (struct ena_adapter *adapter, -struct ena_admin_ena_hw_hints *hints) -{ -if (hints->admin_completion_tx_timeout) - adapter->ena_dev.admin_queue.completion_timeout = - hints->admin_completion_tx_timeout *1000 ; - -if (hints->mmio_read_timeout) -/* convert to usec */ - adapter->ena_dev.mmio_read.reg_read_to = - hints->mmio_read_timeout *1000 ; - -if (hints->driver_watchdog_timeout) { -if (hints->driver_watchdog_timeout ==ENA_HW_HINTS_NO_TIMEOUT ) - adapter->keep_alive_timeout =ENA_HW_HINTS_NO_TIMEOUT ; -else -// Convert msecs to ticks - adapter->keep_alive_timeout = - (hints->driver_watchdog_timeout * -rte_get_timer_hz ()) /1000 ; - } -} - static void ena_tx_map_mbuf(struct ena_ring *tx_ring, struct ena_tx_buffer *tx_info, struct rte_mbuf *mbuf,
@@ -4078,30 +4052,6 @@ static void ena_update_on_link_change(void *adapter_data,rte_eth_dev_callback_process (eth_dev,RTE_ETH_EVENT_INTR_LSC ,NULL ); } -static void ena_notification (void *adapter_data, -struct ena_admin_aenq_entry *aenq_e) -{ -struct rte_eth_dev *eth_dev = adapter_data; -struct ena_adapter *adapter = eth_dev->data->dev_private; -struct ena_admin_ena_hw_hints *hints; - -if (aenq_e->aenq_common_desc.group !=ENA_ADMIN_NOTIFICATION ) -PMD_DRV_LOG_LINE (WARNING ,"Invalid AENQ group: %x. Expected: %x" , - aenq_e->aenq_common_desc.group, -ENA_ADMIN_NOTIFICATION ); - -switch (aenq_e->aenq_common_desc.syndrome) { -case ENA_ADMIN_UPDATE_HINTS : - hints = (struct ena_admin_ena_hw_hints *) - (&aenq_e->inline_data_w4); -ena_update_hints (adapter, hints); -break ; -default : -PMD_DRV_LOG_LINE (ERR ,"Invalid AENQ notification link state: %d" , - aenq_e->aenq_common_desc.syndrome); - } -} -static void ena_keep_alive (void *adapter_data, __rte_unused struct ena_admin_aenq_entry *aenq_e) {
@@ -4156,7 +4106,6 @@ static void unimplemented_aenq_handler(__rte_unused void *data,static struct ena_aenq_handlers aenq_handlers = { .handlers = { [ENA_ADMIN_LINK_CHANGE ] = ena_update_on_link_change, - [ENA_ADMIN_NOTIFICATION ] = ena_notification, [ENA_ADMIN_KEEP_ALIVE ] = ena_keep_alive, [ENA_ADMIN_CONF_NOTIFICATIONS ] = ena_suboptimal_configuration },
Signature · 1 line
2.17.1
PATCH 4/4 net/ena: upgrade driver version to 2.12.0
In reply to [email protected]From: Shai Brandes <[email protected]>
Upgrade ENA driver version to 2.12.0.
--- drivers/net/ena/ena_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ena/ena_ethdev.c +1 -1
@@ -22,7 +22,7 @@#include <ena_eth_io_defs.h> #define DRV_MODULE_VER_MAJOR 2 -#define DRV_MODULE_VER_MINOR 11 +#define DRV_MODULE_VER_MINOR 12#define DRV_MODULE_VER_SUBMINOR 0#define __MERGE_64B_H_L (h, l) (((uint64_t)h << 32) | l)
Signature · 1 line
2.17.1