Commit 557c223b authored by Hangbin Liu's avatar Hangbin Liu Committed by Daniel Borkmann

selftests/bpf: No need to drop the packet when there is no geneve opt

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 9c2e14b4 ("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.

Fixes: 933a741e ("selftests/bpf: bpf tunnel test.")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
Link: https://lore.kernel.org/bpf/20210224081403.1425474-1-liuhangbin@gmail.com
parent a7c9c25a
...@@ -446,10 +446,8 @@ int _geneve_get_tunnel(struct __sk_buff *skb) ...@@ -446,10 +446,8 @@ int _geneve_get_tunnel(struct __sk_buff *skb)
} }
ret = bpf_skb_get_tunnel_opt(skb, &gopt, sizeof(gopt)); ret = bpf_skb_get_tunnel_opt(skb, &gopt, sizeof(gopt));
if (ret < 0) { if (ret < 0)
ERROR(ret); gopt.opt_class = 0;
return TC_ACT_SHOT;
}
bpf_trace_printk(fmt, sizeof(fmt), bpf_trace_printk(fmt, sizeof(fmt),
key.tunnel_id, key.remote_ipv4, gopt.opt_class); key.tunnel_id, key.remote_ipv4, gopt.opt_class);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment