From: Martin KaFai Lau <kafai@fb.com>
To: Hangbin Liu <liuhangbin@gmail.com>
Cc: <netdev@vger.kernel.org>, William Tu <u9012063@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>, <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next 2/2] selftest/bpf: remove unused bpf tunnel testing code
Date: Thu, 5 Nov 2020 23:30:35 -0800 [thread overview]
Message-ID: <20201106073035.w2x4szk7m6nkx5yj@kafai-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <20201103042908.2825734-3-liuhangbin@gmail.com>
On Tue, Nov 03, 2020 at 12:29:08PM +0800, Hangbin Liu wrote:
> In comment 173ca26e9b51 ("samples/bpf: add comprehensive ipip, ipip6,
> ip6ip6 test") we added some bpf tunnel tests. In commit 933a741e3b82
> ("selftests/bpf: bpf tunnel test.") when we moved it to the current
> folder, we forgot to remove test_ipip.sh in sample folder.
>
> Since we simplify the original ipip tests and removed iperf tests, there
> is not need for TCP checks. ip6ip6 and ipip6 are using the same underlay
> network, we can remove ip6ip6 section too.
>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
[ ... ]
> @@ -585,12 +571,11 @@ int _ipip6_set_tunnel(struct __sk_buff *skb)
> struct bpf_tunnel_key key = {};
> void *data = (void *)(long)skb->data;
> struct iphdr *iph = data;
v4 hdr here.
> - struct tcphdr *tcp = data + sizeof(*iph);
> void *data_end = (void *)(long)skb->data_end;
> int ret;
>
> /* single length check */
> - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) {
> + if (data + sizeof(*iph) > data_end) {
> ERROR(1);
> return TC_ACT_SHOT;
> }
> @@ -628,72 +613,6 @@ int _ipip6_get_tunnel(struct __sk_buff *skb)
> return TC_ACT_OK;
> }
>
> -SEC("ip6ip6_set_tunnel")
> -int _ip6ip6_set_tunnel(struct __sk_buff *skb)
> -{
> - struct bpf_tunnel_key key = {};
> - void *data = (void *)(long)skb->data;
> - struct ipv6hdr *iph = data;
IIUC, the patch is to replace _ip6ip6_set_tunnel with _ipip6_set_tunnel.
Are they testing the same thing? At least, _ip6ip6_set_tunnel()
is expecting a v6 hdr here.
> - struct tcphdr *tcp = data + sizeof(*iph);
> - void *data_end = (void *)(long)skb->data_end;
> - int ret;
> -
> - /* single length check */
> - if (data + sizeof(*iph) + sizeof(*tcp) > data_end) {
> - ERROR(1);
> - return TC_ACT_SHOT;
> - }
> -
> - key.remote_ipv6[0] = bpf_htonl(0x2401db00);
> - key.tunnel_ttl = 64;
> -
> - if (iph->nexthdr == 58 /* NEXTHDR_ICMP */) {
> - key.remote_ipv6[3] = bpf_htonl(1);
> - } else {
> - if (iph->nexthdr != 6 /* NEXTHDR_TCP */) {
> - ERROR(iph->nexthdr);
> - return TC_ACT_SHOT;
> - }
> -
> - if (tcp->dest == bpf_htons(5200)) {
> - key.remote_ipv6[3] = bpf_htonl(1);
> - } else if (tcp->dest == bpf_htons(5201)) {
> - key.remote_ipv6[3] = bpf_htonl(2);
> - } else {
> - ERROR(tcp->dest);
> - return TC_ACT_SHOT;
> - }
> - }
> -
> - ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key),
> - BPF_F_TUNINFO_IPV6);
> - if (ret < 0) {
> - ERROR(ret);
> - return TC_ACT_SHOT;
> - }
> -
> - return TC_ACT_OK;
> -}
next prev parent reply other threads:[~2020-11-06 7:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 4:29 [PATCH bpf-next 0/2] selftest/bpf: improve bpf tunnel test Hangbin Liu
2020-11-03 4:29 ` [PATCH bpf-next 1/2] selftest/bpf: add missed ip6ip6 test back Hangbin Liu
2020-11-04 18:40 ` Martin KaFai Lau
2020-11-05 3:20 ` Hangbin Liu
2020-11-03 4:29 ` [PATCH bpf-next 2/2] selftest/bpf: remove unused bpf tunnel testing code Hangbin Liu
2020-11-06 7:30 ` Martin KaFai Lau [this message]
2020-11-06 7:55 ` Hangbin Liu
2020-11-06 8:04 ` Hangbin Liu
2020-11-06 9:01 ` [PATCHv2 net 0/2] Remove unused test_ipip.sh test and add missed ip6ip6 test Hangbin Liu
2020-11-06 9:01 ` [PATCHv2 net 1/2] selftest/bpf: add missed ip6ip6 test back Hangbin Liu
2020-11-07 2:15 ` Martin KaFai Lau
2020-11-09 3:00 ` Hangbin Liu
2020-11-09 22:25 ` Martin KaFai Lau
2020-11-06 9:01 ` [PATCHv2 net 2/2] samples/bpf: remove unused test_ipip.sh Hangbin Liu
2020-11-07 2:16 ` Martin KaFai Lau
2020-11-06 18:56 ` [PATCHv2 net 0/2] Remove unused test_ipip.sh test and add missed ip6ip6 test Jakub Kicinski
2020-11-06 18:58 ` Alexei Starovoitov
2020-11-07 1:20 ` Hangbin Liu
2020-11-10 1:50 ` [PATCHv3 bpf " Hangbin Liu
2020-11-10 1:50 ` [PATCHv3 bpf 1/2] selftest/bpf: add missed ip6ip6 test back Hangbin Liu
2020-11-10 1:50 ` [PATCHv3 bpf 2/2] samples/bpf: remove unused test_ipip.sh Hangbin Liu
2020-11-10 17:35 ` [PATCHv3 bpf 0/2] Remove unused test_ipip.sh test and add missed ip6ip6 test Martin KaFai Lau
2020-11-11 0:56 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201106073035.w2x4szk7m6nkx5yj@kafai-mbp.dhcp.thefacebook.com \
--to=kafai@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=liuhangbin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=u9012063@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).