From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Alexander Aring <alex.aring@gmail.com>,
Stefan Schmidt <stefan@datenfreihafen.org>,
linux-wpan@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>,
netdev@vger.kernel.org, David Girault <david.girault@qorvo.com>,
Romuald Despres <romuald.despres@qorvo.com>,
Frederic Blain <frederic.blain@qorvo.com>,
Nicolas Schodet <nico@ni.fr.eu.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH wpan-next 09/20] net: mac802154: Introduce a global device lock
Date: Fri, 1 Jul 2022 16:30:41 +0200 [thread overview]
Message-ID: <20220701143052.1267509-10-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220701143052.1267509-1-miquel.raynal@bootlin.com>
The purpose of this device lock is to prevent the removal of the device
while an asynchronous MLME operation happens. The RTNL works well for
that but in a later series having the RTNL taken here will be
problematic and will cause lockdep to warn us about a circular
dependency. We don't really need the RTNL here, just a serialization
over this operation.
Replace the RTNL calls with this new lock.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
net/mac802154/ieee802154_i.h | 2 ++
net/mac802154/iface.c | 4 ++++
net/mac802154/main.c | 1 +
net/mac802154/tx.c | 12 ++++++------
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 010365a6364e..b8775bcc9003 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -29,7 +29,9 @@ struct ieee802154_local {
/* ieee802154 phy */
struct wpan_phy *phy;
+ /* Open/close counter and lock */
int open_count;
+ struct mutex device_lock;
/* As in mac80211 slaves list is modified:
* 1) under the RTNL
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 7ac0c5685d3f..7715e17d9ba1 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -315,11 +315,15 @@ static int mac802154_slave_close(struct net_device *dev)
ASSERT_RTNL();
+ mutex_lock(&local->device_lock);
+
netif_stop_queue(dev);
local->open_count--;
clear_bit(SDATA_STATE_RUNNING, &sdata->state);
+ mutex_unlock(&local->device_lock);
+
if (!local->open_count)
ieee802154_stop_device(local);
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index a2da9d4c5273..e5fb7ed73663 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -90,6 +90,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
INIT_LIST_HEAD(&local->interfaces);
mutex_init(&local->iflist_mtx);
+ mutex_init(&local->device_lock);
tasklet_setup(&local->tasklet, ieee802154_tasklet_handler);
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 9d8d43cf1e64..fb555797f326 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -143,14 +143,14 @@ int ieee802154_mlme_tx(struct ieee802154_local *local,
{
int ret;
- /* Avoid possible calls to ->ndo_stop() when we asynchronously perform
- * MLME transmissions.
+ /* Serialize possible calls to ->ndo_stop() when we asynchronously
+ * perform MLME transmissions.
*/
- rtnl_lock();
+ mutex_lock(&local->device_lock);
/* Ensure the device was not stopped, otherwise error out */
if (!local->open_count) {
- rtnl_unlock();
+ mutex_unlock(&local->device_lock);
return -ENETDOWN;
}
@@ -158,14 +158,14 @@ int ieee802154_mlme_tx(struct ieee802154_local *local,
* net interface expects this cannot happen.
*/
if (WARN_ON_ONCE(!netif_running(sdata->dev))) {
- rtnl_unlock();
+ mutex_unlock(&local->device_lock);
return -ENETDOWN;
}
ieee802154_tx(local, skb);
ret = ieee802154_sync_queue(local);
- rtnl_unlock();
+ mutex_unlock(&local->device_lock);
return ret;
}
--
2.34.1
next prev parent reply other threads:[~2022-07-01 14:36 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 14:30 [PATCH wpan-next 00/20] net: ieee802154: Support scanning/beaconing Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 01/20] net: mac802154: Allow the creation of coordinator interfaces Miquel Raynal
2022-07-06 1:51 ` Alexander Aring
2022-08-19 17:11 ` Miquel Raynal
2022-08-23 12:33 ` Alexander Aring
2022-08-23 16:29 ` Miquel Raynal
2022-08-23 21:44 ` Alexander Aring
2022-08-24 7:35 ` Miquel Raynal
2022-08-24 21:43 ` Alexander Aring
2022-08-25 8:40 ` Miquel Raynal
2022-08-26 0:51 ` Alexander Aring
2022-08-26 1:35 ` Alexander Aring
2022-08-26 8:08 ` Miquel Raynal
2022-08-29 2:31 ` Alexander Aring
2022-08-29 8:05 ` Miquel Raynal
2022-08-26 7:30 ` Miquel Raynal
2022-08-24 10:20 ` Miquel Raynal
2022-08-24 12:43 ` Alexander Aring
2022-08-24 13:26 ` Miquel Raynal
2022-08-24 21:53 ` Alexander Aring
2022-08-25 1:02 ` Alexander Aring
2022-08-25 8:46 ` Miquel Raynal
2022-08-25 12:58 ` Miquel Raynal
2022-08-26 1:05 ` Alexander Aring
2022-08-26 7:54 ` Miquel Raynal
2022-08-29 2:52 ` Alexander Aring
2022-08-29 8:02 ` Miquel Raynal
2022-08-30 2:23 ` Alexander Aring
2022-08-31 15:39 ` Miquel Raynal
2022-09-01 0:09 ` Miquel Raynal
2022-09-01 13:09 ` Miquel Raynal
2022-09-02 2:38 ` Alexander Aring
2022-09-03 0:08 ` Miquel Raynal
2022-09-03 14:20 ` Alexander Aring
2022-09-03 14:31 ` Alexander Aring
2022-09-03 16:05 ` Miquel Raynal
2022-09-03 18:21 ` Alexander Aring
2022-09-03 18:29 ` Alexander Aring
2022-09-03 19:07 ` Alexander Aring
2022-09-03 19:10 ` Alexander Aring
2022-09-03 19:40 ` Alexander Aring
2022-09-05 3:16 ` Miquel Raynal
2022-09-05 22:35 ` Alexander Aring
2022-09-02 2:23 ` Alexander Aring
2022-09-02 2:39 ` Alexander Aring
2022-09-02 2:09 ` Alexander Aring
2022-07-01 14:30 ` [PATCH wpan-next 02/20] net: ieee802154: Advertize coordinators discovery Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 03/20] net: ieee802154: Handle " Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 04/20] net: ieee802154: Trace the registration of new PANs Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 05/20] net: ieee802154: Define frame types Miquel Raynal
2022-07-11 2:06 ` Alexander Aring
2022-08-19 17:13 ` Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 06/20] net: ieee802154: Add support for user scanning requests Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 07/20] net: ieee802154: Define a beacon frame header Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 08/20] net: mac802154: Prepare forcing specific symbol duration Miquel Raynal
2022-07-01 14:30 ` Miquel Raynal [this message]
2022-07-04 1:12 ` [PATCH wpan-next 09/20] net: mac802154: Introduce a global device lock Alexander Aring
2022-08-19 17:06 ` Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 10/20] net: mac802154: Handle passive scanning Miquel Raynal
2022-07-15 3:33 ` Alexander Aring
2022-07-15 3:42 ` Alexander Aring
2022-08-19 17:22 ` Miquel Raynal
2022-08-01 23:42 ` Alexander Aring
2022-08-01 23:54 ` Alexander Aring
2022-07-01 14:30 ` [PATCH wpan-next 11/20] net: ieee802154: Add support for user beaconing requests Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 12/20] net: mac802154: Handle basic beaconing Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 13/20] net: ieee802154: Add support for user active scan requests Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 14/20] net: mac802154: Handle active scanning Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 15/20] net: ieee802154: Add support for allowing to answer BEACON_REQ Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 16/20] net: mac802154: Handle received BEACON_REQ Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 17/20] net: ieee802154: Handle limited devices with only datagram support Miquel Raynal
2022-07-15 3:16 ` Alexander Aring
2022-08-19 17:13 ` Miquel Raynal
2022-08-23 12:43 ` Alexander Aring
2022-07-01 14:30 ` [PATCH wpan-next 18/20] ieee802154: ca8210: Flag the driver as being limited Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 19/20] ieee802154: hwsim: Do not check the rtnl Miquel Raynal
2022-07-06 1:23 ` Alexander Aring
2022-08-01 23:58 ` Alexander Aring
2022-08-19 17:09 ` Miquel Raynal
2022-08-25 22:41 ` Miquel Raynal
2022-07-01 14:30 ` [PATCH wpan-next 20/20] ieee802154: hwsim: Allow devices to be coordinators Miquel Raynal
2022-07-11 2:01 ` Alexander Aring
2022-08-19 17:12 ` Miquel Raynal
2022-07-04 1:17 ` [PATCH wpan-next 00/20] net: ieee802154: Support scanning/beaconing Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220701143052.1267509-10-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=alex.aring@gmail.com \
--cc=davem@davemloft.net \
--cc=david.girault@qorvo.com \
--cc=edumazet@google.com \
--cc=frederic.blain@qorvo.com \
--cc=kuba@kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nico@ni.fr.eu.org \
--cc=pabeni@redhat.com \
--cc=romuald.despres@qorvo.com \
--cc=stefan@datenfreihafen.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).