* [PATCH net] erspan: get the proto with the md version for collect_md
@ 2023-05-11 23:22 Xin Long
2023-05-12 16:52 ` Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Xin Long @ 2023-05-11 23:22 UTC (permalink / raw)
To: network dev
Cc: davem, kuba, Eric Dumazet, Paolo Abeni, William Tu, Kevin Traynor
In commit 20704bd1633d ("erspan: build the header with the right proto
according to erspan_ver"), it gets the proto with t->parms.erspan_ver,
but t->parms.erspan_ver is not used by collect_md branch, and instead
it should get the proto with md->version for collect_md.
Thanks to Kevin for pointing this out.
Fixes: 94d7d8f29287 ("ip6_gre: add erspan v2 support")
Reported-by: Kevin Traynor <ktraynor@redhat•com>
Signed-off-by: Xin Long <lucien.xin@gmail•com>
---
net/ipv6/ip6_gre.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index a4ecfc9d2593..da80974ad23a 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1015,12 +1015,14 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,
ntohl(tun_id),
ntohl(md->u.index), truncate,
false);
+ proto = htons(ETH_P_ERSPAN);
} else if (md->version == 2) {
erspan_build_header_v2(skb,
ntohl(tun_id),
md->u.md2.dir,
get_hwid(&md->u.md2),
truncate, false);
+ proto = htons(ETH_P_ERSPAN2);
} else {
goto tx_err;
}
@@ -1043,24 +1045,25 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,
break;
}
- if (t->parms.erspan_ver == 1)
+ if (t->parms.erspan_ver == 1) {
erspan_build_header(skb, ntohl(t->parms.o_key),
t->parms.index,
truncate, false);
- else if (t->parms.erspan_ver == 2)
+ proto = htons(ETH_P_ERSPAN);
+ } else if (t->parms.erspan_ver == 2) {
erspan_build_header_v2(skb, ntohl(t->parms.o_key),
t->parms.dir,
t->parms.hwid,
truncate, false);
- else
+ proto = htons(ETH_P_ERSPAN2);
+ } else {
goto tx_err;
+ }
fl6.daddr = t->parms.raddr;
}
/* Push GRE header. */
- proto = (t->parms.erspan_ver == 1) ? htons(ETH_P_ERSPAN)
- : htons(ETH_P_ERSPAN2);
gre_build_header(skb, 8, TUNNEL_SEQ, proto, 0, htonl(atomic_fetch_inc(&t->o_seqno)));
/* TooBig packet may have updated dst->dev's mtu */
--
2.39.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] erspan: get the proto with the md version for collect_md
2023-05-11 23:22 [PATCH net] erspan: get the proto with the md version for collect_md Xin Long
@ 2023-05-12 16:52 ` Simon Horman
2023-05-12 18:55 ` William Tu
2023-05-13 16:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2023-05-12 16:52 UTC (permalink / raw)
To: Xin Long
Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni, William Tu,
Kevin Traynor
On Thu, May 11, 2023 at 07:22:11PM -0400, Xin Long wrote:
> In commit 20704bd1633d ("erspan: build the header with the right proto
> according to erspan_ver"), it gets the proto with t->parms.erspan_ver,
> but t->parms.erspan_ver is not used by collect_md branch, and instead
> it should get the proto with md->version for collect_md.
>
> Thanks to Kevin for pointing this out.
>
> Fixes: 94d7d8f29287 ("ip6_gre: add erspan v2 support")
Hi Xin,
In a way this fixes the following commit which in turn fixes the above
commit.
Fixes: 20704bd1633d ("erspan: build the header with the right proto according to erspan_ver")
> Reported-by: Kevin Traynor <ktraynor@redhat•com>
> Signed-off-by: Xin Long <lucien.xin@gmail•com>
Reviewed-by: Simon Horman <simon.horman@corigine•com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] erspan: get the proto with the md version for collect_md
2023-05-11 23:22 [PATCH net] erspan: get the proto with the md version for collect_md Xin Long
2023-05-12 16:52 ` Simon Horman
@ 2023-05-12 18:55 ` William Tu
2023-05-13 16:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: William Tu @ 2023-05-12 18:55 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, davem, kuba, Eric Dumazet, Paolo Abeni,
Kevin Traynor
On Thu, May 11, 2023 at 4:22 PM Xin Long <lucien.xin@gmail•com> wrote:
>
> In commit 20704bd1633d ("erspan: build the header with the right proto
> according to erspan_ver"), it gets the proto with t->parms.erspan_ver,
> but t->parms.erspan_ver is not used by collect_md branch, and instead
> it should get the proto with md->version for collect_md.
>
> Thanks to Kevin for pointing this out.
>
> Fixes: 94d7d8f29287 ("ip6_gre: add erspan v2 support")
> Reported-by: Kevin Traynor <ktraynor@redhat•com>
> Signed-off-by: Xin Long <lucien.xin@gmail•com>
> ---
Hi Xin,
LGTM, thanks for fixing this.
Reviewed-by: William Tu <u9012063@gmail•com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] erspan: get the proto with the md version for collect_md
2023-05-11 23:22 [PATCH net] erspan: get the proto with the md version for collect_md Xin Long
2023-05-12 16:52 ` Simon Horman
2023-05-12 18:55 ` William Tu
@ 2023-05-13 16:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-05-13 16:00 UTC (permalink / raw)
To: Xin Long; +Cc: netdev, davem, kuba, edumazet, pabeni, u9012063, ktraynor
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft•net>:
On Thu, 11 May 2023 19:22:11 -0400 you wrote:
> In commit 20704bd1633d ("erspan: build the header with the right proto
> according to erspan_ver"), it gets the proto with t->parms.erspan_ver,
> but t->parms.erspan_ver is not used by collect_md branch, and instead
> it should get the proto with md->version for collect_md.
>
> Thanks to Kevin for pointing this out.
>
> [...]
Here is the summary with links:
- [net] erspan: get the proto with the md version for collect_md
https://git.kernel.org/netdev/net/c/d80fc101d2eb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-13 16:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-11 23:22 [PATCH net] erspan: get the proto with the md version for collect_md Xin Long
2023-05-12 16:52 ` Simon Horman
2023-05-12 18:55 ` William Tu
2023-05-13 16:00 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox