All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Aring <alex.aring@gmail.com>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH bluetooth-next 09/15] mac802154: tx: don't allow if down while sync tx
Date: Sun, 26 Oct 2014 09:15:46 +0100	[thread overview]
Message-ID: <1414311352-908-10-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1414311352-908-1-git-send-email-alex.aring@gmail.com>

This patch holds rtnl lock while sync xmit inside of workqueue.
Otherwise we could down the interface while worker xmit handling.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 net/mac802154/tx.c | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 1a4f6d9..4439041 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -21,6 +21,7 @@
 #include <linux/if_arp.h>
 #include <linux/crc-ccitt.h>
 
+#include <net/rtnetlink.h>
 #include <net/ieee802154_netdev.h>
 #include <net/mac802154.h>
 #include <net/cfg802154.h>
@@ -50,16 +51,28 @@ static void mac802154_xmit_worker(struct work_struct *work)
 	struct sk_buff *skb = cb->skb;
 	int res;
 
+	rtnl_lock();
+
+	/* check if ifdown occurred while schedule */
+	if (!netif_running(skb->dev))
+		goto err_tx;
+
 	res = local->ops->xmit_sync(&local->hw, skb);
-	if (res) {
-		pr_debug("transmission failed\n");
-		/* Restart the netif queue on each sub_if_data object. */
-		ieee802154_wake_queue(&local->hw);
-		kfree_skb(skb);
-	} else {
-		/* Restart the netif queue on each sub_if_data object. */
-		ieee802154_xmit_complete(&local->hw, skb);
-	}
+	if (res)
+		goto err_tx;
+
+	ieee802154_xmit_complete(&local->hw, skb);
+
+	rtnl_unlock();
+
+	return;
+
+err_tx:
+	/* Restart the netif queue on each sub_if_data object. */
+	ieee802154_wake_queue(&local->hw);
+	rtnl_unlock();
+	kfree_skb(skb);
+	pr_debug("transmission failed\n");
 }
 
 static netdev_tx_t
-- 
2.1.2


  parent reply	other threads:[~2014-10-26  8:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-26  8:15 [PATCH bluetooth-next 00/15] ieee802154: rework transmit handling Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 01/15] mac802154: tx: move xmit callback to tx file Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 02/15] mac802154: tx: remove kmalloc in xmit hotpath Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 03/15] mac802154: tx: squash multiple dereferencing Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 04/15] mac802154: tx: remove xmit channel context switch Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 05/15] mac802154: add netdev qeue helpers Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 06/15] mac802154: tx: use queue helpers in xmit worker Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 07/15] mac802154: tx: fix error handling while xmit Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 08/15] mac802154: tx: add support for xmit_async callback Alexander Aring
2014-10-26  8:15 ` Alexander Aring [this message]
2014-10-26  8:15 ` [PATCH bluetooth-next 10/15] mac802154: tx: use netdev print helpers Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 11/15] mac802154: tx: cleanup crc calculation Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 12/15] mac802154: tx: move stats tx increment Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 13/15] mac802154: tx: change naming convention Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 14/15] mac802154: tx: add comment at sync xmit callback Alexander Aring
2014-10-26  8:25   ` Alexander Aring
2014-10-26  8:15 ` [PATCH bluetooth-next 15/15] at86rf230: asynchronous xmit handling 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=1414311352-908-10-git-send-email-alex.aring@gmail.com \
    --to=alex.aring@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-wpan@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.