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

Commit 8ed4b5d7 authored by Stefan Assmann's avatar Stefan Assmann Committed by Greg Kroah-Hartman
Browse files

i40e: improve locking of mac_filter_hash 



[ Upstream commit 8b4b06919fd66caf49fdf4fe59f9d6312cf7956d ]

i40e_config_vf_promiscuous_mode() calls
i40e_getnum_vf_vsi_vlan_filters() without acquiring the
mac_filter_hash_lock spinlock.

This is unsafe because mac_filter_hash may get altered in another thread
while i40e_getnum_vf_vsi_vlan_filters() traverses the hashes.

Simply adding the spinlock in i40e_getnum_vf_vsi_vlan_filters() is not
possible as it already gets called in i40e_get_vlan_list_sync() with the
spinlock held. Therefore adding a wrapper that acquires the spinlock and
call the correct function where appropriate.

Fixes: 37d318d7805f ("i40e: Remove scheduling while atomic possibility")
Fix-suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 30055e02

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

+20 −3
Original line number Diff line number Diff line
@@ -1117,12 +1117,12 @@ static int i40e_quiesce_vf_pci(struct i40e_vf *vf) 
}



/**

 * i40e_getnum_vf_vsi_vlan_filters

 * __i40e_getnum_vf_vsi_vlan_filters

 * @vsi: pointer to the vsi

 *

 * called to get the number of VLANs offloaded on this VF

 **/

static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)

static int __i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)

{

	struct i40e_mac_filter *f;

	int num_vlans = 0, bkt;
@@ -1135,6 +1135,23 @@ static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi) 
	return num_vlans;

}



/**

 * i40e_getnum_vf_vsi_vlan_filters

 * @vsi: pointer to the vsi

 *

 * wrapper for __i40e_getnum_vf_vsi_vlan_filters() with spinlock held

 **/

static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)

{

	int num_vlans;



	spin_lock_bh(&vsi->mac_filter_hash_lock);

	num_vlans = __i40e_getnum_vf_vsi_vlan_filters(vsi);

	spin_unlock_bh(&vsi->mac_filter_hash_lock);



	return num_vlans;

}



/**

 * i40e_get_vlan_list_sync

 * @vsi: pointer to the VSI
@@ -1152,7 +1169,7 @@ static void i40e_get_vlan_list_sync(struct i40e_vsi *vsi, int *num_vlans, 
	int bkt;



	spin_lock_bh(&vsi->mac_filter_hash_lock);

	*num_vlans = i40e_getnum_vf_vsi_vlan_filters(vsi);

	*num_vlans = __i40e_getnum_vf_vsi_vlan_filters(vsi);

	*vlan_list = kcalloc(*num_vlans, sizeof(**vlan_list), GFP_ATOMIC);

	if (!(*vlan_list))

		goto err;