October 2023 - dev

[PATCH v2 0/3] Some improvements to log functions
by David Gibson 07 Nov '23

07 Nov '23

Several small improvements to the logging functions. Changes since v1: * Added printf warning attributes * Added vlogmsg() David Gibson (3): log: Don't define logging function 4 times log: Enable format warnings log: Add vlogmsg() Makefile | 3 ++- conf.c | 2 +- log.c | 72 +++++++++++++++++++++++++++++--------------------------- log.h | 14 +++++++---- packet.c | 7 +++--- pasta.c | 2 +- tcp.c | 13 ++++++---- 7 files changed, 63 insertions(+), 50 deletions(-) -- 2.41.0

2 5

[PATCH] tcp: Remove remaining declaration of tcp_l2_mh
by Laurent Vivier 07 Nov '23

07 Nov '23

Use of tcp_l2_mh has been removed in commit 38fbfdbcb95d, but its declaration and initialization are always in the code. Remove them as they are useless. Fixes: 38fbfdbcb95d ("tcp: Get rid of iov with cached MSS, drop sendmmsg(), add deferred flush") Cc: sbrivio(a)redhat.com Signed-off-by: Laurent Vivier <lvivier(a)redhat.com> --- tcp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tcp.c b/tcp.c index 945023c5b442..386cd015be1c 100644 --- a/tcp.c +++ b/tcp.c @@ -515,8 +515,6 @@ static struct iovec tcp6_l2_iov [TCP_FRAMES_MEM]; static struct iovec tcp4_l2_flags_iov [TCP_FRAMES_MEM]; static struct iovec tcp6_l2_flags_iov [TCP_FRAMES_MEM]; -static struct mmsghdr tcp_l2_mh [TCP_FRAMES_MEM]; - /* sendmsg() to socket */ static struct iovec tcp_iov [UIO_MAXIOV]; @@ -3143,7 +3141,6 @@ static void tcp_sock_refill_init(const struct ctx *c) */ int tcp_init(struct ctx *c) { - int i; #ifndef HAS_GETRANDOM int dev_random = open("/dev/random", O_RDONLY); unsigned int random_read = 0; @@ -3172,9 +3169,6 @@ int tcp_init(struct ctx *c) exit(EXIT_FAILURE); } - for (i = 0; i < ARRAY_SIZE(tcp_l2_mh); i++) - tcp_l2_mh[i] = (struct mmsghdr) { .msg_hdr.msg_iovlen = 1 }; - if (c->ifi4) tcp_sock4_iov_init(c); -- 2.41.0

3 2

[PATCH 00/11] tcp_splice: Better exploit symmetry between sides of connection
by David Gibson 06 Nov '23

06 Nov '23

For spliced connections, both "sides" are sockets, and for many purposes how we deal with each side is symmetric. Currently, however, we track the information for each side in independent fields in the structure, meaning we can't easily exploit that symmetry. This makes a number of reorganizations of the tcp splice code so that we can explot that symmetry to reduce code size. This will have some additional advantages when we come to integrate with the in-progress unified flow table. Based on top of the interface identifiers and automatic forwarding cleanup series. David Gibson (11): tcp_splice: Remove redundant tcp_splice_epoll_ctl() tcp_splice: Correct error handling in tcp_splice_epoll_ctl() tcp_splice: Don't handle EPOLL_CTL_DEL as part of tcp_splice_epoll_ctl() tcp_splice: Remove unnecessary forward declaration tcp_splice: Avoid awkward temporaries in tcp_splice_epoll_ctl() tcp_splice: Don't pool pipes in pairs tcp_splice: Rename sides of connection from a/b to 0/1 tcp_splice: Exploit side symmetry in tcp_splice_timer() tcp_splice: Exploit side symmetry in tcp_splice_connect_finish() tcp_splice: Exploit side symmetry in tcp_splice_destroy() tcp_splice: Simplify selection of socket and pipe sides in socket handler tcp_conn.h | 45 +++--- tcp_splice.c | 389 +++++++++++++++++++++------------------------------ 2 files changed, 179 insertions(+), 255 deletions(-) -- 2.41.0

2 22

[PATCH 0/4] Passt Interface Identifiers
by David Gibson 04 Nov '23

04 Nov '23

For the generalisations to forwarding we want to accomplish with the flow table, we will need a more formalised notion of passt "interfaces" - that is way that passt communicates with network, whether that be over L4 sockets (as on the host) or via an L2 tunnel. This series makes a small start on this, by introducing a type to identify passt interfaces. We don't use it for a whole lot yet, but it will become more useful in future. David Gibson (4): udp: Clean up ref initialisation in udp_sock_init() pif: Introduce notion of passt/pasta interface pif: Record originating pif in listening socket refs pif: Pass originating pif to tap handler functions Makefile | 2 +- icmp.c | 4 +++- icmp.h | 4 ++-- passt.h | 1 + pif.h | 36 ++++++++++++++++++++++++++++++++++++ tap.c | 26 ++++++++++++++++---------- tcp.c | 11 ++++++++--- tcp.h | 7 ++++--- tcp_splice.c | 10 ++++++---- udp.c | 35 ++++++++++++++++++----------------- udp.h | 11 ++++++----- 11 files changed, 101 insertions(+), 46 deletions(-) create mode 100644 pif.h -- 2.41.0

2 6

[PATCH 0/9] Clean ups to automatic port forwarding
by David Gibson 03 Nov '23

03 Nov '23

This contains an assortment of cleanups to the code supporting the automatic port forwarding more for past - specifically get_bound_ports() and related functions. This shouldn't mae any functional changes. Based on the series with fixes for new cppcheck-2.12 warnings. David Gibson (9): conf: Cleaner initialisation of default forwarding modes port_fwd: Move automatic port forwarding code to port_fwd.[ch] port_fwd: Better parameterise procfs_scan_listen() util: Add open_in_ns() helper port_fwd: Pre-open /proc/net/* files rather than on-demand port_fwd: Don't NS_CALL get_bound_ports() port_fwd: Split TCP and UDP cases for get_bound_ports() port_fwd: Move port scanning /proc fds into struct port_fwd port_fwd: Simplify get_bound_ports_*() to port_fwd_scan_*() Makefile | 2 +- conf.c | 113 +++++-------------------------------------- conf.h | 1 - passt.h | 5 -- port_fwd.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++ port_fwd.h | 9 ++++ tcp.c | 39 +-------------- util.c | 104 +++++++++++++++------------------------ util.h | 3 +- 9 files changed, 204 insertions(+), 211 deletions(-) create mode 100644 port_fwd.c -- 2.41.0

2 13

[PATCH] log: Don't define logging function 4 times
by David Gibson 13 Oct '23

13 Oct '23

In log.c we use a macro to define logging functions for each of 4 priority levels. The only difference between these is the priority we pass to vsyslog() and similar functions. Because it's done as a macro, however, the entire functions code is included in the binary 4 times. Rearrange this to take the priority level as a parameter to a regular function, then just use macros to define trivial wrappers which pass the priority level. This saves about 600 bytes of text in the executable (x86, non-AVX2). Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> --- log.c | 65 +++++++++++++++++++++++++++-------------------------------- log.h | 12 +++++++---- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/log.c b/log.c index c57bc8d..fd33f64 100644 --- a/log.c +++ b/log.c @@ -47,36 +47,36 @@ int log_to_stdout; /* Print to stdout instead of stderr */ #define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG)) -#define logfn(name, level) \ -void name(const char *format, ...) { \ - FILE *out = log_to_stdout ? stdout : stderr; \ - struct timespec tp; \ - va_list args; \ - \ - if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \ - clock_gettime(CLOCK_REALTIME, &tp); \ - fprintf(out, "%lli.%04lli: ", \ - (long long int)tp.tv_sec - log_start, \ - (long long int)tp.tv_nsec / (100L * 1000)); \ - } \ - \ - if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \ - va_start(args, format); \ - if (log_file != -1) \ - logfile_write(level, format, args); \ - else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG))) \ - passt_vsyslog(level, format, args); \ - va_end(args); \ - } \ - \ - if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \ - (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) { \ - va_start(args, format); \ - (void)vfprintf(out, format, args); \ - va_end(args); \ - if (format[strlen(format)] != '\n') \ - fprintf(out, "\n"); \ - } \ +void logmsg(int pri, const char *format, ...) +{ + FILE *out = log_to_stdout ? stdout : stderr; + struct timespec tp; + va_list args; + + if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { + clock_gettime(CLOCK_REALTIME, &tp); + fprintf(out, "%lli.%04lli: ", + (long long int)tp.tv_sec - log_start, + (long long int)tp.tv_nsec / (100L * 1000)); + } + + if ((LOG_MASK(LOG_PRI(pri)) & log_mask) || BEFORE_DAEMON) { + va_start(args, format); + if (log_file != -1) + logfile_write(pri, format, args); + else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG))) + passt_vsyslog(pri, format, args); + va_end(args); + } + + if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || + (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) { + va_start(args, format); + (void)vfprintf(out, format, args); + va_end(args); + if (format[strlen(format)] != '\n') + fprintf(out, "\n"); + } } /* Prefixes for log file messages, indexed by priority */ @@ -89,11 +89,6 @@ const char *logfile_prefix[] = { " ", /* LOG_DEBUG */ }; -logfn(err, LOG_ERR) -logfn(warn, LOG_WARNING) -logfn(info, LOG_INFO) -logfn(debug,LOG_DEBUG) - /** * trace_init() - Set log_trace depending on trace (debug) mode * @enable: Tracing debug mode enabled if non-zero diff --git a/log.h b/log.h index a17171a..b4fb7e9 100644 --- a/log.h +++ b/log.h @@ -6,14 +6,18 @@ #ifndef LOG_H #define LOG_H +#include <syslog.h> + #define LOGFILE_SIZE_DEFAULT (1024 * 1024UL) #define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */ #define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE)) -void err(const char *format, ...); -void warn(const char *format, ...); -void info(const char *format, ...); -void debug(const char *format, ...); +void logmsg(int pri, const char *format, ...); + +#define err(...) logmsg(LOG_ERR, __VA_ARGS__) +#define warn(...) logmsg(LOG_WARNING, __VA_ARGS__) +#define info(...) logmsg(LOG_INFO, __VA_ARGS__) +#define debug(...) logmsg(LOG_DEBUG, __VA_ARGS__) #define die(...) \ do { \ -- 2.41.0

1 1

[PATCH] arp: only send ARP replies for --gateway address
by Nikolay Edigaryev 12 Oct '23

12 Oct '23

Problem: when passt/pasta are working in a broadcast domain with more than one host machine, it will answer for all of these machines, except for the one having --address. This is akin to ARP spoofing and breaks connection with these machines if passt/pasta ARP reply arrives before the original one. Solution: only be responsible and send ARP replies for the --gateway's address. --- arp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arp.c b/arp.c index a35c1b6..f873491 100644 --- a/arp.c +++ b/arp.c @@ -67,8 +67,8 @@ int arp(const struct ctx *c, const struct pool *p) !memcmp(am->sip, am->tip, sizeof(am->sip))) return 1; - /* Don't resolve our own address, either. */ - if (!memcmp(am->tip, &c->ip4.addr, sizeof(am->tip))) + /* Don't resolve anything but gateway address. */ + if (memcmp(am->tip, &c->ip4.gw, sizeof(am->tip)) != 0) return 1; ah->ar_op = htons(ARPOP_REPLY); -- 2.39.2 (Apple Git-144)

3 5

passt: new version 2023_10_04.f851084 available
by Stefano Brivio 10 Oct '23

10 Oct '23

The new version with tag 2023_10_04.f851084 includes the following changes: f851084 dhcp: put option 53 at the beginning a469fc3 tcp, tap: Don't increase tap-side sequence counter for dropped frames d3192f6 tcp: Force TCP_WINDOW_CLAMP before resetting STALLED flag feaeb49 tcp: Fix comment to tcp_sock_consume() 117b474 cppcheck: Work around bug in cppcheck 2.12.0 8640d62 cppcheck: Use "exhaustive" level checking when available c0efa4e conf: Remove overly cryptic selection of forward table 6471c7d cppcheck: Make many pointers const fc8f0f8 siphash: Use incremental rather than all-at-once siphash functions 04b10a8 siphash, checksum: Move TBAA explanation to checksum.c ceae842 siphash: Make internal helpers public cbc84df siphash: Use specific structure for internal state fcec3f6 siphash: Use more hygienic state initialiser 5cc8435 siphash: Fix bug in state initialisation 831067f siphash: Clean up hash finalisation with posthash_final() function 7a3153c siphash: Add siphash_feed() helper f7b2be2 siphash: Make sip round calculations an inline function rather than macro ca6e947 siphash: Make siphash functions consistently return 64-bit results c1d2a07 util: Consolidate and improve workarounds for clang-tidy issue 58992 5b6c68c Avoid shadowing index(3) 9178a9e tcp: Always send an ACK segment once the handshake is completed c090692 dhcp: Actually note down the length of options received by the client 8b8537d dhcpv6: Properly separate domain names in search list https://passt.top/passt/log/?qt=range&q=2023_09_08.05627dc..2023_10_04.f851… Packages: - Arch Linux: https://www.archlinux.org/packages/extra/x86_64/passt/ https://archlinuxarm.org/packages/aarch64/passt https://archlinuxarm.org/packages/armv7h/passt - Debian tracker: https://tracker.debian.org/pkg/passt - Copr (CentOS Stream, EPEL, Fedora, Mageia, openSUSE): https://copr.fedorainfracloud.org/coprs/sbrivio/passt/build/6497040/ permanent mirror: https://passt.top/builds/copr/0^20231004.gf851084/ - Fedora updates: https://bodhi.fedoraproject.org/updates/?packages=passt - Ubuntu tracker: https://launchpad.net/ubuntu/+source/passt - Void Linux: https://voidlinux.org/packages/?q=passt - Static builds: - Package for other RPM-based distributions, x86_64 only: https://passt.top/builds/latest/x86_64/passt-gf851084-1.x86_64.rpm - x86_64 static binaries: https://passt.top/builds/latest/x86_64/ - Debian package, from x86_64 static build: https://passt.top/builds/latest/x86_64/passt_0f851084-1_all.deb -- Stefano

1 0

[PATCH RFT 0/5] Fixes and a workaround for TCP stalls with small buffers
by Stefano Brivio 05 Oct '23

05 Oct '23

The fundamental patch here is 3/5, which is a workaround for a rather surprising kernel behaviour we seem to be hitting. This all comes from the investigation around https://bugs.passt.top/show_bug.cgi?id=74. I can't hit stalls anymore and throughput looks finally good to me (~3.5gbps with 208 KiB rmem_max and wmem_max), but... please test. Stefano Brivio (5): tcp: Fix comment to tcp_sock_consume() tcp: Reset STALLED flag on ACK only, check for pending socket data tcp: Force TCP_WINDOW_CLAMP before resetting STALLED flag tcp, tap: Don't increase tap-side sequence counter for dropped frames passt.1: Add note about tuning rmem_max and wmem_max for throughput passt.1 | 33 +++++++++++++++++++++++++ tap.c | 10 +++++--- tap.h | 2 +- tcp.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 102 insertions(+), 17 deletions(-) -- 2.39.2

2 31

[PATCH] dhcp: put option 53 at the beginning
by Stas Sergeev 05 Oct '23

05 Oct '23

... unless it is listed in 55. Many clients expect option 53 at the beginning. mTCP has this code: if ( resp->options[0] != 53 ) { TRACE_WARN(( "Dhcp: first option was not a Dhcp msg type\n" )); return; } wattcp32 has this: static int DHCP_is_ack (void) { const BYTE *opt = (const BYTE*) &dhcp_in.dh_opt[4]; return (opt[0] == DHCP_OPT_MSG_TYPE && opt[1] == 1 && opt[2] == DHCP_ACK); } static int DHCP_is_nack (void) { const BYTE *opt = (const BYTE*) &dhcp_in.dh_opt[4]; return (opt[0] == DHCP_OPT_MSG_TYPE && opt[1] == 1 && opt[2] == DHCP_NAK); } Link: https://bugs.passt.top/show_bug.cgi?id=77 Signed-off-by: Stas Sergeev <stsp2(a)yandex.ru> --- dhcp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dhcp.c b/dhcp.c index 46c258e..eed1b4a 100644 --- a/dhcp.c +++ b/dhcp.c @@ -149,6 +149,12 @@ static int fill(struct msg *m) for (o = 0; o < 255; o++) opts[o].sent = 0; + /* Some clients (wattcp32, mTCP, maybe some other) expect + * options 53 at the beginning of the list. + * Put it there explicitly, unless requested via option 55. + */ + if (!memchr(opts[55].c, 53, opts[55].clen)) + fill_one(m, 53, &offset); for (i = 0; i < opts[55].clen; i++) { o = opts[55].c[i]; if (opts[o].slen) -- 2.40.1

2 1