Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 703c4d8

Browse files
aloktiongregkh
authored andcommitted
i40e: Fix macvlan leak by synchronizing access to mac_filter_hash
[ Upstream commit dac6c7b ] This patch addresses a macvlan leak issue in the i40e driver caused by concurrent access to vsi->mac_filter_hash. The leak occurs when multiple threads attempt to modify the mac_filter_hash simultaneously, leading to inconsistent state and potential memory leaks. To fix this, we now wrap the calls to i40e_del_mac_filter() and zeroing vf->default_lan_addr.addr with spin_lock/unlock_bh(&vsi->mac_filter_hash_lock), ensuring atomic operations and preventing concurrent access. Additionally, we add lockdep_assert_held(&vsi->mac_filter_hash_lock) in i40e_add_mac_filter() to help catch similar issues in the future. Reproduction steps: 1. Spawn VFs and configure port vlan on them. 2. Trigger concurrent macvlan operations (e.g., adding and deleting portvlan and/or mac filters). 3. Observe the potential memory leak and inconsistent state in the mac_filter_hash. This synchronization ensures the integrity of the mac_filter_hash and prevents the described leak. Fixes: fed0d9f ("i40e: Fix VF's MAC Address change on VM") Reviewed-by: Arkadiusz Kubalewski <[email protected]> Signed-off-by: Aleksandr Loktionov <[email protected]> Reviewed-by: Simon Horman <[email protected]> Tested-by: Rafal Romanowski <[email protected]> Signed-off-by: Tony Nguyen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 29d7aa1 commit 703c4d8

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

drivers/net/ethernet/intel/i40e/i40e_main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,6 +1744,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi,
17441744
struct hlist_node *h;
17451745
int bkt;
17461746

1747+
lockdep_assert_held(&vsi->mac_filter_hash_lock);
17471748
if (vsi->info.pvid)
17481749
return i40e_add_filter(vsi, macaddr,
17491750
le16_to_cpu(vsi->info.pvid));

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2219,8 +2219,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
22192219
vfres->vsi_res[0].qset_handle
22202220
= le16_to_cpu(vsi->info.qs_handle[0]);
22212221
if (!(vf->driver_caps & VIRTCHNL_VF_OFFLOAD_USO) && !vf->pf_set_mac) {
2222+
spin_lock_bh(&vsi->mac_filter_hash_lock);
22222223
i40e_del_mac_filter(vsi, vf->default_lan_addr.addr);
22232224
eth_zero_addr(vf->default_lan_addr.addr);
2225+
spin_unlock_bh(&vsi->mac_filter_hash_lock);
22242226
}
22252227
ether_addr_copy(vfres->vsi_res[0].default_mac_addr,
22262228
vf->default_lan_addr.addr);

0 commit comments

Comments
 (0)