mbox series

[PATCHv3,bpf,0/2] Remove unused test_ipip.sh test and add missed ip6ip6 test

Message ID 20201110015013.1570716-1-liuhangbin@gmail.com
Headers show
Series Remove unused test_ipip.sh test and add missed ip6ip6 test | expand

Message

Hangbin Liu Nov. 10, 2020, 1:50 a.m. UTC
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 missed some points:

1. ip6ip6 test is not added
2. forgot to remove test_ipip.sh in sample folder
3. TCP test code is not removed in test_tunnel_kern.c

In this patch set I add back ip6ip6 test and remove unused code. I'm not sure
if this should be net or net-next, so just set to net.

Here is the test result:
```
Testing IP6IP6 tunnel...
PING ::11(::11) 56 data bytes

--- ::11 ping statistics ---
3 packets transmitted, 3 received, 0% packet loss, time 63ms
rtt min/avg/max/mdev = 0.014/1028.308/2060.906/841.361 ms, pipe 2
PING 1::11(1::11) 56 data bytes

--- 1::11 ping statistics ---
3 packets transmitted, 3 received, 0% packet loss, time 48ms
rtt min/avg/max/mdev = 0.026/0.029/0.036/0.006 ms
PING 1::22(1::22) 56 data bytes

--- 1::22 ping statistics ---
3 packets transmitted, 3 received, 0% packet loss, time 47ms
rtt min/avg/max/mdev = 0.030/0.048/0.067/0.016 ms
PASS: ip6ip6tnl
```

v3:
Add back ICMP check as Martin suggested.

v2: Keep ip6ip6 section in test_tunnel_kern.c.

Hangbin Liu (2):
  selftest/bpf: add missed ip6ip6 test back
  samples/bpf: remove unused test_ipip.sh

 samples/bpf/test_ipip.sh                      | 179 ------------------
 .../selftests/bpf/progs/test_tunnel_kern.c    |  42 +---
 tools/testing/selftests/bpf/test_tunnel.sh    |  43 ++++-
 3 files changed, 46 insertions(+), 218 deletions(-)
 delete mode 100755 samples/bpf/test_ipip.sh

Comments

Martin KaFai Lau Nov. 10, 2020, 5:35 p.m. UTC | #1
On Tue, Nov 10, 2020 at 09:50:11AM +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 missed some points:
> 
> 1. ip6ip6 test is not added
> 2. forgot to remove test_ipip.sh in sample folder
> 3. TCP test code is not removed in test_tunnel_kern.c
> 
> In this patch set I add back ip6ip6 test and remove unused code. I'm not sure
> if this should be net or net-next, so just set to net.
> 
> Here is the test result:
> ```
> Testing IP6IP6 tunnel...
> PING ::11(::11) 56 data bytes
> 
> --- ::11 ping statistics ---
> 3 packets transmitted, 3 received, 0% packet loss, time 63ms
> rtt min/avg/max/mdev = 0.014/1028.308/2060.906/841.361 ms, pipe 2
> PING 1::11(1::11) 56 data bytes
> 
> --- 1::11 ping statistics ---
> 3 packets transmitted, 3 received, 0% packet loss, time 48ms
> rtt min/avg/max/mdev = 0.026/0.029/0.036/0.006 ms
> PING 1::22(1::22) 56 data bytes
> 
> --- 1::22 ping statistics ---
> 3 packets transmitted, 3 received, 0% packet loss, time 47ms
> rtt min/avg/max/mdev = 0.030/0.048/0.067/0.016 ms
> PASS: ip6ip6tnl
> ```
> 
> v3:
> Add back ICMP check as Martin suggested.
> 
> v2: Keep ip6ip6 section in test_tunnel_kern.c.
This should be for bpf-next.

Acked-by: Martin KaFai Lau <kafai@fb.com>
Alexei Starovoitov Nov. 11, 2020, 12:56 a.m. UTC | #2
On Tue, Nov 10, 2020 at 9:39 AM Martin KaFai Lau <kafai@fb.com> wrote:
>
> On Tue, Nov 10, 2020 at 09:50:11AM +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 missed some points:
> >
> > 1. ip6ip6 test is not added
> > 2. forgot to remove test_ipip.sh in sample folder
> > 3. TCP test code is not removed in test_tunnel_kern.c
> >
> > In this patch set I add back ip6ip6 test and remove unused code. I'm not sure
> > if this should be net or net-next, so just set to net.
> >
> > Here is the test result:
> > ```
> > Testing IP6IP6 tunnel...
> > PING ::11(::11) 56 data bytes
> >
> > --- ::11 ping statistics ---
> > 3 packets transmitted, 3 received, 0% packet loss, time 63ms
> > rtt min/avg/max/mdev = 0.014/1028.308/2060.906/841.361 ms, pipe 2
> > PING 1::11(1::11) 56 data bytes
> >
> > --- 1::11 ping statistics ---
> > 3 packets transmitted, 3 received, 0% packet loss, time 48ms
> > rtt min/avg/max/mdev = 0.026/0.029/0.036/0.006 ms
> > PING 1::22(1::22) 56 data bytes
> >
> > --- 1::22 ping statistics ---
> > 3 packets transmitted, 3 received, 0% packet loss, time 47ms
> > rtt min/avg/max/mdev = 0.030/0.048/0.067/0.016 ms
> > PASS: ip6ip6tnl
> > ```
> >
> > v3:
> > Add back ICMP check as Martin suggested.
> >
> > v2: Keep ip6ip6 section in test_tunnel_kern.c.
> This should be for bpf-next.
>
> Acked-by: Martin KaFai Lau <kafai@fb.com>

git bot got lost.
the patches were applied.