netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	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 08/11] net: mac802154: Add a warning in the hot path
Date: Wed, 27 Apr 2022 18:46:56 +0200	[thread overview]
Message-ID: <20220427164659.106447-9-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220427164659.106447-1-miquel.raynal@bootlin.com>

We should never start a transmission after the queue has been stopped.

But because it might work we don't kill the function here but rather
warn loudly the user that something is wrong.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 net/mac802154/ieee802154_i.h |  8 ++++++++
 net/mac802154/tx.c           |  2 ++
 net/mac802154/util.c         | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index b55fdefb0b34..cb61a4abaf37 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -178,6 +178,14 @@ bool ieee802154_queue_is_held(struct ieee802154_local *local);
  */
 void ieee802154_stop_queue(struct ieee802154_local *local);
 
+/**
+ * ieee802154_queue_is_stopped - check whether ieee802154 queue was stopped
+ * @local: main mac object
+ *
+ * Goes through all the interfaces and indicates if they are all stopped or not.
+ */
+bool ieee802154_queue_is_stopped(struct ieee802154_local *local);
+
 /* MIB callbacks */
 void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan);
 
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index a8a83f0167bf..021dddfea542 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -124,6 +124,8 @@ bool ieee802154_queue_is_held(struct ieee802154_local *local)
 static netdev_tx_t
 ieee802154_hot_tx(struct ieee802154_local *local, struct sk_buff *skb)
 {
+	WARN_ON_ONCE(ieee802154_queue_is_stopped(local));
+
 	return ieee802154_tx(local, skb);
 }
 
diff --git a/net/mac802154/util.c b/net/mac802154/util.c
index 847e0864b575..cfd17a7db532 100644
--- a/net/mac802154/util.c
+++ b/net/mac802154/util.c
@@ -44,6 +44,24 @@ void ieee802154_stop_queue(struct ieee802154_local *local)
 	rcu_read_unlock();
 }
 
+bool ieee802154_queue_is_stopped(struct ieee802154_local *local)
+{
+	struct ieee802154_sub_if_data *sdata;
+	bool stopped = true;
+
+	rcu_read_lock();
+	list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+		if (!sdata->dev)
+			continue;
+
+		if (!netif_queue_stopped(sdata->dev))
+			stopped = false;
+	}
+	rcu_read_unlock();
+
+	return stopped;
+}
+
 enum hrtimer_restart ieee802154_xmit_ifs_timer(struct hrtimer *timer)
 {
 	struct ieee802154_local *local =
-- 
2.27.0


  parent reply	other threads:[~2022-04-27 16:47 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-27 16:46 [PATCH wpan-next 00/11] ieee802154: Synchronous Tx support Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 01/11] net: mac802154: Stop exporting ieee802154_wake/stop_queue() Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 02/11] net: mac802154: Change the wake/stop queue prototypes Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 03/11] net: mac802154: Rename the synchronous xmit worker Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 04/11] net: mac802154: Rename the main tx_work struct Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 05/11] net: mac802154: Follow the count of ongoing transmissions Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 06/11] net: mac802154: Hold the transmit queue when relevant Miquel Raynal
2022-05-04  0:51   ` Alexander Aring
2022-05-10 14:52     ` Miquel Raynal
2022-05-11 13:09       ` Alexander Aring
2022-05-12 14:33         ` Miquel Raynal
2022-05-12 14:44           ` Alexander Aring
2022-05-17  9:13             ` Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 07/11] net: mac802154: Create a hot tx path Miquel Raynal
2022-04-27 16:46 ` Miquel Raynal [this message]
2022-04-27 18:01   ` [PATCH wpan-next 08/11] net: mac802154: Add a warning in the hot path Alexander Aring
2022-04-28  7:58     ` Miquel Raynal
2022-05-02  0:21       ` Alexander Aring
2022-05-12 14:33         ` Miquel Raynal
2022-05-13 14:26           ` Alexander Aring
2022-04-27 16:46 ` [PATCH wpan-next 09/11] net: mac802154: Introduce a helper to disable the queue Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 10/11] net: mac802154: Introduce a tx queue flushing mechanism Miquel Raynal
2022-05-04  0:40   ` Alexander Aring
2022-05-10  8:57     ` Miquel Raynal
2022-04-27 16:46 ` [PATCH wpan-next 11/11] net: mac802154: Introduce a synchronous API for MLME commands Miquel Raynal

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=20220427164659.106447-9-miquel.raynal@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=alex.aring@gmail.com \
    --cc=davem@davemloft.net \
    --cc=david.girault@qorvo.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=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).