net/mlx4: fix MAC table total count corruption in __mlx4_unregister_mac()
Subsystems (4)
PATCH 1/1 net/mlx4: fix MAC table total count corruption in __mlx4_unregister_mac()
In __mlx4_unregister_mac(), when operating in mf_bonded mode (SR-IOV with bonding), it appears that the code might be incorrectly decrementing table->total instead of dup_table->total when cleaning up the duplicate table entry.
If this is the case, it would cause the primary table's total counter to be decremented twice (once for itself and once when it should decrement the duplicate table), leading to counter corruption. Over time, table->total could become negative, which would break the "table->total == table->max" fullness check in __mlx4_register_mac().
The registration path correctly increments both counters:
++table->total;
if (dup) {
...
++dup_table->total;}
However, the unregistration path seems to have a typo:
--table->total;
if (dup) {
...
--table->total; // Should this be --dup_table->total?--- drivers/net/ethernet/mellanox/mlx4/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/port.c +1 -1
@@ -410,7 +410,7 @@ void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)if (mlx4_set_port_mac_table (dev, dup_port, dup_table->entries))mlx4_warn (dev,"Fail to set mac in duplicate port %d during unregister\n" , dup_port); - --table->total; + --dup_table->total; } out:if (dup) {
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerQuoted 17 lines · On Fri, 23 Jan 2026 02:39:07 +0800 Kery Qi wrote:
In
__mlx4_unregister_mac(), when operating inmf_bondedmode (SR-IOV with bonding), it appears that the code might be incorrectly decrementingtable->totalinstead ofdup_table->totalwhen cleaning up the duplicate table entry.If this is the case, it would cause the primary table's total counter to be decremented twice (once for itself and once when it should decrement the duplicate table), leading to counter corruption. Over time,
table->totalcould become negative, which would break the "table->total==table->max" fullness check in__mlx4_register_mac().The registration path correctly increments both counters:
++table->total;if (dup) { ... ++dup_table->total;
Quoted 7 lines
}
However, the unregistration path seems to have a typo:
--table->total;if (dup) { ... --table->total; // Should this be --dup_table->total?
Looks legit, Tariq? Are you trying to find/dust off an mlx4 card? :)
Quoted 20 lines · Kery Qi
In
__mlx4_unregister_mac(), when operating inmf_bondedmode (SR-IOV with bonding), it appears that the code might be incorrectly decrementingtable->totalinstead ofdup_table->totalwhen cleaning up the duplicate table entry.If this is the case, it would cause the primary table's total counter to be decremented twice (once for itself and once when it should decrement the duplicate table), leading to counter corruption. Over time,
table->totalcould become negative, which would break the "table->total==table->max" fullness check in__mlx4_register_mac().The registration path correctly increments both counters:
++table->total; if (dup) { ... ++dup_table->total; }However, the unregistration path seems to have a typo:
Quoted 8 lines
--table->total; if (dup) { ... --table->total; // Should this be --dup_table->total?Fixes 5f61385d2ebc2 ("net/mlx4_core: Keep VLAN/MAC tables mirrored in multifunc HA mode")Signed-off-by Kery Qi <[email protected]>---
Hi Kery,
1. Commit message is phrased as an RFC, with questions and uncertainty. Please re-phrase.
2. Do you hit an actual failure here? What are the steps? What error do you see?
Other than that, code LGTM.
Quoted 16 lines
drivers/net/ethernet/mellanox/mlx4/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx4/port.c +1
-1@@ -410,7 +410,7 @@ void __mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac)if (mlx4_set_port_mac_table (dev, dup_port, dup_table->entries))mlx4_warn (dev,"Fail to set mac in duplicate port %d during unregister\n" , dup_port); - --table->total; + --dup_table->total; } out:if (dup) {
Jakub Kicinski
maintainerQuoted 4 lines · On Tue, 27 Jan 2026 08:26:49 +0200 Tariq Toukan wrote:
1. Commit message is phrased as an RFC, with questions and uncertainty. Please re-phrase.
2. Do you hit an actual failure here? What are the steps? What error do you see?
Alternatively, perhaps, seeing that Kery is sending patches to random pieces of code - please add a paragraph explaining what kind of tool you used to detect the issue, and stating that you haven't actually hit it. Please note that disclosure that the issue has been found by static analysis tool is _required_ in the kernel process.