Skip to contentSkip to conversation

batman-adv: Use netif_rx_any_context() any.

PATCH Applied Sebastian Andrzej Siewior 2 participants 3 messages Jul 19, 2022 – Jul 23, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 batman-adv: Use netif_rx_any_context() any.

This reverts the stable commit
e65d78b12fbc0 ("batman-adv: Use netif_rx().")

The commit message says:

| Since commit
|    baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
|
| the function netif_rx() can be used in preemptible/thread context as
| well as in interrupt context.

This commit (baebdf48c3600) has not been backported to the 5.15 stable series and therefore, the commit which builds upon it, must not be backported either.

Revert the backport and use netif_rx_any_context() again.

---
 net/batman-adv/bridge_loop_avoidance.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bridge_loop_avoidance.c +1 -1
index 11f6ef657d822..17687848daec5 100644
@@ -443,7 +443,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
 	batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
 			   skb->len + ETH_HLEN);
 
-	netif_rx(skb);
+	netif_rx_any_context(skb);
 out:
 	batadv_hardif_put(primary_if);
 }
Signature · 1 line
2.36.1
#1 lore raw
Quoted 15 lines · Sebastian Andrzej Siewior

This reverts the stable commit
e65d78b12fbc0 ("batman-adv: Use netif_rx().")

The commit message says:

| Since commit
|    baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
|
| the function netif_rx() can be used in preemptible/thread context as
| well as in interrupt context.

This commit (baebdf48c3600) has not been backported to the 5.15 stable series and therefore, the commit which builds upon it, must not be backported either.

Quoted 6 lines

Revert the backport and use netif_rx_any_context() again.

---
 net/batman-adv/bridge_loop_avoidance.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Now queued up, thanks.

greg k-h

maintainer Applied
#2 lore raw

Patch "batman-adv: Use netif_rx_any_context() any." has been added to the 5.15-stable tree

In reply to Sebastian Andrzej Siewior

This is a note to let you know that I've just added the patch titled

batman-adv: Use netif_rx_any_context() any.

to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
batman-adv-use-netif_rx_any_context-any.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From [email protected] Sat Jul 23 17:18:39 2022
From: Sebastian Andrzej Siewior <[email protected]>
Date: Tue, 19 Jul 2022 18:08:12 +0200
Subject: batman-adv: Use netif_rx_any_context() any.
To: Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: [email protected], [email protected], Antonio Quartulli <[email protected]>, Marek Lindner <[email protected]>, Simon Wunderlich <[email protected]>, Sven Eckelmann <[email protected]>, [email protected], "David S. Miller" <[email protected]>, Thomas Gleixner <[email protected]>
Message-ID: <YtbW7Ca3t4/[email protected]>
Content-Disposition: inline

From: Sebastian Andrzej Siewior <[email protected]>

This reverts the stable commit
e65d78b12fbc0 ("batman-adv: Use netif_rx().")

The commit message says:

| Since commit
|    baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
|
| the function netif_rx() can be used in preemptible/thread context as
| well as in interrupt context.

This commit (baebdf48c3600) has not been backported to the 5.15 stable series and therefore, the commit which builds upon it, must not be backported either.

Revert the backport and use netif_rx_any_context() again.

---
 net/batman-adv/bridge_loop_avoidance.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bridge_loop_avoidance.c +1 -1
@@ -443,7 +443,7 @@ static void batadv_bla_send_claim(struct
 	batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
 			   skb->len + ETH_HLEN);
 
-	netif_rx(skb);
+	netif_rx_any_context(skb);
 out:
 	batadv_hardif_put(primary_if);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-5.15/batman-adv-use-netif_rx_any_context-any.patch