| Message ID | 20190227233046.11718-2-jakub.kicinski@netronome.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | samples: bpf: start effort to get rid of bpf_load | expand |
On Wed, Feb 27, 2019 at 3:31 PM Jakub Kicinski <jakub.kicinski@netronome.com> wrote: > > ping localhost may default of IPv6 on modern systems, but > samples are trying to only parse IPv4. Force IPv4. > > samples/bpf/tracex1_user.c doesn't interpret the packet so > we don't care which IP version will be used there. > > Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> > Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Acked-by: Andrii Nakryiko <andriin@fb.com> > --- > samples/bpf/sock_example.c | 2 +- > samples/bpf/sockex1_user.c | 2 +- > samples/bpf/sockex2_user.c | 2 +- > samples/bpf/sockex3_user.c | 2 +- > samples/bpf/tracex2_user.c | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c > index 60ec467c78ab..00aae1d33fca 100644 > --- a/samples/bpf/sock_example.c > +++ b/samples/bpf/sock_example.c > @@ -99,7 +99,7 @@ int main(void) > { > FILE *f; > > - f = popen("ping -c5 localhost", "r"); > + f = popen("ping -4 -c5 localhost", "r"); > (void)f; > > return test_sock(); > diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c > index 93ec01c56104..be8ba5686924 100644 > --- a/samples/bpf/sockex1_user.c > +++ b/samples/bpf/sockex1_user.c > @@ -26,7 +26,7 @@ int main(int ac, char **argv) > assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, prog_fd, > sizeof(prog_fd[0])) == 0); > > - f = popen("ping -c5 localhost", "r"); > + f = popen("ping -4 -c5 localhost", "r"); > (void) f; > > for (i = 0; i < 5; i++) { > diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c > index 1d5c6e9a6d27..125ee6efc913 100644 > --- a/samples/bpf/sockex2_user.c > +++ b/samples/bpf/sockex2_user.c > @@ -34,7 +34,7 @@ int main(int ac, char **argv) > assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, prog_fd, > sizeof(prog_fd[0])) == 0); > > - f = popen("ping -c5 localhost", "r"); > + f = popen("ping -4 -c5 localhost", "r"); > (void) f; > > for (i = 0; i < 5; i++) { > diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c > index 9d02e0404719..bbb1cd0666a9 100644 > --- a/samples/bpf/sockex3_user.c > +++ b/samples/bpf/sockex3_user.c > @@ -58,7 +58,7 @@ int main(int argc, char **argv) > sizeof(__u32)) == 0); > > if (argc > 1) > - f = popen("ping -c5 localhost", "r"); > + f = popen("ping -4 -c5 localhost", "r"); > else > f = popen("netperf -l 4 localhost", "r"); > (void) f; > diff --git a/samples/bpf/tracex2_user.c b/samples/bpf/tracex2_user.c > index 1a81e6a5c2ea..c9544a4ce61a 100644 > --- a/samples/bpf/tracex2_user.c > +++ b/samples/bpf/tracex2_user.c > @@ -131,7 +131,7 @@ int main(int ac, char **argv) > signal(SIGTERM, int_exit); > > /* start 'ping' in the background to have some kfree_skb events */ > - f = popen("ping -c5 localhost", "r"); > + f = popen("ping -4 -c5 localhost", "r"); > (void) f; > > /* start 'dd' in the background to have plenty of 'write' syscalls */ > -- > 2.19.2 >
diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c index 60ec467c78ab..00aae1d33fca 100644 --- a/samples/bpf/sock_example.c +++ b/samples/bpf/sock_example.c @@ -99,7 +99,7 @@ int main(void) { FILE *f; - f = popen("ping -c5 localhost", "r"); + f = popen("ping -4 -c5 localhost", "r"); (void)f; return test_sock(); diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c index 93ec01c56104..be8ba5686924 100644 --- a/samples/bpf/sockex1_user.c +++ b/samples/bpf/sockex1_user.c @@ -26,7 +26,7 @@ int main(int ac, char **argv) assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, prog_fd, sizeof(prog_fd[0])) == 0); - f = popen("ping -c5 localhost", "r"); + f = popen("ping -4 -c5 localhost", "r"); (void) f; for (i = 0; i < 5; i++) { diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c index 1d5c6e9a6d27..125ee6efc913 100644 --- a/samples/bpf/sockex2_user.c +++ b/samples/bpf/sockex2_user.c @@ -34,7 +34,7 @@ int main(int ac, char **argv) assert(setsockopt(sock, SOL_SOCKET, SO_ATTACH_BPF, prog_fd, sizeof(prog_fd[0])) == 0); - f = popen("ping -c5 localhost", "r"); + f = popen("ping -4 -c5 localhost", "r"); (void) f; for (i = 0; i < 5; i++) { diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c index 9d02e0404719..bbb1cd0666a9 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -58,7 +58,7 @@ int main(int argc, char **argv) sizeof(__u32)) == 0); if (argc > 1) - f = popen("ping -c5 localhost", "r"); + f = popen("ping -4 -c5 localhost", "r"); else f = popen("netperf -l 4 localhost", "r"); (void) f; diff --git a/samples/bpf/tracex2_user.c b/samples/bpf/tracex2_user.c index 1a81e6a5c2ea..c9544a4ce61a 100644 --- a/samples/bpf/tracex2_user.c +++ b/samples/bpf/tracex2_user.c @@ -131,7 +131,7 @@ int main(int ac, char **argv) signal(SIGTERM, int_exit); /* start 'ping' in the background to have some kfree_skb events */ - f = popen("ping -c5 localhost", "r"); + f = popen("ping -4 -c5 localhost", "r"); (void) f; /* start 'dd' in the background to have plenty of 'write' syscalls */