Skip to content

Commit

Permalink
i40evf: Fix double locking the same resource
Browse files Browse the repository at this point in the history
Removes the locking of adapter->mac_vlan_list_lock resource in
i40evf_add_filter(). The locking part is moved above i40evf_add_filter().
i40evf_add_filter(), called by i40evf_addr_sync(), was trying to lock the
resource again and double locking generated a kernel panic after bringing
an interface up.

Fixes: 8946b56 ("i40evf: use __dev_[um]c_sync routines in
       .set_rx_mode")
Signed-off-by: Paweł Jabłoński <pawel.jablonski@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Paweł Jabłoński authored and Jeff Kirsher committed Feb 26, 2018
1 parent c3880bd commit 8cd5fe6
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/net/ethernet/intel/i40evf/i40evf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -815,13 +815,11 @@ i40evf_mac_filter *i40evf_add_filter(struct i40evf_adapter *adapter,
if (!macaddr)
return NULL;

spin_lock_bh(&adapter->mac_vlan_list_lock);

f = i40evf_find_filter(adapter, macaddr);
if (!f) {
f = kzalloc(sizeof(*f), GFP_ATOMIC);
if (!f)
goto clearout;
return f;

ether_addr_copy(f->macaddr, macaddr);

Expand All @@ -832,8 +830,6 @@ i40evf_mac_filter *i40evf_add_filter(struct i40evf_adapter *adapter,
f->remove = false;
}

clearout:
spin_unlock_bh(&adapter->mac_vlan_list_lock);
return f;
}

Expand Down Expand Up @@ -868,9 +864,10 @@ static int i40evf_set_mac(struct net_device *netdev, void *p)
adapter->aq_required |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;
}

f = i40evf_add_filter(adapter, addr->sa_data);

spin_unlock_bh(&adapter->mac_vlan_list_lock);

f = i40evf_add_filter(adapter, addr->sa_data);
if (f) {
ether_addr_copy(hw->mac.addr, addr->sa_data);
ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
Expand Down Expand Up @@ -3040,7 +3037,12 @@ static int i40evf_open(struct net_device *netdev)
if (err)
goto err_req_irq;

spin_lock_bh(&adapter->mac_vlan_list_lock);

i40evf_add_filter(adapter, adapter->hw.mac.addr);

spin_unlock_bh(&adapter->mac_vlan_list_lock);

i40evf_configure(adapter);

i40evf_up_complete(adapter);
Expand Down

0 comments on commit 8cd5fe6

Please sign in to comment.