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

Commit 148141bb authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: avoid O(n^2) loop when deleting all filters 



Use __i40e_del_filter instead of using i40e_del_filter() which will
avoid doing an additional search to delete a filter we already have the
pointer for.

Change-ID: Iea5a7e3cafbf8c682ed9d3b6c69cf5ff53f44daf
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent feffdbe4

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

+1 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features); 
void i40e_set_ethtool_ops(struct net_device *netdev);

struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,

					const u8 *macaddr, s16 vlan);

void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f);

void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan);

int i40e_sync_vsi_filters(struct i40e_vsi *vsi);

struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,

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

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi, 
 * the "safe" variants of any list iterators, e.g. list_for_each_entry_safe()

 * instead of list_for_each_entry().

 **/

static void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)

void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)

{

	if (!f)

		return;

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

+1 −1
Original line number Diff line number Diff line
@@ -2725,7 +2725,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 
	 * anyway.

	 */

	hash_for_each(vsi->mac_filter_hash, bkt, f, hlist)

		i40e_del_filter(vsi, f->macaddr, f->vlan);

		__i40e_del_filter(vsi, f);



	spin_unlock_bh(&vsi->mac_filter_hash_lock);