Skip to contentSkip to conversation

net: flow_dissector: fix RPS on DSA masters

PATCH Applied Vladimir Oltean 2 participants 2 messages Jun 14, 2021

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

PATCH 1/1 net: flow_dissector: fix RPS on DSA masters

From: Vladimir Oltean <[email protected]>

After the blamed patch, __skb_flow_dissect() on the DSA master stopped adjusting for the length of the DSA headers. This is because it was told to adjust only if the needed_headroom is zero, aka if there is no DSA header. Of course, the adjustment should be done only if there _is_ a DSA header.

Modify the comment too so it is clearer.

Fixes 4e50025129ef ("net: dsa: generalize overhead for taggers that use both headers and trailers")
---
 net/core/flow_dissector.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/flow_dissector.c +2 -2
index c04455981c1e..2aadbfc5193b 100644
@@ -943,8 +943,8 @@ bool __skb_flow_dissect(const struct net *net,
 			int offset = 0;
 
 			ops = skb->dev->dsa_ptr->tag_ops;
-			/* Tail taggers don't break flow dissection */
-			if (!ops->needed_headroom) {
+			/* Only DSA header taggers break flow dissection */
+			if (ops->needed_headroom) {
 				if (ops->flow_dissect)
 					ops->flow_dissect(skb, &proto, &offset);
 				else
Signature · 1 line
2.25.1
#1 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 9 lines · On Mon, 14 Jun 2021 16:58:19 +0300 you wrote:

From: Vladimir Oltean <[email protected]>

After the blamed patch, __skb_flow_dissect() on the DSA master stopped adjusting for the length of the DSA headers. This is because it was told to adjust only if the needed_headroom is zero, aka if there is no DSA header. Of course, the adjustment should be done only if there _is_ a DSA header.

[...]

Here is the summary with links:
- [net-next] net: flow_dissector: fix RPS on DSA masters

    https://git.kernel.org/netdev/net-next/c/ec13357263fb

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html