lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 097/300] i40e: improve locking of mac_filter_hash
    Date
    From: Stefan Assmann <sassmann@kpanic.de>

    [ 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: Paolo Abeni <pabeni@redhat.com>
    Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
    Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 ++++++++++++++++---
    1 file changed, 20 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
    index eff0a30790dd..472f56b360b8 100644
    --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
    @@ -1160,12 +1160,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;
    u16 num_vlans = 0, bkt;
    @@ -1178,6 +1178,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
    @@ -1195,7 +1212,7 @@ static void i40e_get_vlan_list_sync(struct i40e_vsi *vsi, u16 *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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 16:05    [W:4.142 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site