| Message ID | 20210224081403.1425474-1-liuhangbin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 557c223b643a35effec9654958d8edc62fd2603a |
| Delegated to: | BPF |
| Headers | show |
| Series | [net] selftest/bpf: no need to drop the packet when there is no geneve opt | expand |
On Wed, Feb 24, 2021 at 12:37 AM Hangbin Liu <liuhangbin@gmail.com> wrote: > > In bpf geneve tunnel test we set geneve option on tx side. On rx side we > only call bpf_skb_get_tunnel_opt(). Since commit 9c2e14b48119 ("ip_tunnels: > Set tunnel option flag when tunnel metadata is present") geneve_rx() will > not add TUNNEL_GENEVE_OPT flag if there is no geneve option, which cause > bpf_skb_get_tunnel_opt() return ENOENT and _geneve_get_tunnel() in > test_tunnel_kern.c drop the packet. > > As it should be valid that bpf_skb_get_tunnel_opt() return error when > there is not tunnel option, there is no need to drop the packet and > break all geneve rx traffic. Just set opt_class to 0 in this test and > keep returning TC_ACT_OK. > > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> > --- LGTM. Acked-by: William Tu <u9012063@gmail.com>
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Wed, 24 Feb 2021 16:14:03 +0800 you wrote: > In bpf geneve tunnel test we set geneve option on tx side. On rx side we > only call bpf_skb_get_tunnel_opt(). Since commit 9c2e14b48119 ("ip_tunnels: > Set tunnel option flag when tunnel metadata is present") geneve_rx() will > not add TUNNEL_GENEVE_OPT flag if there is no geneve option, which cause > bpf_skb_get_tunnel_opt() return ENOENT and _geneve_get_tunnel() in > test_tunnel_kern.c drop the packet. > > [...] Here is the summary with links: - [net] selftest/bpf: no need to drop the packet when there is no geneve opt https://git.kernel.org/bpf/bpf/c/557c223b643a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c index a621b58ab079..9afe947cfae9 100644 --- a/tools/testing/selftests/bpf/progs/test_tunnel_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tunnel_kern.c @@ -446,10 +446,8 @@ int _geneve_get_tunnel(struct __sk_buff *skb) } ret = bpf_skb_get_tunnel_opt(skb, &gopt, sizeof(gopt)); - if (ret < 0) { - ERROR(ret); - return TC_ACT_SHOT; - } + if (ret < 0) + gopt.opt_class = 0; bpf_trace_printk(fmt, sizeof(fmt), key.tunnel_id, key.remote_ipv4, gopt.opt_class);
In bpf geneve tunnel test we set geneve option on tx side. On rx side we only call bpf_skb_get_tunnel_opt(). Since commit 9c2e14b48119 ("ip_tunnels: Set tunnel option flag when tunnel metadata is present") geneve_rx() will not add TUNNEL_GENEVE_OPT flag if there is no geneve option, which cause bpf_skb_get_tunnel_opt() return ENOENT and _geneve_get_tunnel() in test_tunnel_kern.c drop the packet. As it should be valid that bpf_skb_get_tunnel_opt() return error when there is not tunnel option, there is no need to drop the packet and break all geneve rx traffic. Just set opt_class to 0 in this test and keep returning TC_ACT_OK. Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- tools/testing/selftests/bpf/progs/test_tunnel_kern.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)