samples: bpf: force IPv4 in ping

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>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c
index 60ec467c78abf78035f7049e373269d4a211cdc5..00aae1d33fcad09d17a313e87ef02d2216b94f1d 100644 (file)
--- 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 93ec01c56104f4e1771fefc984a7963f2871907a..be8ba568692456f37e8b8ac57f79a6ac19ba5eb7 100644 (file)
--- 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 1d5c6e9a6d2756343ac7261790c46c0769d03df0..125ee6efc913717b1873fa18e6d4b58297a99e2b 100644 (file)
--- 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 9d02e0404719a9156eaaf5a7755da6ac19dacbb8..bbb1cd0666a9bf8e50f0d416afbdbaddf6da814c 100644 (file)
--- 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 1a81e6a5c2ea27b943e9db08a384c7ee4b438159..c9544a4ce61af2c6b1e988ef92811907978e16c3 100644 (file)
--- 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 */