* [PATCH net v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
@ 2023-08-23 13:41 Nicolas Dichtel
2023-08-23 14:51 ` Guillaume Nault
2023-08-25 7:10 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Nicolas Dichtel @ 2023-08-23 13:41 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Daniel Borkmann, Alexei Starovoitov, John Fastabend,
Guillaume Nault
Cc: netdev, bpf, Nicolas Dichtel, stable, Siwar Zitouni
The goal is to support a bpf_redirect() from an ethernet device (ingress)
to a ppp device (egress).
The l2 header is added automatically by the ppp driver, thus the ethernet
header should be removed.
CC: stable@vger.kernel.org
Fixes: 27b29f63058d ("bpf: add bpf_redirect() helper")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Tested-by: Siwar Zitouni <siwar.zitouni@6wind.com>
---
v2 -> v3:
- add a comment in the code
- rework the commit log
v1 -> v2:
- I forgot the 'Tested-by' tag in the v1 :/
include/linux/if_arp.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 1ed52441972f..10a1e81434cb 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -53,6 +53,10 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev)
case ARPHRD_NONE:
case ARPHRD_RAWIP:
case ARPHRD_PIMREG:
+ /* PPP adds its l2 header automatically in ppp_start_xmit().
+ * This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init().
+ */
+ case ARPHRD_PPP:
return false;
default:
return true;
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
2023-08-23 13:41 [PATCH net v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit() Nicolas Dichtel
@ 2023-08-23 14:51 ` Guillaume Nault
2023-08-25 7:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Guillaume Nault @ 2023-08-23 14:51 UTC (permalink / raw)
To: Nicolas Dichtel
Cc: David S . Miller, Jakub Kicinski, Paolo Abeni, Eric Dumazet,
Daniel Borkmann, Alexei Starovoitov, John Fastabend, netdev, bpf,
stable, Siwar Zitouni
On Wed, Aug 23, 2023 at 03:41:02PM +0200, Nicolas Dichtel wrote:
> The goal is to support a bpf_redirect() from an ethernet device (ingress)
> to a ppp device (egress).
> The l2 header is added automatically by the ppp driver, thus the ethernet
> header should be removed.
Reviewed-by: Guillaume Nault <gnault@redhat.com>
> CC: stable@vger.kernel.org
> Fixes: 27b29f63058d ("bpf: add bpf_redirect() helper")
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> Tested-by: Siwar Zitouni <siwar.zitouni@6wind.com>
> ---
>
> v2 -> v3:
> - add a comment in the code
> - rework the commit log
>
> v1 -> v2:
> - I forgot the 'Tested-by' tag in the v1 :/
>
> include/linux/if_arp.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
> index 1ed52441972f..10a1e81434cb 100644
> --- a/include/linux/if_arp.h
> +++ b/include/linux/if_arp.h
> @@ -53,6 +53,10 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev)
> case ARPHRD_NONE:
> case ARPHRD_RAWIP:
> case ARPHRD_PIMREG:
> + /* PPP adds its l2 header automatically in ppp_start_xmit().
> + * This makes it look like an l3 device to __bpf_redirect() and tcf_mirred_init().
> + */
> + case ARPHRD_PPP:
> return false;
> default:
> return true;
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
2023-08-23 13:41 [PATCH net v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit() Nicolas Dichtel
2023-08-23 14:51 ` Guillaume Nault
@ 2023-08-25 7:10 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-08-25 7:10 UTC (permalink / raw)
To: Nicolas Dichtel
Cc: davem, kuba, pabeni, edumazet, daniel, ast, john.fastabend,
gnault, netdev, bpf, stable, siwar.zitouni
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:
On Wed, 23 Aug 2023 15:41:02 +0200 you wrote:
> The goal is to support a bpf_redirect() from an ethernet device (ingress)
> to a ppp device (egress).
> The l2 header is added automatically by the ppp driver, thus the ethernet
> header should be removed.
>
> CC: stable@vger.kernel.org
> Fixes: 27b29f63058d ("bpf: add bpf_redirect() helper")
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> Tested-by: Siwar Zitouni <siwar.zitouni@6wind.com>
>
> [...]
Here is the summary with links:
- [net,v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
https://git.kernel.org/netdev/net/c/a4f39c9f14a6
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] 3+ messages in thread
end of thread, other threads:[~2023-08-25 7:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-23 13:41 [PATCH net v3] net: handle ARPHRD_PPP in dev_is_mac_header_xmit() Nicolas Dichtel
2023-08-23 14:51 ` Guillaume Nault
2023-08-25 7:10 ` 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;
as well as URLs for NNTP newsgroup(s).