Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b36e9ab5 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: properly delete VF MAC filters 



The virtual channel interface was using incorrect semantics to remove
MAC addresses, which would leave incorrect filters active when using
VLANs. To correct this, add a new function that unconditionally removes
MAC addresses from all VLANs, and call this function when the VF
requests a MAC filter removal.

Change-ID: I69826908ae4f6c847f5bf9b32f11faa760189c74
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 75f5cea9

drivers/net/ethernet/intel/i40e/i40e.h

+2 −0
Original line number Diff line number Diff line
@@ -776,6 +776,8 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid); 
int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid);

struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr,

					     bool is_vf, bool is_netdev);

int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, u8 *macaddr,

			  bool is_vf, bool is_netdev);

bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);

struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr,

				      bool is_vf, bool is_netdev);

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

+36 −0
Original line number Diff line number Diff line
@@ -1258,6 +1258,42 @@ struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi, u8 *macaddr, 
					struct i40e_mac_filter, list);

}



/**

 * i40e_del_mac_all_vlan - Remove a MAC filter from all VLANS

 * @vsi: the VSI to be searched

 * @macaddr: the mac address to be removed

 * @is_vf: true if it is a VF

 * @is_netdev: true if it is a netdev

 *

 * Removes a given MAC address from a VSI, regardless of VLAN

 *

 * Returns 0 for success, or error

 **/

int i40e_del_mac_all_vlan(struct i40e_vsi *vsi, u8 *macaddr,

			  bool is_vf, bool is_netdev)

{

	struct i40e_mac_filter *f = NULL;

	int changed = 0;



	WARN(!spin_is_locked(&vsi->mac_filter_list_lock),

	     "Missing mac_filter_list_lock\n");

	list_for_each_entry(f, &vsi->mac_filter_list, list) {

		if ((ether_addr_equal(macaddr, f->macaddr)) &&

		    (is_vf == f->is_vf) &&

		    (is_netdev == f->is_netdev)) {

			f->counter--;

			f->changed = true;

			changed = 1;

		}

	}

	if (changed) {

		vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;

		vsi->back->flags |= I40E_FLAG_FILTER_SYNC;

		return 0;

	}

	return -ENOENT;

}



/**

 * i40e_rm_default_mac_filter - Remove the default MAC filter set by NVM

 * @vsi: the PF Main VSI - inappropriate for any other VSI

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

+6 −2
Original line number Diff line number Diff line
@@ -1683,8 +1683,12 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) 
	spin_lock_bh(&vsi->mac_filter_list_lock);

	/* delete addresses from the list */

	for (i = 0; i < al->num_elements; i++)

		i40e_del_filter(vsi, al->list[i].addr,

				I40E_VLAN_ANY, true, false);

		if (i40e_del_mac_all_vlan(vsi, al->list[i].addr, true, false)) {

			ret = I40E_ERR_INVALID_MAC_ADDR;

			spin_unlock_bh(&vsi->mac_filter_list_lock);

			goto error_param;

		}



	spin_unlock_bh(&vsi->mac_filter_list_lock);



	/* program the updated filter list */