korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 20:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

sfc: Ensure down_write(&filter_sem) and up_write() are matched before calling efx_net_open()

Browse Source 
This patch avoids the double up_write to filter_sem if
efx_net_open() fails.

Resolves: 2d432f20d2

Signed-off-by: Shradha Shah <sshah@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shradha Shah 2015-07-08 10:12:45 +01:00 committed by David S. Miller
parent f1158b74e5
commit 671b53eec2
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/sfc/ef10_sriov.c
View File

@ -598,21 +598,21 @@ int efx_ef10_sriov_set_vf_vlan(struct efx_nic *efx, int vf_i, u16 vlan,
MC_CMD_VPORT_ALLOC_IN_VPORT_TYPE_NORMAL, MC_CMD_VPORT_ALLOC_IN_VPORT_TYPE_NORMAL,
vf->vlan, &vf->vport_id); vf->vlan, &vf->vport_id);
if (rc) if (rc)
goto reset_nic; goto reset_nic_up_write;
restore_mac: restore_mac:
if (!is_zero_ether_addr(vf->mac)) { if (!is_zero_ether_addr(vf->mac)) {
rc2 = efx_ef10_vport_add_mac(efx, vf->vport_id, vf->mac); rc2 = efx_ef10_vport_add_mac(efx, vf->vport_id, vf->mac);
if (rc2) { if (rc2) {
eth_zero_addr(vf->mac); eth_zero_addr(vf->mac);
goto reset_nic; goto reset_nic_up_write;
} }
} }
restore_evb_port: restore_evb_port:
rc2 = efx_ef10_evb_port_assign(efx, vf->vport_id, vf_i); rc2 = efx_ef10_evb_port_assign(efx, vf->vport_id, vf_i);
if (rc2) if (rc2)
goto reset_nic; goto reset_nic_up_write;
else else
vf->vport_assigned = 1; vf->vport_assigned = 1;
@ -620,14 +620,16 @@ restore_vadaptor:
if (vf->efx) { if (vf->efx) {
rc2 = efx_ef10_vadaptor_alloc(vf->efx, EVB_PORT_ID_ASSIGNED); rc2 = efx_ef10_vadaptor_alloc(vf->efx, EVB_PORT_ID_ASSIGNED);
if (rc2) if (rc2)
goto reset_nic; goto reset_nic_up_write;
} }
restore_filters: restore_filters:
if (vf->efx) { if (vf->efx) {
rc2 = vf->efx->type->filter_table_probe(vf->efx); rc2 = vf->efx->type->filter_table_probe(vf->efx);
if (rc2) if (rc2)
goto reset_nic; goto reset_nic_up_write;
up_write(&vf->efx->filter_sem);
up_write(&vf->efx->filter_sem); up_write(&vf->efx->filter_sem);
@ -639,9 +641,12 @@ restore_filters:
} }
return rc; return rc;
reset_nic_up_write:
if (vf->efx)
up_write(&vf->efx->filter_sem);
reset_nic: reset_nic:
if (vf->efx) { if (vf->efx) {
up_write(&vf->efx->filter_sem);
netif_err(efx, drv, efx->net_dev, netif_err(efx, drv, efx->net_dev,
"Failed to restore VF - scheduling reset.\n"); "Failed to restore VF - scheduling reset.\n");
efx_schedule_reset(vf->efx, RESET_TYPE_DATAPATH); efx_schedule_reset(vf->efx, RESET_TYPE_DATAPATH);