| Message ID | 20220427164659.106447-11-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ieee802154: Synchronous Tx support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
Hi, On Wed, Apr 27, 2022 at 12:55 PM Miquel Raynal <miquel.raynal@bootlin.com> wrote: > > Right now we are able to stop a queue but we have no indication if a > transmission is ongoing or not. > > Thanks to recent additions, we can track the number of ongoing > transmissions so we know if the last transmission is over. Adding on top > of it an internal wait queue also allows to be woken up asynchronously > when this happens. If, beforehands, we marked the queue to be held and > stopped it, we end up flushing and stopping the tx queue. > > Thanks to this feature, we will soon be able to introduce a synchronous > transmit API. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > include/net/cfg802154.h | 1 + > net/ieee802154/core.c | 1 + > net/mac802154/cfg.c | 3 +-- > net/mac802154/ieee802154_i.h | 1 + > net/mac802154/tx.c | 24 +++++++++++++++++++++++- > net/mac802154/util.c | 7 +++++-- > 6 files changed, 32 insertions(+), 5 deletions(-) > > diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h > index 043d8e4359e7..0d385a214da3 100644 > --- a/include/net/cfg802154.h > +++ b/include/net/cfg802154.h > @@ -217,6 +217,7 @@ struct wpan_phy { > /* Transmission monitoring and control */ > atomic_t ongoing_txs; > atomic_t hold_txs; > + wait_queue_head_t sync_txq; > > char priv[] __aligned(NETDEV_ALIGN); > }; > diff --git a/net/ieee802154/core.c b/net/ieee802154/core.c > index de259b5170ab..0953cacafbff 100644 > --- a/net/ieee802154/core.c > +++ b/net/ieee802154/core.c > @@ -129,6 +129,7 @@ wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size) > wpan_phy_net_set(&rdev->wpan_phy, &init_net); > > init_waitqueue_head(&rdev->dev_wait); > + init_waitqueue_head(&rdev->wpan_phy.sync_txq); > > return &rdev->wpan_phy; > } > diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c > index 0540a2b014d2..c17e38bef425 100644 > --- a/net/mac802154/cfg.c > +++ b/net/mac802154/cfg.c > @@ -46,8 +46,7 @@ static int ieee802154_suspend(struct wpan_phy *wpan_phy) > if (!local->open_count) > goto suspend; > > - ieee802154_hold_queue(local); > - ieee802154_stop_queue(local); > + ieee802154_sync_and_hold_queue(local); > synchronize_net(); > > /* stop hardware - this must stop RX */ > diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h > index c686a027555a..c87c7fa04435 100644 > --- a/net/mac802154/ieee802154_i.h > +++ b/net/mac802154/ieee802154_i.h > @@ -124,6 +124,7 @@ extern struct ieee802154_mlme_ops mac802154_mlme_wpan; > > void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb); > void ieee802154_xmit_sync_worker(struct work_struct *work); > +int ieee802154_sync_and_hold_queue(struct ieee802154_local *local); > netdev_tx_t > ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); > netdev_tx_t > diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c > index 021dddfea542..5f94973b57e4 100644 > --- a/net/mac802154/tx.c > +++ b/net/mac802154/tx.c > @@ -45,7 +45,8 @@ void ieee802154_xmit_sync_worker(struct work_struct *work) > /* Restart the netif queue on each sub_if_data object. */ > ieee802154_wake_queue(local); > kfree_skb(skb); > - atomic_dec(&local->phy->ongoing_txs); > + if (!atomic_dec_and_test(&local->phy->ongoing_txs)) > + wake_up(&local->phy->sync_txq); > netdev_dbg(dev, "transmission failed\n"); > } There is a missing handling of dec() wake_up() in ieee802154_tx() "err_tx" label. - Alex
Hi Alex, > > --- a/net/mac802154/tx.c > > +++ b/net/mac802154/tx.c > > @@ -45,7 +45,8 @@ void ieee802154_xmit_sync_worker(struct work_struct *work) > > /* Restart the netif queue on each sub_if_data object. */ > > ieee802154_wake_queue(local); > > kfree_skb(skb); > > - atomic_dec(&local->phy->ongoing_txs); > > + if (!atomic_dec_and_test(&local->phy->ongoing_txs)) > > + wake_up(&local->phy->sync_txq); > > netdev_dbg(dev, "transmission failed\n"); > > } > > There is a missing handling of dec() wake_up() in ieee802154_tx() > "err_tx" label. Good catch. Fixed. Thanks, Miquèl
diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h index 043d8e4359e7..0d385a214da3 100644 --- a/include/net/cfg802154.h +++ b/include/net/cfg802154.h @@ -217,6 +217,7 @@ struct wpan_phy { /* Transmission monitoring and control */ atomic_t ongoing_txs; atomic_t hold_txs; + wait_queue_head_t sync_txq; char priv[] __aligned(NETDEV_ALIGN); }; diff --git a/net/ieee802154/core.c b/net/ieee802154/core.c index de259b5170ab..0953cacafbff 100644 --- a/net/ieee802154/core.c +++ b/net/ieee802154/core.c @@ -129,6 +129,7 @@ wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size) wpan_phy_net_set(&rdev->wpan_phy, &init_net); init_waitqueue_head(&rdev->dev_wait); + init_waitqueue_head(&rdev->wpan_phy.sync_txq); return &rdev->wpan_phy; } diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c index 0540a2b014d2..c17e38bef425 100644 --- a/net/mac802154/cfg.c +++ b/net/mac802154/cfg.c @@ -46,8 +46,7 @@ static int ieee802154_suspend(struct wpan_phy *wpan_phy) if (!local->open_count) goto suspend; - ieee802154_hold_queue(local); - ieee802154_stop_queue(local); + ieee802154_sync_and_hold_queue(local); synchronize_net(); /* stop hardware - this must stop RX */ diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h index c686a027555a..c87c7fa04435 100644 --- a/net/mac802154/ieee802154_i.h +++ b/net/mac802154/ieee802154_i.h @@ -124,6 +124,7 @@ extern struct ieee802154_mlme_ops mac802154_mlme_wpan; void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb); void ieee802154_xmit_sync_worker(struct work_struct *work); +int ieee802154_sync_and_hold_queue(struct ieee802154_local *local); netdev_tx_t ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); netdev_tx_t diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c index 021dddfea542..5f94973b57e4 100644 --- a/net/mac802154/tx.c +++ b/net/mac802154/tx.c @@ -45,7 +45,8 @@ void ieee802154_xmit_sync_worker(struct work_struct *work) /* Restart the netif queue on each sub_if_data object. */ ieee802154_wake_queue(local); kfree_skb(skb); - atomic_dec(&local->phy->ongoing_txs); + if (!atomic_dec_and_test(&local->phy->ongoing_txs)) + wake_up(&local->phy->sync_txq); netdev_dbg(dev, "transmission failed\n"); } @@ -121,6 +122,27 @@ bool ieee802154_queue_is_held(struct ieee802154_local *local) return atomic_read(&local->phy->hold_txs); } +static int ieee802154_sync_queue(struct ieee802154_local *local) +{ + int ret; + + ieee802154_hold_queue(local); + ieee802154_disable_queue(local); + wait_event(local->phy->sync_txq, !atomic_read(&local->phy->ongoing_txs)); + ret = local->tx_result; + ieee802154_release_queue(local); + ieee802154_wake_queue(local); + + return ret; +} + +int ieee802154_sync_and_hold_queue(struct ieee802154_local *local) +{ + ieee802154_hold_queue(local); + + return ieee802154_sync_queue(local); +} + static netdev_tx_t ieee802154_hot_tx(struct ieee802154_local *local, struct sk_buff *skb) { diff --git a/net/mac802154/util.c b/net/mac802154/util.c index 3e2b157b34b1..056f8c4e6bcd 100644 --- a/net/mac802154/util.c +++ b/net/mac802154/util.c @@ -120,7 +120,8 @@ void ieee802154_xmit_complete(struct ieee802154_hw *hw, struct sk_buff *skb, } dev_consume_skb_any(skb); - atomic_dec(&hw->phy->ongoing_txs); + if (!atomic_dec_and_test(&hw->phy->ongoing_txs)) + wake_up(&hw->phy->sync_txq); } EXPORT_SYMBOL(ieee802154_xmit_complete); @@ -132,7 +133,9 @@ void ieee802154_xmit_error(struct ieee802154_hw *hw, struct sk_buff *skb, local->tx_result = reason; ieee802154_wake_queue(local); dev_kfree_skb_any(skb); - atomic_dec(&hw->phy->ongoing_txs); + + if (!atomic_dec_and_test(&hw->phy->ongoing_txs)) + wake_up(&hw->phy->sync_txq); } EXPORT_SYMBOL(ieee802154_xmit_error);
Right now we are able to stop a queue but we have no indication if a transmission is ongoing or not. Thanks to recent additions, we can track the number of ongoing transmissions so we know if the last transmission is over. Adding on top of it an internal wait queue also allows to be woken up asynchronously when this happens. If, beforehands, we marked the queue to be held and stopped it, we end up flushing and stopping the tx queue. Thanks to this feature, we will soon be able to introduce a synchronous transmit API. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- include/net/cfg802154.h | 1 + net/ieee802154/core.c | 1 + net/mac802154/cfg.c | 3 +-- net/mac802154/ieee802154_i.h | 1 + net/mac802154/tx.c | 24 +++++++++++++++++++++++- net/mac802154/util.c | 7 +++++-- 6 files changed, 32 insertions(+), 5 deletions(-)