February 2022 - dev

[PATCH] arp, dhcp: Fix strict aliasing warnings reported by gcc 4.9 with -Ofast
by Stefano Brivio 28 Feb '22

28 Feb '22

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- arp.c | 3 ++- dhcp.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arp.c b/arp.c index b5af49f..3195692 100644 --- a/arp.c +++ b/arp.c @@ -58,7 +58,8 @@ int arp(struct ctx *c, struct ethhdr *eh, size_t len) /* Discard announcements (but not 0.0.0.0 "probes"): we might have the * same IP address, hide that. */ - if (*((uint32_t *)&am->sip) && !memcmp(am->sip, am->tip, 4)) + if (memcmp(am->sip, (unsigned char[4]){ 0, 0, 0, 0 }, 4) && + !memcmp(am->sip, am->tip, 4)) return 1; /* Don't resolve our own address, either. */ diff --git a/dhcp.c b/dhcp.c index ab1249c..197a515 100644 --- a/dhcp.c +++ b/dhcp.c @@ -40,9 +40,9 @@ struct opt { int sent; int slen; - unsigned char s[255]; + uint8_t s[255]; int clen; - unsigned char c[255]; + uint8_t c[255]; }; static struct opt opts[255]; @@ -312,9 +312,9 @@ int dhcp(struct ctx *c, struct ethhdr *eh, size_t len) m->chaddr[3], m->chaddr[4], m->chaddr[5]); m->yiaddr = c->addr4; - *(unsigned long *)opts[1].s = c->mask4; - *(unsigned long *)opts[3].s = c->gw4; - *(unsigned long *)opts[54].s = c->gw4; + memcpy(opts[1].s, &c->mask4, sizeof(c->mask4)); + memcpy(opts[3].s, &c->gw4, sizeof(c->gw4)); + memcpy(opts[54].s, &c->gw4, sizeof(c->gw4)); /* If the gateway is not on the assigned subnet, send an option 121 * (Classless Static Routing) adding a dummy route to it. @@ -323,8 +323,8 @@ int dhcp(struct ctx *c, struct ethhdr *eh, size_t len) /* a.b.c.d/32:0.0.0.0, 0:a.b.c.d */ opts[121].slen = 14; opts[121].s[0] = 32; - *(unsigned long *)&opts[121].s[1] = c->gw4; - *(unsigned long *)&opts[121].s[10] = c->gw4; + memcpy(opts[121].s + 1, &c->gw4, sizeof(c->gw4)); + memcpy(opts[121].s + 10, &c->gw4, sizeof(c->gw4)); } if (c->mtu != -1) { -- 2.34.1

1 0

[PATCH v2] passt, pasta: Run-time selection of AVX2 build
by Stefano Brivio 28 Feb '22

28 Feb '22

Build-time selection of AVX2 flags and routines is not practical for distributions, but limiting AVX2 usage to checksum routines with specific run-time detection doesn't allow for easy performance gains from auto-vectorisation of batched packet handling routines. For x86_64, build non-AVX2 and AVX2 binaries, and implement a simple wrapper replacing the current executable with the AVX2 build if it's available, and if AVX2 is supported by the current CPU. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- v2: Add arch.c and arch.h to commit Makefile | 38 ++++++++++++++++++++++++++++---------- README.md | 28 +++++++++++----------------- arch.c | 42 ++++++++++++++++++++++++++++++++++++++++++ arch.h | 6 ++++++ hooks/pre-push | 9 --------- passt.c | 3 +++ test/build/all | 10 ---------- test/demo/passt | 2 +- test/demo/pasta | 2 +- 9 files changed, 92 insertions(+), 48 deletions(-) create mode 100644 arch.c create mode 100644 arch.h diff --git a/Makefile b/Makefile index 031b684..8387719 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,11 @@ ifeq ($(RLIMIT_STACK_VAL),unlimited) RLIMIT_STACK_VAL := 1024 endif -AUDIT_ARCH := $(shell uname -m | tr [a-z] [A-Z]) -AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/^ARM.*/ARM/') +# Get 'uname -m'-like architecture description for target +TARGET_ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d- | tr [a-z] [A-Z]) +TARGET_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/POWERPC/PPC/') + +AUDIT_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/^ARM.*/ARM/') AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/I[456]86/I386/') AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/PPC64/PPC/') AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/PPCLE/PPC64LE/') @@ -25,7 +28,7 @@ CFLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) CFLAGS += -DNETNS_RUN_DIR=\"/run/netns\" CFLAGS += -DPASST_AUDIT_ARCH=AUDIT_ARCH_$(AUDIT_ARCH) CFLAGS += -DRLIMIT_STACK_VAL=$(RLIMIT_STACK_VAL) -CFLAGS += -DARCH=\"$(shell uname -m)\" +CFLAGS += -DARCH=\"$(TARGET_ARCH)\" # On gcc 11.2, with -O2 and -flto, tcp_hash() and siphash_20b(), if inlined, # seem to be hitting something similar to: @@ -63,10 +66,13 @@ endif prefix ?= /usr/local +ifeq ($(TARGET_ARCH),X86_64) +all: passt passt.avx2 pasta pasta.avx2 qrap +BIN := passt passt.avx2 pasta pasta.avx2 qrap +else all: passt pasta qrap - -avx2: CFLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops -avx2: clean all +BIN := passt pasta qrap +endif static: CFLAGS += -static -DGLIBC_NO_STATIC_NSS static: clean all @@ -78,6 +84,16 @@ passt: $(filter-out qrap.c,$(wildcard *.c)) \ $(filter-out qrap.h,$(wildcard *.h)) seccomp.h $(CC) $(CFLAGS) $(filter-out qrap.c,$(wildcard *.c)) -o passt +passt.avx2: CFLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops +passt.avx2: $(filter-out qrap.c,$(wildcard *.c)) \ + $(filter-out qrap.h,$(wildcard *.h)) seccomp.h + $(CC) $(CFLAGS) $(filter-out qrap.c,$(wildcard *.c)) -o passt.avx2 + +passt.avx2: passt + +pasta.avx2: passt.avx2 + ln -s passt.avx2 pasta.avx2 + pasta: passt ln -s passt pasta ln -s passt.1 pasta.1 @@ -88,24 +104,26 @@ qrap: qrap.c passt.h .PHONY: clean clean: - -${RM} passt *.o seccomp.h qrap pasta pasta.1 \ + -${RM} passt passt.avx2 *.o seccomp.h qrap pasta pasta.avx2 pasta.1 \ passt.tar passt.tar.gz *.deb *.rpm -install: passt pasta qrap +install: $(BIN) mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/man/man1 - cp -d passt pasta qrap $(DESTDIR)$(prefix)/bin + cp -d $(BIN) $(DESTDIR)$(prefix)/bin cp -d passt.1 pasta.1 qrap.1 $(DESTDIR)$(prefix)/share/man/man1 uninstall: -${RM} $(DESTDIR)$(prefix)/bin/passt + -${RM} $(DESTDIR)$(prefix)/bin/passt.avx2 -${RM} $(DESTDIR)$(prefix)/bin/pasta + -${RM} $(DESTDIR)$(prefix)/bin/pasta.avx2 -${RM} $(DESTDIR)$(prefix)/bin/qrap -${RM} $(DESTDIR)$(prefix)/share/man/man1/passt.1 -${RM} $(DESTDIR)$(prefix)/share/man/man1/pasta.1 -${RM} $(DESTDIR)$(prefix)/share/man/man1/qrap.1 pkgs: - tar cf passt.tar -P --xform 's//\/usr\/bin\//' passt pasta qrap + tar cf passt.tar -P --xform 's//\/usr\/bin\//' $(BIN) tar rf passt.tar -P --xform 's//\/usr\/share\/man\/man1\//' \ passt.1 pasta.1 qrap.1 gzip passt.tar diff --git a/README.md b/README.md index 14e1777..4966e15 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ speeding up local connections, and usually requiring NAT. _pasta_: * Linux * ✅ starting from 4.18 kernel version * ✅ starting from 3.13 kernel version -* 🛠 build-time selection of AVX2 instructions (as much as possible) +* ✅ run-time selection of AVX2 build * ⌚ [_musl_](https://bugs.passt.top/show_bug.cgi?id=4) and [_uClibc-ng_](https://bugs.passt.top/show_bug.cgi?id=5) * ⌚ [FreeBSD](https://bugs.passt.top/show_bug.cgi?id=6), @@ -467,15 +467,12 @@ Test logs [here](/builds/latest/test/). cd passt make - * alternatively, static builds for x86_64, with or without AVX2 instructions, - as of the latest commit are also available for convenience - [here](/builds/latest/x86_64/avx2/) and - [here](/builds/latest/x86_64/). Convenience, non-official - packages for Debian (and derivatives) and RPM-based distributions are also - available there. These binaries and packages are simply built with: + * alternatively, static builds for x86_64 as of the latest commit are also + available for convenience [here](/builds/latest/x86_64/). Convenience, + non-official packages for Debian (and derivatives) and RPM-based + distributions are also available there. These binaries and packages are + simply built with: - CFLAGS="-static" make avx2 - make pkgs make static make pkgs @@ -530,15 +527,12 @@ Test logs [here](/builds/latest/test/). cd passt make - * alternatively, static builds for x86_64, with or without AVX2 instructions, - as of the latest commit are also available for convenience - [here](/builds/latest/x86_64/avx2/) and - [here](/builds/latest/x86_64/). Convenience, non-official - packages for Debian (and derivatives) and RPM-based distributions are also - available there. These binaries and packages are simply built with: + * alternatively, static builds for x86_64 as of the latest commit are also + available for convenience [here](/builds/latest/x86_64/). Convenience, + non-official packages for Debian (and derivatives) and RPM-based + distributions are also available there. These binaries and packages are + simply built with: - CFLAGS="-static" make avx2 - make pkgs make static make pkgs diff --git a/arch.c b/arch.c new file mode 100644 index 0000000..b8e1db5 --- /dev/null +++ b/arch.c @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + +/* PASST - Plug A Simple Socket Transport + * for qemu/UNIX domain socket mode + * + * PASTA - Pack A Subtle Tap Abstraction + * for network namespace/tap device mode + * + * arch.c - Architecture-specific implementations + * + * Copyright (c) 2022 Red Hat GmbH + * Author: Stefano Brivio <sbrivio(a)redhat.com> + */ + +#include <limits.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +/** + * arch_avx2_exec() - Run AVX2 build if supported, drop suffix from argv[0] + * @argv: Arguments from command line + */ +#ifdef __x86_64__ +void arch_avx2_exec(char **argv) +{ + char *p = strstr(argv[0], ".avx2"); + + if (p) { + *p = 0; + } else if (__builtin_cpu_supports("avx2")) { + char path[PATH_MAX]; + + snprintf(path, PATH_MAX, "%s.avx2", argv[0]); + argv[0] = path; + execve(path, argv, environ); + perror("Can't run AVX2 build, using non-AVX2 version"); + } +} +#else +void arch_avx2_exec(char **argv) { (void)argv; } +#endif diff --git a/arch.h b/arch.h new file mode 100644 index 0000000..ce1c01b --- /dev/null +++ b/arch.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: AGPL-3.0-or-later + * Copyright (c) 2022 Red Hat GmbH + * Author: Stefano Brivio <sbrivio(a)redhat.com> + */ + +void arch_avx2_exec(char **argv); diff --git a/hooks/pre-push b/hooks/pre-push index a3f67f4..6a9b712 100755 --- a/hooks/pre-push +++ b/hooks/pre-push @@ -58,15 +58,6 @@ ssh "${USER_HOST}" "rm -f ${BIN}/*.deb" ssh "${USER_HOST}" "rm -f ${BIN}/*.rpm" scp *.deb *.rpm "${USER_HOST}:${BIN}/" -CFLAGS="-static -DGLIBC_NO_STATIC_NSS" make avx2 -ssh "${USER_HOST}" "mkdir -p ${BIN}/avx2" -scp passt pasta qrap passt.1 pasta.1 qrap.1 "${USER_HOST}:${BIN}/avx2/" - -make pkgs -ssh "${USER_HOST}" "rm -f ${BIN}/avx2/*.deb" -ssh "${USER_HOST}" "rm -f ${BIN}/avx2/*.rpm" -scp *.deb *.rpm "${USER_HOST}:${BIN}/avx2/" - ssh "${USER_HOST}" "mv ${LATEST} ${AWAY}" ssh "${USER_HOST}" "mv ${TEMP} ${LATEST}" ssh "${USER_HOST}" "rm -rf ${AWAY}" diff --git a/passt.c b/passt.c index e7dd108..40d3e57 100644 --- a/passt.c +++ b/passt.c @@ -69,6 +69,7 @@ #include "tap.h" #include "conf.h" #include "pasta.h" +#include "arch.h" #define EPOLL_EVENTS 8 @@ -313,6 +314,8 @@ int main(int argc, char **argv) struct sigaction sa; char *log_name; + arch_avx2_exec(argv); + check_root(); drop_caps(); diff --git a/test/build/all b/test/build/all index 9aa6c61..6043793 100644 --- a/test/build/all +++ b/test/build/all @@ -40,13 +40,3 @@ host CFLAGS="-Werror" make check [ -f passt ] check [ -h pasta ] check [ -f qrap ] - -test Build AVX2 -host make clean -check ! [ -e passt ] -check ! [ -e pasta ] -check ! [ -e qrap ] -host CFLAGS="-Werror" make avx2 -check [ -f passt ] -check [ -h pasta ] -check [ -f qrap ] diff --git a/test/demo/passt b/test/demo/passt index 76aac86..8838363 100644 --- a/test/demo/passt +++ b/test/demo/passt @@ -29,7 +29,7 @@ sleep 1 say and build it. sleep 1 host cd passt -host make avx2 +host make sleep 1 nl diff --git a/test/demo/pasta b/test/demo/pasta index b2dd327..74fca85 100644 --- a/test/demo/pasta +++ b/test/demo/pasta @@ -169,7 +169,7 @@ say more in the "Performance" section below. sleep 3 ns exit passt exit -passt CFLAGS="-g" make avx2 +passt CFLAGS="-g" make sleep 2 passtb perf record -g ./pasta sleep 2 -- 2.34.1

1 0

[PATCH] passt, pasta: Run-time selection of AVX2 build
by Stefano Brivio 28 Feb '22

28 Feb '22

Build-time selection of AVX2 flags and routines is not practical for distributions, but limiting AVX2 usage to checksum routines with specific run-time detection doesn't allow for easy performance gains from auto-vectorisation of batched packet handling routines. For x86_64, build non-AVX2 and AVX2 binaries, and implement a simple wrapper replacing the current executable with the AVX2 build if it's available, and if AVX2 is supported by the current CPU. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- Makefile | 38 ++++++++++++++++++++++++++++---------- README.md | 28 +++++++++++----------------- hooks/pre-push | 9 --------- passt.c | 3 +++ test/build/all | 10 ---------- test/demo/passt | 2 +- test/demo/pasta | 2 +- 7 files changed, 44 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index 031b684..8387719 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,11 @@ ifeq ($(RLIMIT_STACK_VAL),unlimited) RLIMIT_STACK_VAL := 1024 endif -AUDIT_ARCH := $(shell uname -m | tr [a-z] [A-Z]) -AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/^ARM.*/ARM/') +# Get 'uname -m'-like architecture description for target +TARGET_ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d- | tr [a-z] [A-Z]) +TARGET_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/POWERPC/PPC/') + +AUDIT_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/^ARM.*/ARM/') AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/I[456]86/I386/') AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/PPC64/PPC/') AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/PPCLE/PPC64LE/') @@ -25,7 +28,7 @@ CFLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) CFLAGS += -DNETNS_RUN_DIR=\"/run/netns\" CFLAGS += -DPASST_AUDIT_ARCH=AUDIT_ARCH_$(AUDIT_ARCH) CFLAGS += -DRLIMIT_STACK_VAL=$(RLIMIT_STACK_VAL) -CFLAGS += -DARCH=\"$(shell uname -m)\" +CFLAGS += -DARCH=\"$(TARGET_ARCH)\" # On gcc 11.2, with -O2 and -flto, tcp_hash() and siphash_20b(), if inlined, # seem to be hitting something similar to: @@ -63,10 +66,13 @@ endif prefix ?= /usr/local +ifeq ($(TARGET_ARCH),X86_64) +all: passt passt.avx2 pasta pasta.avx2 qrap +BIN := passt passt.avx2 pasta pasta.avx2 qrap +else all: passt pasta qrap - -avx2: CFLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops -avx2: clean all +BIN := passt pasta qrap +endif static: CFLAGS += -static -DGLIBC_NO_STATIC_NSS static: clean all @@ -78,6 +84,16 @@ passt: $(filter-out qrap.c,$(wildcard *.c)) \ $(filter-out qrap.h,$(wildcard *.h)) seccomp.h $(CC) $(CFLAGS) $(filter-out qrap.c,$(wildcard *.c)) -o passt +passt.avx2: CFLAGS += -Ofast -mavx2 -ftree-vectorize -funroll-loops +passt.avx2: $(filter-out qrap.c,$(wildcard *.c)) \ + $(filter-out qrap.h,$(wildcard *.h)) seccomp.h + $(CC) $(CFLAGS) $(filter-out qrap.c,$(wildcard *.c)) -o passt.avx2 + +passt.avx2: passt + +pasta.avx2: passt.avx2 + ln -s passt.avx2 pasta.avx2 + pasta: passt ln -s passt pasta ln -s passt.1 pasta.1 @@ -88,24 +104,26 @@ qrap: qrap.c passt.h .PHONY: clean clean: - -${RM} passt *.o seccomp.h qrap pasta pasta.1 \ + -${RM} passt passt.avx2 *.o seccomp.h qrap pasta pasta.avx2 pasta.1 \ passt.tar passt.tar.gz *.deb *.rpm -install: passt pasta qrap +install: $(BIN) mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/man/man1 - cp -d passt pasta qrap $(DESTDIR)$(prefix)/bin + cp -d $(BIN) $(DESTDIR)$(prefix)/bin cp -d passt.1 pasta.1 qrap.1 $(DESTDIR)$(prefix)/share/man/man1 uninstall: -${RM} $(DESTDIR)$(prefix)/bin/passt + -${RM} $(DESTDIR)$(prefix)/bin/passt.avx2 -${RM} $(DESTDIR)$(prefix)/bin/pasta + -${RM} $(DESTDIR)$(prefix)/bin/pasta.avx2 -${RM} $(DESTDIR)$(prefix)/bin/qrap -${RM} $(DESTDIR)$(prefix)/share/man/man1/passt.1 -${RM} $(DESTDIR)$(prefix)/share/man/man1/pasta.1 -${RM} $(DESTDIR)$(prefix)/share/man/man1/qrap.1 pkgs: - tar cf passt.tar -P --xform 's//\/usr\/bin\//' passt pasta qrap + tar cf passt.tar -P --xform 's//\/usr\/bin\//' $(BIN) tar rf passt.tar -P --xform 's//\/usr\/share\/man\/man1\//' \ passt.1 pasta.1 qrap.1 gzip passt.tar diff --git a/README.md b/README.md index 14e1777..4966e15 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ speeding up local connections, and usually requiring NAT. _pasta_: * Linux * ✅ starting from 4.18 kernel version * ✅ starting from 3.13 kernel version -* 🛠 build-time selection of AVX2 instructions (as much as possible) +* ✅ run-time selection of AVX2 build * ⌚ [_musl_](https://bugs.passt.top/show_bug.cgi?id=4) and [_uClibc-ng_](https://bugs.passt.top/show_bug.cgi?id=5) * ⌚ [FreeBSD](https://bugs.passt.top/show_bug.cgi?id=6), @@ -467,15 +467,12 @@ Test logs [here](/builds/latest/test/). cd passt make - * alternatively, static builds for x86_64, with or without AVX2 instructions, - as of the latest commit are also available for convenience - [here](/builds/latest/x86_64/avx2/) and - [here](/builds/latest/x86_64/). Convenience, non-official - packages for Debian (and derivatives) and RPM-based distributions are also - available there. These binaries and packages are simply built with: + * alternatively, static builds for x86_64 as of the latest commit are also + available for convenience [here](/builds/latest/x86_64/). Convenience, + non-official packages for Debian (and derivatives) and RPM-based + distributions are also available there. These binaries and packages are + simply built with: - CFLAGS="-static" make avx2 - make pkgs make static make pkgs @@ -530,15 +527,12 @@ Test logs [here](/builds/latest/test/). cd passt make - * alternatively, static builds for x86_64, with or without AVX2 instructions, - as of the latest commit are also available for convenience - [here](/builds/latest/x86_64/avx2/) and - [here](/builds/latest/x86_64/). Convenience, non-official - packages for Debian (and derivatives) and RPM-based distributions are also - available there. These binaries and packages are simply built with: + * alternatively, static builds for x86_64 as of the latest commit are also + available for convenience [here](/builds/latest/x86_64/). Convenience, + non-official packages for Debian (and derivatives) and RPM-based + distributions are also available there. These binaries and packages are + simply built with: - CFLAGS="-static" make avx2 - make pkgs make static make pkgs diff --git a/hooks/pre-push b/hooks/pre-push index a3f67f4..6a9b712 100755 --- a/hooks/pre-push +++ b/hooks/pre-push @@ -58,15 +58,6 @@ ssh "${USER_HOST}" "rm -f ${BIN}/*.deb" ssh "${USER_HOST}" "rm -f ${BIN}/*.rpm" scp *.deb *.rpm "${USER_HOST}:${BIN}/" -CFLAGS="-static -DGLIBC_NO_STATIC_NSS" make avx2 -ssh "${USER_HOST}" "mkdir -p ${BIN}/avx2" -scp passt pasta qrap passt.1 pasta.1 qrap.1 "${USER_HOST}:${BIN}/avx2/" - -make pkgs -ssh "${USER_HOST}" "rm -f ${BIN}/avx2/*.deb" -ssh "${USER_HOST}" "rm -f ${BIN}/avx2/*.rpm" -scp *.deb *.rpm "${USER_HOST}:${BIN}/avx2/" - ssh "${USER_HOST}" "mv ${LATEST} ${AWAY}" ssh "${USER_HOST}" "mv ${TEMP} ${LATEST}" ssh "${USER_HOST}" "rm -rf ${AWAY}" diff --git a/passt.c b/passt.c index e7dd108..40d3e57 100644 --- a/passt.c +++ b/passt.c @@ -69,6 +69,7 @@ #include "tap.h" #include "conf.h" #include "pasta.h" +#include "arch.h" #define EPOLL_EVENTS 8 @@ -313,6 +314,8 @@ int main(int argc, char **argv) struct sigaction sa; char *log_name; + arch_avx2_exec(argv); + check_root(); drop_caps(); diff --git a/test/build/all b/test/build/all index 9aa6c61..6043793 100644 --- a/test/build/all +++ b/test/build/all @@ -40,13 +40,3 @@ host CFLAGS="-Werror" make check [ -f passt ] check [ -h pasta ] check [ -f qrap ] - -test Build AVX2 -host make clean -check ! [ -e passt ] -check ! [ -e pasta ] -check ! [ -e qrap ] -host CFLAGS="-Werror" make avx2 -check [ -f passt ] -check [ -h pasta ] -check [ -f qrap ] diff --git a/test/demo/passt b/test/demo/passt index 76aac86..8838363 100644 --- a/test/demo/passt +++ b/test/demo/passt @@ -29,7 +29,7 @@ sleep 1 say and build it. sleep 1 host cd passt -host make avx2 +host make sleep 1 nl diff --git a/test/demo/pasta b/test/demo/pasta index b2dd327..74fca85 100644 --- a/test/demo/pasta +++ b/test/demo/pasta @@ -169,7 +169,7 @@ say more in the "Performance" section below. sleep 3 ns exit passt exit -passt CFLAGS="-g" make avx2 +passt CFLAGS="-g" make sleep 2 passtb perf record -g ./pasta sleep 2 -- 2.34.1

1 0

[PATCH] test/distro/opensuse: Add Tumbleweed armv7l test
by Stefano Brivio 28 Feb '22

28 Feb '22

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- test/distro/opensuse | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/test/distro/opensuse b/test/distro/opensuse index 6e29b45..a2c0944 100644 --- a/test/distro/opensuse +++ b/test/distro/opensuse @@ -152,6 +152,35 @@ hint sleep 1 +test OpenSUSE Tumbleweed armv7l + +temp IMG +temp ZIMAGE +temp INITRD +host wget http://download.opensuse.org/ports/armv7hl/tumbleweed/appliances/openSUSE-T… -O - | xz -d > __IMG__ +host guestfish -a __IMG__ -i download /boot/zImage __ZIMAGE__ +host guestfish -a __IMG__ -i download /boot/initrd __INITRD__ +host virt-edit -a __IMG__ -m /dev/sda3 /usr/lib/systemd/system/serial-getty@.service -e 's/ExecStart=.*/ExecStart=\/sbin\/agetty --timeout 5000 --autologin root -i -8 --keep-baud 115200,38400,9600 %I $TERM/g' +host guestfish --rw -a __IMG__ -i copy-in __GUEST_FILES__ /root/ + +host ./qrap 5 qemu-system-arm -M virt -m 1024 -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none -kernel __ZIMAGE__ -initrd __INITRD__ -append 'root=/dev/sda3' -drive if=none,file=__IMG__,format=raw,id=hd,media=disk -device virtio-scsi-device -device scsi-hd,drive=hd -netdev socket,fd=5,id=passt -device virtio-net-device,netdev=passt +host PS1='$ ' +host ip link set eth0 up +sleep 10 +host echo "DNSSERVERS='__DNS6__'" | netconfig modify -s dns_resolver -i eth0 +sleep 10 +host zypper install -y gcc make netcat-openbsd; echo + +host make clean +hout RET CFLAGS="-Werror" make; echo $? +check [ __RET__ -eq 0 ] + +distro_quick_pasta_test + +hint +sleep 1 + + test OpenSUSE Tumbleweed temp IMG -- 2.34.1

1 0

[PATCH] test/lib/term: Don't run demo when started as ./run
by Stefano Brivio 28 Feb '22

28 Feb '22

I changed this in a previous commit by mistake, restore the original command. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- test/lib/term | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lib/term b/test/lib/term index 205a6a9..c92d8bd 100755 --- a/test/lib/term +++ b/test/lib/term @@ -554,7 +554,7 @@ run_term() { asciinema rec --overwrite demo.uncut -c 'tmux new-session -s passt_test ./run_demo from_term' video_postprocess demo.uncut else - tmux new-session -s passt_test ./run_demo from_term + tmux new-session -s passt_test ./run from_term fi } -- 2.34.1

1 0

[PATCH] seccomp, tcp: Add fcntl64 to pasta syscalls for armv6l, armv7l
by Stefano Brivio 28 Feb '22

28 Feb '22

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcp.c b/tcp.c index a3a9dfd..4dc9750 100644 --- a/tcp.c +++ b/tcp.c @@ -304,7 +304,7 @@ * - SPLICE_FIN_TO: FIN (EPOLLRDHUP) seen from connected socket * - SPLICE_FIN_BOTH: FIN (EPOLLRDHUP) seen from both sides * - * #syscalls:pasta pipe2|pipe fcntl ppc64:fcntl64 + * #syscalls:pasta pipe2|pipe fcntl armv6l:fcntl64 armv7l:fcntl64 ppc64:fcntl64 */ #include <sched.h> -- 2.34.1

1 0

[PATCH] hooks/pre-push: Keep original cast on gzip, fix uploading with dash
by Stefano Brivio 28 Feb '22

28 Feb '22

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- hooks/pre-push | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/pre-push b/hooks/pre-push index 69bbd18..a3f67f4 100755 --- a/hooks/pre-push +++ b/hooks/pre-push @@ -40,8 +40,9 @@ scp test_logs/* "${USER_HOST}:${TEST}/" ./run_demo for cast in ci demo_pasta demo_podman demo_passt; do - gzip -9 "${cast}.cast" - scp "${cast}.cast"{,.gz} "${USER_HOST}:${WEB}/" + gzip -fk9 "${cast}.cast" + scp "${cast}.cast" "${USER_HOST}:${WEB}/" + scp "${cast}.cast.gz" "${USER_HOST}:${WEB}/" done cd .. -- 2.34.1

1 0

[PATCH] demo/pasta: Exit namespace in 'ns' pane before restarting pasta
by Stefano Brivio 28 Feb '22

28 Feb '22

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- test/demo/pasta | 1 + 1 file changed, 1 insertion(+) diff --git a/test/demo/pasta b/test/demo/pasta index c136965..b2dd327 100644 --- a/test/demo/pasta +++ b/test/demo/pasta @@ -167,6 +167,7 @@ say Let's have a (quick!) look at performance nl say more in the "Performance" section below. sleep 3 +ns exit passt exit passt CFLAGS="-g" make avx2 sleep 2 -- 2.34.1

1 0

[PATCH 0/7] Fixes for armv6l, armv7l, and warnings on some gcc flags
by Stefano Brivio 26 Feb '22

26 Feb '22

This series fixes issues and warnings I spotted in Martin's build logs for OpenSUSE on armv6l and armv7l (patches 1/7 to 3/7). I couldn't find (yet) a convenient way to add armv6l and armv7l OpenSUSE builds to the tests using qemu TCG (suggestions welcome!) so I tried things out on a Raspberry Pi Zero and a Raspberry Pi 4 for the moment being -- patches 4/7 to 7/7 fix the other issues I hit there. Stefano Brivio (7): passt: Explicitly check return value of chdir() udp: Explicitly initialise sin6_scope_id and sin_zero in sockaddr_in{,6} seccomp.sh: Handle syscall number defines in the (x + y) form tap: Cast ETH_MAX_MTU to signed in comparisons Makefile: Fix up AUDIT_ARCH for armv6l, armv7l passt: Don't warn on failed madvise() seccomp: Adjust list of allowed syscalls for armv6l, armv7l Makefile | 1 + passt.c | 15 +++++++++------ pasta.c | 3 ++- seccomp.sh | 3 +++ tap.c | 4 ++-- udp.c | 2 ++ util.c | 3 ++- 7 files changed, 21 insertions(+), 10 deletions(-) -- 2.34.1

1 7

[PATCH 1/2] passt.1: Drop duplicate --dns section
by Stefano Brivio 25 Feb '22

25 Feb '22

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- passt.1 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/passt.1 b/passt.1 index 1e7cf1a..57cf745 100644 --- a/passt.1 +++ b/passt.1 @@ -171,14 +171,6 @@ configured (see options \fB--no-dhcp-dns\fR, \fB--dhcp-dns\fR, This option can be specified multiple times, and a single, empty option disables usage of DNS addresses altogether. -.TP -.BR \-D ", " \-\-dns " " \fIaddr -Use \fIaddr\fR (IPv4 or IPv6) for DHCP, DHCPv6, NDP or DNS forwarding, as -configured (see options \fB--no-dhcp-dns\fR, \fB--dhcp-dns\fR, -\fB--dns-forward\fR) instead of reading addresses from \fI/etc/resolv.conf\fR. -This option can be specified multiple times, and a single, empty option disables -usage of DNS addresses altogether. - .TP .BR \-\-dns-forward " " \fIaddr Map \fIaddr\fR (IPv4 or IPv6) as seen from guest or namespace to the first @@ -440,9 +432,7 @@ The default path is shown with --help. .TP .BR \-\-config-net Configure networking in the namespace: set up addresses and routes as configured -or sourced from the host, and bring up the tap interface. This option implies -\fB--no-ra\fR: the static configuration of the IPv6 address will not allow the -kernel to set up the default route using SLAAC. +or sourced from the host, and bring up the tap interface. .TP .BR \-\-ns-mac-addr " " \fIaddr -- 2.34.1

1 1

2023

2022

2021

dev February 2022