Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (esa1.microchip.iphmx.com: domain of
  Ajay.Kathat@microchip.com designates 198.175.253.82 as
  permitted sender) identity=mailfrom;
  client-ip=198.175.253.82; receiver=esa1.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="Ajay.Kathat@microchip.com"; x-conformance=spf_only;
  x-record-type="v=spf1"; x-record-text="v=spf1 mx
  a:ushub1.microchip.com a:smtpout.microchip.com
  -exists:%{i}.spf.microchip.iphmx.com include:servers.mcsv.net
  include:mktomail.com include:spf.protection.outlook.com ~all"
Received-SPF: None (esa1.microchip.iphmx.com: no sender
  authenticity information available from domain of
  postmaster@email.microchip.com) identity=helo;
  client-ip=198.175.253.82; receiver=esa1.microchip.iphmx.com;
  envelope-from="Ajay.Kathat@microchip.com";
  x-sender="postmaster@email.microchip.com";
  x-conformance=spf_only
IronPort-SDR: GEjeQyLv10kbOJhMJvHG5SN0qTZObvQBVdfiG0bKaEQhozMTXUjbgCoFK2kJJQFuRQGaL4xzg4
 k10YgOUESkSmG+SqNo9SpinzfqCjFNJvoT9HYdIi0YGfPNuhlbL4zCQJ1K8fLQFpLRpDutQ30a
 MONeYgQPfl+y1vGeRGe5ZVXoHazGbPKWV0fsgfoxaNFSWMq9PzFQgxsXhZZBWbxJzzL1y2WxBB
 LiSQ3uUqpYWg6nrRea/zHywPSHNwxttL8oXJUWxRMfzi9AyRBTFxUT+Fdkj1/Dn3SZX2sGIxzS
 Nb4=
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <devel@driverdev.osuosl.org>, <gregkh@linuxfoundation.org>,
        <Adham.Abozaeid@microchip.com>, <johannes@sipsolutions.net>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH 2/2] staging: wilc1000: avoid mutex unlock without lock in
 wilc_wlan_handle_txq()
Thread-Topic: [PATCH 2/2] staging: wilc1000: avoid mutex unlock without lock
 in wilc_wlan_handle_txq()
Thread-Index: AQHV0eu8iPwrjsHTqkWp6RV25i6i3g==
Date:   Thu, 23 Jan 2020 12:50:49 +0000
Message-ID: <20200123182129.4053-2-ajay.kathat@microchip.com>
References: <20200123182129.4053-1-ajay.kathat@microchip.com>
In-Reply-To: <20200123182129.4053-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microchip.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 7b30548d-d98a-46bf-72ef-08d7a002df62
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2020 12:50:49.2175
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 1hlDGt/IZ9JgLUnxwE/+fRUwoRm9hXPDyF+NtbUYx1PKV55l6DP+kgtn/o6QW7uFWV9YCKoyFCR0zmFPe9R2d/fjNUlEBAYoWS5Z9I+E6W8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1507
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

In wilc_wlan_handle_txq(), mutex unlock was called without acquiring
it. Also error code for full VMM condition was incorrect as discussed in
[1]. Now used a proper code to indicate VMM is full, for which transfer
to VMM is required again. 'wilc_wlan_handle_txq()' should be called
again if the VMM space was full earlier or otherwise based on
'txq_event' signal.

1. https://lore.kernel.org/driverdev-devel/20191113183322.a54mh2w6dulklgsd@=
kili.mountain/

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 drivers/staging/wilc1000/netdev.c |  2 +-
 drivers/staging/wilc1000/wlan.c   | 15 ++++++++++-----
 drivers/staging/wilc1000/wlan.h   |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/netdev.c b/drivers/staging/wilc1000/n=
etdev.c
index 0f48e74aa3ea..fce5bf2d82fa 100644
--- a/drivers/staging/wilc1000/netdev.c
+++ b/drivers/staging/wilc1000/netdev.c
@@ -174,7 +174,7 @@ static int wilc_txq_task(void *vp)
 				}
 				srcu_read_unlock(&wl->srcu, srcu_idx);
 			}
-		} while (ret =3D=3D -ENOBUFS && !wl->close);
+		} while (ret =3D=3D WILC_VMM_ENTRY_FULL_RETRY && !wl->close);
 	}
 	return 0;
 }
diff --git a/drivers/staging/wilc1000/wlan.c b/drivers/staging/wilc1000/wla=
n.c
index b904eda42806..601e4d1345d2 100644
--- a/drivers/staging/wilc1000/wlan.c
+++ b/drivers/staging/wilc1000/wlan.c
@@ -489,12 +489,12 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_=
count)
 	struct wilc_vif *vif;
=20
 	if (wilc->quit)
-		goto out;
+		goto out_update_cnt;
=20
 	mutex_lock(&wilc->txq_add_to_head_cs);
 	tqe =3D wilc_wlan_txq_get_first(wilc);
 	if (!tqe)
-		goto out;
+		goto out_unlock;
 	dev =3D tqe->vif->ndev;
 	wilc_wlan_txq_filter_dup_tcp_ack(dev);
 	i =3D 0;
@@ -526,7 +526,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_co=
unt)
 	}
=20
 	if (i =3D=3D 0)
-		goto out;
+		goto out_unlock;
 	vmm_table[i] =3D 0x0;
=20
 	acquire_bus(wilc, WILC_BUS_ACQUIRE_AND_WAKEUP);
@@ -595,7 +595,11 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_c=
ount)
 		goto out_release_bus;
=20
 	if (entries =3D=3D 0) {
-		ret =3D -ENOBUFS;
+		/*
+		 * No VMM space available in firmware so retry to transmit
+		 * the packet from tx queue.
+		 */
+		ret =3D WILC_VMM_ENTRY_FULL_RETRY;
 		goto out_release_bus;
 	}
=20
@@ -662,9 +666,10 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_c=
ount)
 out_release_bus:
 	release_bus(wilc, WILC_BUS_RELEASE_ALLOW_SLEEP);
=20
-out:
+out_unlock:
 	mutex_unlock(&wilc->txq_add_to_head_cs);
=20
+out_update_cnt:
 	*txq_count =3D wilc->txq_entries;
 	return ret;
 }
diff --git a/drivers/staging/wilc1000/wlan.h b/drivers/staging/wilc1000/wla=
n.h
index 44ae6ed6882c..8c4634262adb 100644
--- a/drivers/staging/wilc1000/wlan.h
+++ b/drivers/staging/wilc1000/wlan.h
@@ -198,6 +198,7 @@
 #define IS_MGMT_STATUS_SUCCES	0x040
=20
 #define WILC_WID_TYPE		GENMASK(15, 12)
+#define WILC_VMM_ENTRY_FULL_RETRY	1
 /********************************************
  *
  *      Tx/Rx Queue Structure
--=20
2.24.0