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 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>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH wpan-next v4 10/11] net: mac802154: Add a warning in the hot path
Date: Thu, 19 May 2022 17:05:15 +0200 [thread overview]
Message-ID: <20220519150516.443078-11-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220519150516.443078-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.
Set a flag when the queue should remain stopped. Reset this flag when
the queue actually gets restarded. Just check this value to know if a
transmission is legitimate, warn if it is not.
Turn the flags variable into an unsigned long to allow the use of atomic
helpers on it.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
include/net/cfg802154.h | 5 ++++-
net/mac802154/tx.c | 16 +++++++++++++++-
net/mac802154/util.c | 1 +
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index 8881b6126b58..04b996895fc1 100644
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -166,11 +166,14 @@ wpan_phy_cca_cmp(const struct wpan_phy_cca *a, const struct wpan_phy_cca *b)
* level setting.
* @WPAN_PHY_FLAG_CCA_MODE: Indicates that transceiver will support cca mode
* setting.
+ * @WPAN_PHY_FLAG_STATE_QUEUE_STOPPED: Indicates that the transmit queue was
+ * temporarily stopped.
*/
enum wpan_phy_flags {
WPAN_PHY_FLAG_TXPOWER = BIT(1),
WPAN_PHY_FLAG_CCA_ED_LEVEL = BIT(2),
WPAN_PHY_FLAG_CCA_MODE = BIT(3),
+ WPAN_PHY_FLAG_STATE_QUEUE_STOPPED = BIT(4),
};
struct wpan_phy {
@@ -182,7 +185,7 @@ struct wpan_phy {
*/
const void *privid;
- u32 flags;
+ unsigned long flags;
/*
* This is a PIB according to 802.15.4-2011.
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 4827391600f6..6188f42276e7 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -123,9 +123,13 @@ static int ieee802154_sync_queue(struct ieee802154_local *local)
int ieee802154_sync_and_hold_queue(struct ieee802154_local *local)
{
+ int ret;
+
ieee802154_hold_queue(local);
+ ret = ieee802154_sync_queue(local);
+ set_bit(WPAN_PHY_FLAG_STATE_QUEUE_STOPPED, &local->phy->flags);
- return ieee802154_sync_queue(local);
+ return ret;
}
int ieee802154_mlme_op_pre(struct ieee802154_local *local)
@@ -172,9 +176,19 @@ int ieee802154_mlme_tx_one(struct ieee802154_local *local, struct sk_buff *skb)
return ret;
}
+static bool ieee802154_queue_is_stopped(struct ieee802154_local *local)
+{
+ return test_bit(WPAN_PHY_FLAG_STATE_QUEUE_STOPPED, &local->phy->flags);
+}
+
static netdev_tx_t
ieee802154_hot_tx(struct ieee802154_local *local, struct sk_buff *skb)
{
+ /* Warn if the net interface tries to transmit frames while the
+ * ieee802154 core assumes the queue is stopped.
+ */
+ 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 5e1fcc7b0123..60eb7bd3bfc1 100644
--- a/net/mac802154/util.c
+++ b/net/mac802154/util.c
@@ -29,6 +29,7 @@ static void ieee802154_wake_queue(struct ieee802154_hw *hw)
struct ieee802154_sub_if_data *sdata;
rcu_read_lock();
+ clear_bit(WPAN_PHY_FLAG_STATE_QUEUE_STOPPED, &local->phy->flags);
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (!sdata->dev)
continue;
--
2.34.1
next prev parent reply other threads:[~2022-05-19 15:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 15:05 [PATCH wpan-next v4 00/11] ieee802154: Synchronous Tx support Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 01/11] net: mac802154: Rename the synchronous xmit worker Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 02/11] net: mac802154: Rename the main tx_work struct Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 03/11] net: mac802154: Enhance the error path in the main tx helper Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 04/11] net: mac802154: Follow the count of ongoing transmissions Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 05/11] net: mac802154: Bring the ability to hold the transmit queue Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 06/11] net: mac802154: Create a hot tx path Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 07/11] net: mac802154: Introduce a helper to disable the queue Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 08/11] net: mac802154: Introduce a tx queue flushing mechanism Miquel Raynal
2022-05-19 15:05 ` [PATCH wpan-next v4 09/11] net: mac802154: Introduce a synchronous API for MLME commands Miquel Raynal
2022-05-19 15:05 ` Miquel Raynal [this message]
2022-05-19 15:05 ` [PATCH wpan-next v4 11/11] net: mac802154: Add a warning in the slow path Miquel Raynal
2022-06-01 3:30 ` [PATCH wpan-next v4 00/11] ieee802154: Synchronous Tx support Alexander Aring
2022-06-01 6:12 ` Miquel Raynal
2022-06-01 21:01 ` Stefan Schmidt
2022-06-03 17:55 ` Miquel Raynal
2022-06-04 1:50 ` Alexander Aring
2022-06-06 17:03 ` Miquel Raynal
2022-06-17 14:20 ` 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=20220519150516.443078-11-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=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).