Skip to contentSkip to conversation

ipv6: rpl: Remove redundant skb_dst_drop().

PATCH Applied Kuniyuki Iwashima 4 participants 6 messages Jul 10, 2023 – Jul 13, 2023

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

PATCH 1/1 ipv6: rpl: Remove redundant skb_dst_drop().

RPL code has a pattern where skb_dst_drop() is called before ip6_route_input().

However, ip6_route_input() calls skb_dst_drop() internally, so we need not call skb_dst_drop() before ip6_route_input().

---
 net/ipv6/exthdrs.c      | 2 --
 net/ipv6/rpl_iptunnel.c | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)
net/ipv6/exthdrs.c +0 -2
index 202fc3aaa83c..f4bfccae003c 100644
@@ -612,8 +612,6 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)
 
 	kfree(buf);
 
-	skb_dst_drop(skb);
-
 	ip6_route_input(skb);
 
 	if (skb_dst(skb)->error) {
net/ipv6/rpl_iptunnel.c +1 -2
index b1c028df686e..a013b92cbb86 100644
@@ -272,8 +272,6 @@ static int rpl_input(struct sk_buff *skb)
 	dst = dst_cache_get(&rlwt->cache);
 	preempt_enable();
 
-	skb_dst_drop(skb);
-
 	if (!dst) {
 		ip6_route_input(skb);
 		dst = skb_dst(skb);
@@ -284,6 +282,7 @@ static int rpl_input(struct sk_buff *skb)
 			preempt_enable();
 		}
 	} else {
+		skb_dst_drop(skb);
 		skb_dst_set(skb, dst);
 	}
 
Signature · 1 line
2.30.2
maintainer
#2 lore raw
Quoted 11 lines · Simon Horman
Quoted 7 lines · Kuniyuki Iwashima

RPL code has a pattern where skb_dst_drop() is called before ip6_route_input().

However, ip6_route_input() calls skb_dst_drop() internally, so we need not call skb_dst_drop() before ip6_route_input().

I have been ignoring net-next patches since net-next status still shows as closed.

maintainer Reviewed-by
#3 lore raw
Quoted 8 lines · David Ahern
Quoted 7 lines · Simon Horman
Quoted 6 lines · Kuniyuki Iwashima

RPL code has a pattern where skb_dst_drop() is called before ip6_route_input().

However, ip6_route_input() calls skb_dst_drop() internally, so we need not call skb_dst_drop() before ip6_route_input().

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

I have been ignoring net-next patches since net-next status still shows as closed.

I was shown the error of my ways (i.e., pointed to the new URL for net-next status)

#4 lore raw
In reply to David Ahern
Quoted 8 lines · David Ahern
Quoted 7 lines · Simon Horman
Quoted 6 lines · Kuniyuki Iwashima

RPL code has a pattern where skb_dst_drop() is called before ip6_route_input().

However, ip6_route_input() calls skb_dst_drop() internally, so we need not call skb_dst_drop() before ip6_route_input().

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

I have been ignoring net-next patches since net-next status still shows as closed.

Yes, sorry that I may have been a bit hasty there.

#5 lore raw
In reply to Kuniyuki Iwashima
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Mon, 10 Jul 2023 14:35:11 -0700 you wrote:

RPL code has a pattern where skb_dst_drop() is called before ip6_route_input().

However, ip6_route_input() calls skb_dst_drop() internally, so we need not call skb_dst_drop() before ip6_route_input().

[...]

Here is the summary with links:
- [v1,net-next] ipv6: rpl: Remove redundant skb_dst_drop().

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

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html