Skip to content

Instantly share code, notes, and snippets.

diff --git a/tools/testing/selftests/bpf/config.s390x b/tools/testing/selftests/bpf/config.s390x
index 706931a8c2c6..67bfd62b0b58 100644
--- a/tools/testing/selftests/bpf/config.s390x
+++ b/tools/testing/selftests/bpf/config.s390x
@@ -23,11 +23,11 @@ CONFIG_CPUSETS=y
CONFIG_CRASH_DUMP=y
CONFIG_CRYPTO_USER_API_RNG=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_DEBUG_ATOMIC_SLEEP=n
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index a38a3001527c..af68528cc944 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -304,7 +304,7 @@ $(OUTPUT)/test_maps: $(TESTING_HELPERS)
$(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) $(UNPRIV_HELPERS)
$(OUTPUT)/xsk.o: $(BPFOBJ)
-BPFTOOL ?= $(DEFAULT_BPFTOOL)
+BPFTOOL ?= $(TRUNNER_BPFTOOL)
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index a38a3001527c..a403a9d5c529 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -171,7 +171,8 @@ INCLUDE_DIR := $(SCRATCH_DIR)/include
BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a
ifneq ($(CROSS_COMPILE),)
HOST_BUILD_DIR := $(BUILD_DIR)/host
-HOST_SCRATCH_DIR := $(OUTPUT)/host-tools
+#HOST_SCRATCH_DIR := $(OUTPUT)/host-tools
--- /proc/self/fd/11 2024-02-03 10:33:26.929093331 -0800
+++ /proc/self/fd/19 2024-02-03 10:33:26.929093331 -0800
@@ -1535763,14 +1535763,14 @@
0176f120: 7500 7a70 6369 5f67 6574 5f69 6f6d 6d75 u.zpci_get_iommu
0176f130: 5f63 7472 7300 7a70 6369 5f69 6e69 745f _ctrs.zpci_init_
0176f140: 696f 6d6d 7500 2e64 6174 612e 2e70 6572 iommu..data..per
-0176f150: 6370 7500 0000 a1f1 0000 0002 0000 0001 cpu.............
+0176f150: 6370 7500 0000 a1f1 0000 0002 0100 0000 cpu.............
0176f160: 0001 3605 0000 0020 0001 360a 0000 0000 ..6.... ..6.....
0176f170: 0000 03ef 0000 00a4 0000 0008 0000 e6f3 ................
--- /proc/self/fd/11 2024-02-03 00:08:29.714729201 -0800
+++ /proc/self/fd/19 2024-02-03 00:08:29.714729201 -0800
@@ -1535763,15 +1535763,15 @@
0176f120: 7500 7a70 6369 5f67 6574 5f69 6f6d 6d75 u.zpci_get_iommu
0176f130: 5f63 7472 7300 7a70 6369 5f69 6e69 745f _ctrs.zpci_init_
0176f140: 696f 6d6d 7500 2e64 6174 612e 2e70 6572 iommu..data..per
-0176f150: 6370 7500 0000 a1f1 0000 0002 0000 0001 cpu.............
-0176f160: 0001 3605 0000 0020 0001 360a 0000 0000 ..6.... ..6.....
+0176f150: 6370 7500 0000 a1f1 0000 0002 0100 0000 cpu.............
+0176f160: 0001 3605 2000 0000 0001 360a 0000 0000 ..6. .....6.....
diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
index b5b9e74b1044..f27e411baeff 100644
--- a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
+++ b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c
@@ -145,7 +145,9 @@ static int expect_icmp(char *buf, ssize_t len)
if (len < (ssize_t)sizeof(*eth))
return -1;
- if (eth->h_proto == htons(ETH_P_IP))
+ int proto = ntohs(eth->h_proto);
diff --git a/src/qemu.rs b/src/qemu.rs
index b54d952..b8a7b81 100644
--- a/src/qemu.rs
+++ b/src/qemu.rs
@@ -926,7 +926,13 @@ impl Qemu {
/// Boot the VM and connect to QGA
///
/// Returns the child process and QGA wrapper on success, an error otherwise.
- fn boot_vm(&mut self) -> Result<(Child, QgaWrapper, Qmp<QmpUnixStream>)> {
+ fn boot_vm(
commit 7f655a473c64a80094f94e06541a8ab25a218643
Author: Manu Bretelle <chantr4@gmail.com>
Date: Tue Jan 16 22:56:29 2024 -0800
run_command: wait for command to run indefinitely
Signed-off-by: Manu Bretelle <chantr4@gmail.com>
diff --git a/src/qemu.rs b/src/qemu.rs
index 83b9132..671e17c 100644
[ 73%] Built target clang_frontend-objects
[ 73%] Linking CXX static library libclang_frontend.a
[ 73%] Built target clang_frontend
[ 73%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bpf_module.cc.o
[ 74%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_common.cc.o
[ 74%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/exported_files.cc.o
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_debug.cc.o
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-static.dir/bcc_btf.cc.o
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/bcc_common.cc.o
[ 75%] Building CXX object src/cc/CMakeFiles/bcc-shared.dir/link_all.cc.o
$ diff -riN tcp/zerocopy/fastopen-client.pkt tcp/zerocopy/fastopen-client-wscale-wildcard.pkt
--- tcp/zerocopy/fastopen-client.pkt 2023-06-27 18:36:22.956369457 -0700
+++ tcp/zerocopy/fastopen-client-wscale-wildcard.pkt 2023-06-27 18:37:29.306312093 -0700
@@ -14,7 +14,7 @@
+0 fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0
+0 setsockopt(3, SOL_SOCKET, SO_ZEROCOPY, [1], 4) = 0
+0 sendto(3, ..., 500, MSG_FASTOPEN|MSG_ZEROCOPY, ..., ...) = -1 EINPROGRESS (Operation now in progress)
- +0 > S 0:0(0) <mss 1460,sackOK,TS val 1000 ecr 0,nop,wscale 8,FO,nop,nop>
+ +0 > S 0:0(0) <mss 1460,sackOK,TS val 1000 ecr 0,nop,wscale *,FO,nop,nop>
+.01 < S. 123:123(0) ack 1 win 14600 <mss 940,TS val 2000 ecr 1000,sackOK,nop,wscale 6, FO abcd1234,nop,nop>