mlx5 misc fixes 2025-06-10
Subsystems (5)
Mark Bloch
maintainercover mlx5 misc fixes 2025-06-10
This patchset includes misc fixes from the team for the mlx5 core and Ethernet drivers.
Thanks,
Mark
Amir Tzin (1):
net/mlx5: Fix ECVF vports unload on shutdown flow
Jianbo Liu (1):
net/mlx5e: Fix leak of Geneve TLV option object
Leon Romanovsky (1):
net/mlx5e: Properly access RCU protected qdisc_sleeping variable
Moshe Shemesh (1):
net/mlx5: Ensure fw pages are always allocated on same NUMA
Patrisious Haddad (1):
net/mlx5: Fix return value when searching for existing flow group
Shahar Shitrit (1):
net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper
Vlad Dogaru (2):
net/mlx5: HWS, Init mutex on the correct path net/mlx5: HWS, make sure the uplink is the last destination
Yevgeny Kliteynik (1):
net/mlx5: HWS, fix missing ip_version handling in definer
.../net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +++- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +---- .../net/ethernet/mellanox/mlx5/core/en_tc.c | 12 +++++------ .../net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++++++++++++------- .../net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++++- .../ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- .../mellanox/mlx5/core/steering/hws/action.c | 14 ++++++------- .../mellanox/mlx5/core/steering/hws/definer.c | 3 +++ .../mellanox/mlx5/core/steering/hws/fs_hws.c | 5 ++++- .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 1 + 10 files changed, 43 insertions(+), 29 deletions(-)
base-commit: fdd9ebccfc32c060d027ab9a2c957097e6997de6
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 1/9 net/mlx5: Ensure fw pages are always allocated on same NUMA
From: Moshe Shemesh <[email protected]>
When firmware asks the driver to allocate more pages, using event of give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code uses dev_to_node() which can result in different NUMA as it is changed by other driver flows, such as mlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages.
--- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +1 -1
@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function)static int alloc_system_page (struct mlx5_core_dev *dev,u32 function) {struct device *device =mlx5_core_dma_dev (dev); -int nid =dev_to_node (device); +int nid = dev->priv.numa_node;struct page *page;u64 zero_addr =1 ;u64 addr;
Signature · 1 line
2.34.1
Re: [PATCH net 1/9] net/mlx5: Ensure fw pages are always allocated on same NUMA
Quoted 8 lines · Mark Bloch
From: Moshe Shemesh <[email protected]>
When firmware asks the driver to allocate more pages, using event of
give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code usesdev_to_node()which can result in different NUMA as it is changed by other driver flows, such asmlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages.
I'm not sure whether NUMA balancing is currently being considered or not.
If I understand correctly, after this commit is applied, all pages will be allocated from the same NUMA node — specifically, the original device's NUMA node. This seems like it could lead to NUMA imbalance.
By using dev_to_node, it appears that pages could be allocated from other NUMA nodes, which might help maintain better NUMA balance.
In the past, I encountered a NUMA balancing issue caused by the mlx5 NIC, so using dev_to_node might be beneficial in addressing similar problems.
Thanks,
Zhu Yanjun
Quoted 22 lines
Fixes 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUMA node")Signed-off-by Moshe Shemesh <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Mark Bloch <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +1
-1@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function)static int alloc_system_page (struct mlx5_core_dev *dev,u32 function) {struct device *device =mlx5_core_dma_dev (dev); -int nid =dev_to_node (device); +int nid = dev->priv.numa_node;struct page *page;u64 zero_addr =1 ;u64 addr;
Re: [PATCH net 1/9] net/mlx5: Ensure fw pages are always allocated on same NUMA
Quoted 10 lines · Zhu Yanjun
Quoted 8 lines · Mark Bloch
From: Moshe Shemesh <[email protected]>
When firmware asks the driver to allocate more pages, using event of
give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code usesdev_to_node()which can result in different NUMA as it is changed by other driver flows, such asmlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages.
Quoted 5 lines
I'm not sure whether NUMA balancing is currently being considered or not.
If I understand correctly, after this commit is applied, all pages will be allocated from the same NUMA node — specifically, the original device's NUMA node. This seems like it could lead to NUMA imbalance.
The change is applied only on pages allocated for FW use. Pages which are allocated for driver use as SQ/RQ/CQ/EQ etc, are not affected by this change.
As for FW pages (allocated for FW use), we did mean to use only the device close NUMA, we are not looking for balance here. Even before the change, in most cases, FW pages are allocated from device close NUMA, the fix only ensures it.
Quoted 35 lines
By using
dev_to_node, it appears that pages could be allocated from other NUMA nodes, which might help maintain better NUMA balance.In the past, I encountered a NUMA balancing issue caused by the mlx5 NIC, so using
dev_to_nodemight be beneficial in addressing similar problems.Thanks,
Zhu YanjunQuoted 23 lines
Fixes 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUMA node")Signed-off-by Moshe Shemesh <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Mark Bloch <[email protected]>---
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +1
-1@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function) static int alloc_system_page(struct mlx5_core_dev *dev, u32 function) { struct device *device = mlx5_core_dma_dev(dev); - int nid = dev_to_node(device); + int nid = dev->priv.numa_node; struct page *page; u64 zero_addr = 1;u64 addr;
Re: [PATCH net 1/9] net/mlx5: Ensure fw pages are always allocated on same NUMA
Quoted 15 lines · Moshe Shemesh
Quoted 12 lines · Zhu Yanjun
Quoted 8 lines · Mark Bloch
From: Moshe Shemesh <[email protected]>
When firmware asks the driver to allocate more pages, using event of
give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code usesdev_to_node()which can result in different NUMA as it is changed by other driver flows, such asmlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages.I'm not sure whether NUMA balancing is currently being considered or not.
Quoted 7 lines
Quoted 3 lines
If I understand correctly, after this commit is applied, all pages will be allocated from the same NUMA node — specifically, the original device's NUMA node. This seems like it could lead to NUMA imbalance.
The change is applied only on pages allocated for FW use. Pages which are allocated for driver use as SQ/RQ/CQ/EQ etc, are not affected by this change.
As for FW pages (allocated for FW use), we did mean to use only the device close NUMA, we are not looking for balance here. Even before the change, in most cases, FW pages are allocated from device close NUMA, the fix only ensures it.
Thanks a lot. I’m fine with your explanations.
In the past, I encountered a NUMA-balancing issue where memory allocations were dependent on the mlx5 device. Specifically, memory was allocated only from the NUMA node closest to the mlx5 device. As a result, during the lifetime of the process, more than 100GB of memory was allocated from that single NUMA node, while other NUMA nodes saw no significant allocations. This led to a NUMA imbalance problem.
According to your commit, SQ/RQ/CQ/EQ are not affected—only the firmware (FW) pages are. These FW pages include Memory Region (MR) and On-Demand Paging (ODP) pages. ODP pages are freed after use, and the amount of MR pages remains fixed throughout the process lifecycle. Therefore, in theory, this commit should not cause any NUMA imbalance. However, since production environments can be complex, I’ll monitor for any NUMA balancing issues after this commit is deployed in production.
In short, I’m fine with both this commit and your explanations.
Thanks,
Yanjun.Zhu
Quoted 37 lines
Quoted 36 lines
By using
dev_to_node, it appears that pages could be allocated from other NUMA nodes, which might help maintain better NUMA balance.In the past, I encountered a NUMA balancing issue caused by the mlx5 NIC, so using
dev_to_nodemight be beneficial in addressing similar problems.Thanks,
Zhu YanjunQuoted 23 lines
Fixes 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUMA node")Signed-off-by Moshe Shemesh <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Mark Bloch <[email protected]>---
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +1
-1@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function) static int alloc_system_page(struct mlx5_core_dev *dev, u32 function) { struct device *device = mlx5_core_dma_dev(dev); - int nid = dev_to_node(device); + int nid = dev->priv.numa_node; struct page *page; u64 zero_addr = 1;u64 addr;
Signature · 2 lines
Best Regards, Yanjun.Zhu
Re: [PATCH net 1/9] net/mlx5: Ensure fw pages are always allocated on same NUMA
Quoted 42 lines · Zhu Yanjun
External email: Use caution opening links or attachments
Quoted 20 lines · Moshe Shemesh
Quoted 10 lines · Zhu Yanjun
Quoted 8 lines · Mark Bloch
From: Moshe Shemesh <[email protected]>
When firmware asks the driver to allocate more pages, using event of
give_pages, the driver should always allocate it from same NUMA, the original device NUMA. Current code usesdev_to_node()which can result in different NUMA as it is changed by other driver flows, such asmlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for allocating firmware pages.Quoted 6 lines
I'm not sure whether NUMA balancing is currently being considered or not.
If I understand correctly, after this commit is applied, all pages will be allocated from the same NUMA node — specifically, the original device's NUMA node. This seems like it could lead to NUMA imbalance.
Quoted 8 lines
The change is applied only on pages allocated for FW use. Pages which are allocated for driver use as SQ/RQ/CQ/EQ etc, are not affected by this change.
As for FW pages (allocated for FW use), we did mean to use only the device close NUMA, we are not looking for balance here. Even before the change, in most cases, FW pages are allocated from device close NUMA, the fix only ensures it.
Thanks a lot. I’m fine with your explanations.
In the past, I encountered a NUMA-balancing issue where memory allocations were dependent on the mlx5 device. Specifically, memory was allocated only from the NUMA node closest to the mlx5 device. As a result, during the lifetime of the process, more than 100GB of memory was allocated from that single NUMA node, while other NUMA nodes saw no significant allocations. This led to a NUMA imbalance problem.
Quoted 7 lines
According to your commit, SQ/RQ/CQ/EQ are not affected—only the firmware (FW) pages are. These FW pages include Memory Region (MR) and On-Demand Paging (ODP) pages. ODP pages are freed after use, and the amount of MR pages remains fixed throughout the process lifecycle. Therefore, in theory, this commit should not cause any NUMA imbalance. However, since production environments can be complex, I’ll monitor for any NUMA balancing issues after this commit is deployed in production.
Thanks for monitoring it.
Just to clarify, this change does not affect also MR allocation. It affects pages allocated for FW internal use, handling requests from FW using give_pages() function and manage_pages command.
Quoted 3 lines
In short, I’m fine with both this commit and your explanations.
Thanks,
Moshe.
Quoted 47 lines
Thanks,
Yanjun.Zhu
Quoted 39 lines
Quoted 38 lines
By using
dev_to_node, it appears that pages could be allocated from other NUMA nodes, which might help maintain better NUMA balance.In the past, I encountered a NUMA balancing issue caused by the mlx5 NIC, so using
dev_to_nodemight be beneficial in addressing similar problems.Thanks,
Zhu YanjunQuoted 25 lines
Fixes 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory onreader NUMA node")
Signed-off-by Moshe Shemesh <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Mark Bloch <[email protected]>---
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) renamed from drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +0
-0
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.cindex972e8e9df585..9bc9bd83c232100644drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +1
-1@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function) static int alloc_system_page(struct mlx5_core_dev *dev, u32 function) { struct device *device = mlx5_core_dma_dev(dev); - int nid = dev_to_node(device); + int nid = dev->priv.numa_node; struct page *page; u64 zero_addr = 1;u64 addr;
Signature · 2 lines
Best Regards, Yanjun.Zhu
Mark Bloch
maintainerPATCH 2/9 net/mlx5: Fix ECVF vports unload on shutdown flow
In reply to Mark BlochFrom: Amir Tzin <[email protected]>
Fix shutdown flow UAF when a virtual function is created on the embedded chip (ECVF) of a BlueField device. In such case the vport acl ingress table is not properly destroyed.
ECVF functionality is independent of ecpf_vport_exists capability and thus functions mlx5_eswitch_(enable|disable)_pf_vf_vports() should not test it when enabling/disabling ECVF vports.
kernel log:
[] refcount_t: underflow; use-after-free.
[] WARNING: CPU: 3 PID: 1 at lib/refcount.c:28
refcount_warn_saturate+0x124/0x220 ----------------
[] Call trace:
[] refcount_warn_saturate+0x124/0x220
[] tree_put_node+0x164/0x1e0 [mlx5_core]
[] mlx5_destroy_flow_table+0x98/0x2c0 [mlx5_core] [] esw_acl_ingress_table_destroy+0x28/0x40 [mlx5_core] [] esw_acl_ingress_lgcy_cleanup+0x80/0xf4 [mlx5_core] [] esw_legacy_vport_acl_cleanup+0x44/0x60 [mlx5_core] [] esw_vport_cleanup+0x64/0x90 [mlx5_core]
[] mlx5_esw_vport_disable+0xc0/0x1d0 [mlx5_core] [] mlx5_eswitch_unload_ec_vf_vports+0xcc/0x150 [mlx5_core] [] mlx5_eswitch_disable_sriov+0x198/0x2a0 [mlx5_core] [] mlx5_device_disable_sriov+0xb8/0x1e0 [mlx5_core] [] mlx5_sriov_detach+0x40/0x50 [mlx5_core]
[] mlx5_unload+0x40/0xc4 [mlx5_core]
[] mlx5_unload_one_devl_locked+0x6c/0xe4 [mlx5_core] [] mlx5_unload_one+0x3c/0x60 [mlx5_core]
[] shutdown+0x7c/0xa4 [mlx5_core]
[] pci_device_shutdown+0x3c/0xa0
[] device_shutdown+0x170/0x340
[] __do_sys_reboot+0x1f4/0x2a0
[] __arm64_sys_reboot+0x2c/0x40
[] invoke_syscall+0x78/0x100
[] el0_svc_common.constprop.0+0x54/0x184
[] do_el0_svc+0x30/0xac
[] el0_svc+0x48/0x160
[] el0t_64_sync_handler+0xa4/0x12c
[] el0t_64_sync+0x1a4/0x1a8
[] --[ end trace 9c4601d68c70030e ]---
--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +13 -8
@@ -1295,12 +1295,15 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw, ret =mlx5_eswitch_load_pf_vf_vport (esw,MLX5_VPORT_ECPF , enabled_events);if (ret) goto ecpf_err; -if (mlx5_core_ec_sriov_enabled (esw->dev)) { - ret =mlx5_eswitch_load_ec_vf_vports (esw, esw->esw_funcs.num_ec_vfs, - enabled_events); -if (ret) - goto ec_vf_err; - } + } + +/* Enable ECVF vports */ +if (mlx5_core_ec_sriov_enabled (esw->dev)) { + ret =mlx5_eswitch_load_ec_vf_vports (esw, + esw->esw_funcs.num_ec_vfs, + enabled_events); +if (ret) + goto ec_vf_err; }/* Enable VF vports */
@@ -1331,9 +1334,11 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw) {mlx5_eswitch_unload_vf_vports (esw, esw->esw_funcs.num_vfs); +if (mlx5_core_ec_sriov_enabled (esw->dev)) +mlx5_eswitch_unload_ec_vf_vports (esw, + esw->esw_funcs.num_ec_vfs); +if (mlx5_ecpf_vport_exists (esw->dev)) { -if (mlx5_core_ec_sriov_enabled (esw->dev)) -mlx5_eswitch_unload_ec_vf_vports (esw, esw->esw_funcs.num_vfs);mlx5_eswitch_unload_pf_vf_vport (esw,MLX5_VPORT_ECPF ); }
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 3/9 net/mlx5: Fix return value when searching for existing flow group
In reply to Mark BlochFrom: Patrisious Haddad <[email protected]>
When attempting to add a rule to an existing flow group, if a matching flow group exists but is not active, the error code returned should be EAGAIN, so that the rule can be added to the matching flow group once it is active, rather than ENOENT, which indicates that no matching flow group was found.
--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +4 -1
@@ -2228,6 +2228,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,struct mlx5_flow_handle *rule;struct match_list *iter;bool take_write = false; +bool try_again = false;struct fs_fte *fte;u64 version =0 ;int err;
@@ -2292,6 +2293,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,nested_down_write_ref_node (&g->node,FS_LOCK_PARENT );if (!g->node.active) { + try_again = true;up_write_ref_node (&g->node, false);continue ; }
@@ -2313,7 +2315,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,tree_put_node (&fte->node, false);return rule; } - rule =ERR_PTR (-ENOENT ); + err = try_again ? -EAGAIN : -ENOENT ; + rule =ERR_PTR (err); out:kmem_cache_free (steering->ftes_cache, fte);return rule;
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 4/9 net/mlx5: HWS, Init mutex on the correct path
In reply to Mark BlochFrom: Vlad Dogaru <[email protected]>
The newly introduced mutex is only used for reformat actions, but it was initialized for modify header instead.
The struct that contains the mutex is zero-initialized and an all-zero mutex is valid, so the issue only shows up with CONFIG_DEBUG_MUTEXES.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +1 -1
@@ -1357,6 +1357,7 @@ mlx5_cmd_hws_packet_reformat_alloc(struct mlx5_flow_root_namespace *ns, pkt_reformat->fs_hws_action.pr_data = pr_data; } +mutex_init (&pkt_reformat->fs_hws_action.lock); pkt_reformat->owner =MLX5_FLOW_RESOURCE_OWNER_HWS ; pkt_reformat->fs_hws_action.hws_action = hws_action;return 0 ;
@@ -1503,7 +1504,6 @@ static int mlx5_cmd_hws_modify_header_alloc(struct mlx5_flow_root_namespace *ns, err = -ENOMEM ; goto release_mh; } -mutex_init (&modify_hdr->fs_hws_action.lock); modify_hdr->fs_hws_action.mh_data = mh_data; modify_hdr->fs_hws_action.fs_pool = pool; modify_hdr->owner =MLX5_FLOW_RESOURCE_OWNER_SW ;
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 5/9 net/mlx5: HWS, fix missing ip_version handling in definer
In reply to Mark BlochFrom: Yevgeny Kliteynik <[email protected]>
Fix missing field handling in definer - outer IP version.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c +3 -0
@@ -785,6 +785,9 @@ hws_definer_conv_outer(struct mlx5hws_definer_conv_data *cd,HWS_SET_HDR (fc, match_param,IP_PROTOCOL_O , outer_headers.ip_protocol, eth_l3_outer.protocol_next_header); +HWS_SET_HDR (fc, match_param,IP_VERSION_O , + outer_headers.ip_version, + eth_l3_outer.ip_version);HWS_SET_HDR (fc, match_param,IP_TTL_O , outer_headers.ttl_hoplimit, eth_l3_outer.time_to_live_hop_limit);
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 6/9 net/mlx5: HWS, make sure the uplink is the last destination
In reply to Mark BlochFrom: Vlad Dogaru <[email protected]>
When there are more than one destinations, we create a FW flow table and provide it with all the destinations. FW requires to have wire as the last destination in the list (if it exists), otherwise the operation fails with FW syndrome.
This patch fixes the destination array action creation: if it contains a wire destination, it is moved to the end.
--- .../mellanox/mlx5/core/steering/hws/action.c | 14 +++++++------- .../mellanox/mlx5/core/steering/hws/fs_hws.c | 3 +++ .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c +7 -7
@@ -1370,8 +1370,8 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx,struct mlx5hws_cmd_set_fte_attr fte_attr = {0 };struct mlx5hws_cmd_forward_tbl *fw_island;struct mlx5hws_action *action; -u32 i/*, packet_reformat_id*/ ; -int ret; +int ret, last_dest_idx =-1 ; +u32 i;if (num_dest <=1 ) {mlx5hws_err (ctx,"Action must have multiple dests\n" );
@@ -1401,11 +1401,8 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, dest_list[i].destination_id = dests[i].dest->dest_obj.obj_id; fte_attr.action_flags |=MLX5_FLOW_CONTEXT_ACTION_FWD_DEST ; fte_attr.ignore_flow_level = ignore_flow_level; -/* ToDo: In SW steering we have a handling of 'go to WIRE' -* destination here by upper layer setting 'is_wire_ft' flag -* if the destination is wire. -* This is because uplink should be last dest in the list. -*/ +if (dests[i].is_wire_ft) + last_dest_idx = i;break ;case MLX5HWS_ACTION_TYP_VPORT : dest_list[i].destination_type =MLX5_FLOW_DESTINATION_TYPE_VPORT ;
@@ -1429,6 +1426,9 @@ mlx5hws_action_create_dest_array(struct mlx5hws_context *ctx, } } +if (last_dest_idx !=-1 ) +swap (dest_list[last_dest_idx], dest_list[num_dest -1 ]); + fte_attr.dests_num = num_dest; fte_attr.dests = dest_list;
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +3 -0
@@ -966,6 +966,9 @@ static int mlx5_fs_fte_get_hws_actions(struct mlx5_flow_root_namespace *ns,switch (attr->type) {case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE : dest_action =mlx5_fs_get_dest_action_ft (fs_ctx, dst); +if (dst->dest_attr.ft->flags & +MLX5_FLOW_TABLE_UPLINK_VPORT ) + dest_actions[num_dest_actions].is_wire_ft = true;break ;case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM : dest_action = mlx5_fs_get_dest_action_table_num(fs_ctx,
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h +1 -0
@@ -213,6 +213,7 @@ struct mlx5hws_action_dest_attr {struct mlx5hws_action *dest;/* Optional reformat action */ struct mlx5hws_action *reformat; +bool is_wire_ft; };/**
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 7/9 net/mlx5e: Properly access RCU protected qdisc_sleeping variable
In reply to Mark BlochFrom: Leon Romanovsky <[email protected]>
qdisc_sleeping variable is declared as "struct Qdisc __rcu" and as such needs proper annotation while accessing it.
Without rtnl_dereference(), the following error is generated by smatch:
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning:
incorrect type in initializer (different address spaces)drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected
struct Qdisc *qdiscdrivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct
Qdisc [noderef] __rcu *qdisc_sleeping
--- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +3 -1
@@ -374,7 +374,9 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_quevoid mlx5e_reset_qdisc (struct net_device *dev,u16 qid) {struct netdev_queue *dev_queue =netdev_get_tx_queue (dev, qid); -struct Qdisc *qdisc = dev_queue->qdisc_sleeping; +struct Qdisc *qdisc; + + qdisc =rtnl_dereference (dev_queue->qdisc_sleeping);if (!qdisc)return ;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerRe: [PATCH net 7/9] net/mlx5e: Properly access RCU protected qdisc_sleeping variable
Quoted 4 lines · On Tue, 10 Jun 2025 18:15:12 +0300 Mark Bloch wrote:
qdisc_sleepingvariable is declared as "struct Qdisc__rcu" and as such needs proper annotation while accessing it.Without
rtnl_dereference(), the following error is generated by smatch:
sparse ?
Quoted 9 lines
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning:
incorrect type in initializer (different address spaces)drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected
struct Qdisc *qdiscdrivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct
Qdisc [noderef]__rcu*qdisc_sleepingFixes 214baf22870c ("net/mlx5e: Support HTB offload")
I don't think this is a functional change? We don't treat silencing compiler warnings as fixes, not for sparse or W=1 warnings.
Quoted 12 lines
Signed-off-by Leon Romanovsky <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Mark Bloch <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +0
-0
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_que · line 381
Quoted 9 lines
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +3
-1@@ -374,7 +374,9 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_quevoid mlx5e_reset_qdisc (struct net_device *dev,u16 qid) {struct netdev_queue *dev_queue =netdev_get_tx_queue (dev, qid); -struct Qdisc *qdisc = dev_queue->qdisc_sleeping; +struct Qdisc *qdisc; + + qdisc =rtnl_dereference (dev_queue->qdisc_sleeping);if (!qdisc)
nit: no new line between action and error check
Mark Bloch
maintainerRe: [PATCH net 7/9] net/mlx5e: Properly access RCU protected qdisc_sleeping variable
Quoted 7 lines · Jakub Kicinski
Quoted 4 lines · On Tue, 10 Jun 2025 18:15:12 +0300 Mark Bloch wrote:
qdisc_sleepingvariable is declared as "struct Qdisc__rcu" and as such needs proper annotation while accessing it.Without
rtnl_dereference(), the following error is generated by smatch:sparse ?
Right, just tested it myself, it's indeed with sparse.
Quoted 9 lines
Quoted 9 lines
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning:
incorrect type in initializer (different address spaces)drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected
struct Qdisc *qdiscdrivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct
Qdisc [noderef]__rcu*qdisc_sleeping
Quoted 4 lines
Quoted 1 line
Fixes 214baf22870c ("net/mlx5e: Support HTB offload")I don't think this is a functional change? We don't treat silencing compiler warnings as fixes, not for sparse or W=1 warnings.
Well Eric's commit: d636fc5dd692c8f4e00ae6e0359c0eceeb5d9bdb that added this annotation was because of a syzbot report.
Anyway, we don't mind pushing via net-next.
Mark
Quoted 24 lines
Quoted 13 lines
Signed-off-by Leon Romanovsky <[email protected]>Reviewed-by Tariq Toukan <[email protected]>Signed-off-by Mark Bloch <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +0
-0drivers/net/ethernet/mellanox/mlx5/core/en/qos.c void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_que · line 381
Quoted 9 lines
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +3
-1@@ -374,7 +374,9 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_quevoid mlx5e_reset_qdisc (struct net_device *dev,u16 qid) {struct netdev_queue *dev_queue =netdev_get_tx_queue (dev, qid); -struct Qdisc *qdisc = dev_queue->qdisc_sleeping; +struct Qdisc *qdisc; + + qdisc =rtnl_dereference (dev_queue->qdisc_sleeping);if (!qdisc)nit: no new line between action and error check
Jakub Kicinski
maintainerRe: [PATCH net 7/9] net/mlx5e: Properly access RCU protected qdisc_sleeping variable
Quoted 5 lines · On Thu, 12 Jun 2025 10:31:45 +0300 Mark Bloch wrote:
Quoted 2 lines
I don't think this is a functional change? We don't treat silencing compiler warnings as fixes, not for sparse or W=1 warnings.
Well Eric's commit:
d636fc5dd692c8f4e00ae6e0359c0eceeb5d9bdbthat added this annotation was because of a syzbot report.
And your point is?
Mark Bloch
maintainerRe: [PATCH net 7/9] net/mlx5e: Properly access RCU protected qdisc_sleeping variable
Quoted 8 lines · Jakub Kicinski
Quoted 5 lines · On Thu, 12 Jun 2025 10:31:45 +0300 Mark Bloch wrote:
Quoted 2 lines
I don't think this is a functional change? We don't treat silencing compiler warnings as fixes, not for sparse or W=1 warnings.
Well Eric's commit:
d636fc5dd692c8f4e00ae6e0359c0eceeb5d9bdbthat added this annotation was because of a syzbot report.And your point is?
I just mean there's a reason for using annotations, and being the odd one out feels off. I also wouldn't want anyone to accidentally reference that logic (if they add HTB offloads support).
Will push via net-next.
Mark
Mark Bloch
maintainerPATCH 8/9 net/mlx5e: Fix leak of Geneve TLV option object
In reply to Mark BlochFrom: Jianbo Liu <[email protected]>
Previously, a unique tunnel id was added for the matching on TC non-zero chains, to support inner header rewrite with goto action. Later, it was used to support VF tunnel offload for vxlan, then for Geneve and GRE. To support VF tunnel, a temporary mlx5_flow_spec is used to parse tunnel options. For Geneve, if there is TLV option, a object is created, or refcnt is added if already exists. But the temporary mlx5_flow_spec is directly freed after parsing, which causes the leak because no information regarding the object is saved in flow's mlx5_flow_spec, which is used to free the object when deleting the flow.
To fix the leak, call mlx5_geneve_tlv_option_del() before free the temporary spec if it has TLV object.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +6 -6
@@ -2028,9 +2028,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,return err; } -static bool mlx5_flow_has_geneve_opt (struct mlx5e_tc_flow *flow) +static bool mlx5_flow_has_geneve_opt (struct mlx5_flow_spec *spec) { -struct mlx5_flow_spec *spec = &flow->attr->parse_attr->spec;void *headers_v =MLX5_ADDR_OF (fte_match_param, spec->match_value, misc_parameters_3);
@@ -2069,7 +2068,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv, }complete_all (&flow->del_hw_done); -if (mlx5_flow_has_geneve_opt (flow)) +if (mlx5_flow_has_geneve_opt (&attr->parse_attr->spec))mlx5_geneve_tlv_option_del (priv->mdev->geneve);if (flow->decap_route)
@@ -2574,12 +2573,13 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, err =mlx5e_tc_tun_parse (filter_dev, priv, tmp_spec, f, match_level);if (err) { -kvfree (tmp_spec);NL_SET_ERR_MSG_MOD (extack,"Failed to parse tunnel attributes" );netdev_warn (priv->netdev,"Failed to parse tunnel attributes" ); -return err; + }else { + err =mlx5e_tc_set_attr_rx_tun (flow, tmp_spec); } - err =mlx5e_tc_set_attr_rx_tun (flow, tmp_spec); +if (mlx5_flow_has_geneve_opt (tmp_spec)) +mlx5_geneve_tlv_option_del (priv->mdev->geneve);kvfree (tmp_spec);if (err)return err;
Signature · 1 line
2.34.1
Mark Bloch
maintainerPATCH 9/9 net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper
In reply to Mark BlochFrom: Shahar Shitrit <[email protected]>
When the link is up, either eth_proto_oper or ext_eth_proto_oper typically reports the active link protocol, from which both speed and number of lanes can be retrieved. However, in certain cases, such as when a NIC is connected via a non-standard cable, the firmware may not report the protocol.
In such scenarios, the speed can still be obtained from the data_rate_oper field in PTYS register. Since data_rate_oper provides only speed information and lacks lane details, it is incorrect to derive the number of lanes from it.
This patch corrects the behavior by setting the number of lanes to UNKNOWN instead of incorrectly using MAX_LANES when relying on data_rate_oper.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +1 -4
@@ -43,7 +43,6 @@#include "en/fs_ethtool.h" #define LANES_UNKNOWN 0 -#define MAX_LANES 8void mlx5e_ethtool_get_drvinfo (struct mlx5e_priv *priv,struct ethtool_drvinfo *drvinfo)
@@ -1098,10 +1097,8 @@ static void get_link_properties(struct net_device *netdev, speed = info->speed; lanes = info->lanes; duplex =DUPLEX_FULL ; - }else if (data_rate_oper) { + }else if (data_rate_oper) speed =100 * data_rate_oper; - lanes =MAX_LANES ; - } out: link_ksettings->base.duplex = duplex;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerQuoted 2 lines · On Tue, 10 Jun 2025 18:15:05 +0300 Mark Bloch wrote:
This patchset includes misc fixes from the team for the mlx5 core and Ethernet drivers.
I'll apply the good patches, the one that should go to net-next looks completely unrelated to the rest.
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 10 Jun 2025 18:15:05 +0300 you wrote:
This patchset includes misc fixes from the team for the mlx5 core and Ethernet drivers.
Thanks,
MarkAmir Tzin (1):
net/mlx5: Fix ECVF vports unload on shutdown flow[...]
Here is the summary with links:
- [net,1/9] net/mlx5: Ensure fw pages are always allocated on same NUMA
https://git.kernel.org/netdev/net/c/f37258133c1e - [net,2/9] net/mlx5: Fix ECVF vports unload on shutdown flow https://git.kernel.org/netdev/net/c/687560d8a9a2 - [net,3/9] net/mlx5: Fix return value when searching for existing flow group https://git.kernel.org/netdev/net/c/8ec40e3f1f72 - [net,4/9] net/mlx5: HWS, Init mutex on the correct path https://git.kernel.org/netdev/net/c/a002602676cd - [net,5/9] net/mlx5: HWS, fix missing ip_version handling in definer https://git.kernel.org/netdev/net/c/b5e3c76f35ee - [net,6/9] net/mlx5: HWS, make sure the uplink is the last destination https://git.kernel.org/netdev/net/c/b8335829518e - [net,7/9] net/mlx5e: Properly access RCU protected qdisc_sleeping variable (no matching commit) - [net,8/9] net/mlx5e: Fix leak of Geneve TLV option object https://git.kernel.org/netdev/net/c/aa9c44b84209 - [net,9/9] net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper https://git.kernel.org/netdev/net/c/875d7c160d60
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html