From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-cys01nam02on0106.outbound.protection.outlook.com ([104.47.37.106]:1992 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756701AbeDIAgP (ORCPT ); Sun, 8 Apr 2018 20:36:15 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Edward Cree , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 058/162] sfc: remove duplicate up_write on VF filter_sem Date: Mon, 9 Apr 2018 00:28:24 +0000 Message-ID: <20180409002738.163941-58-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Edward Cree [ Upstream commit 57f0c9cf58ff7fe479137ab847a886d0eed3ad1d ] Somehow two copies of the line 'up_write(&vf->efx->filter_sem);' got into efx_ef10_sriov_set_vf_vlan(). This would put the mutex in a bad state and cause all subsequent down attempts to hang. Fixes: 671b53eec2ed ("sfc: Ensure down_write(&filter_sem) and up_write() ar= e matched before calling efx_net_open()") Signed-off-by: Edward Cree Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/sfc/ef10_sriov.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/s= fc/ef10_sriov.c index 3c17f274e802..a0226b11eab2 100644 --- a/drivers/net/ethernet/sfc/ef10_sriov.c +++ b/drivers/net/ethernet/sfc/ef10_sriov.c @@ -631,8 +631,6 @@ restore_filters: =20 up_write(&vf->efx->filter_sem); =20 - up_write(&vf->efx->filter_sem); - rc2 =3D efx_net_open(vf->efx->net_dev); if (rc2) goto reset_nic; --=20 2.15.1