Skip to content

Commit 1f28929

Browse files
superjamieopsiff
authored andcommitted
i40e: When removing VF MAC filters, only check PF-set MAC
[ Upstream commit 5a0df02999dbe838c3feed54b1d59e9445f68b89 ] When the PF is processing an Admin Queue message to delete a VF's MACs from the MAC filter, we currently check if the PF set the MAC and if the VF is trusted. This results in undesirable behaviour, where if a trusted VF with a PF-set MAC sets itself down (which sends an AQ message to delete the VF's MAC filters) then the VF MAC is erased from the interface. This results in the VF losing its PF-set MAC which should not happen. There is no need to check for trust at all, because an untrusted VF cannot change its own MAC. The only check needed is whether the PF set the MAC. If the PF set the MAC, then don't erase the MAC on link-down. Resolve this by changing the deletion check only for PF-set MAC. (the out-of-tree driver has also intentionally removed the check for VF trust here with OOT driver version 2.26.8, this changes the Linux kernel driver behaviour and comment to match the OOT driver behaviour) Fixes: ea2a1cf ("i40e: Fix VF MAC filter removal") Signed-off-by: Jamie Bainbridge <[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]> (cherry picked from commit d989748e9dbb870031ff6a019205cc0e551b343c)
1 parent f87de83 commit 1f28929

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3143,10 +3143,10 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg)
31433143
const u8 *addr = al->list[i].addr;
31443144

31453145
/* Allow to delete VF primary MAC only if it was not set
3146-
* administratively by PF or if VF is trusted.
3146+
* administratively by PF.
31473147
*/
31483148
if (ether_addr_equal(addr, vf->default_lan_addr.addr)) {
3149-
if (i40e_can_vf_change_mac(vf))
3149+
if (!vf->pf_set_mac)
31503150
was_unimac_deleted = true;
31513151
else
31523152
continue;

0 commit comments

Comments
 (0)