- dev - passt

[PATCH v2 0/4] Fix several small errors in log time handling
by David Gibson 07 Aug '24

07 Aug '24

While working on the deduplication of clock_gettime() in the logging code, I noticed a few other minor issues. Changes since v1: * Dropped merged change making logfile_write() static * Handle errors from clock_gettime() * Added fixes for some additional problems I noticed David Gibson (4): util: Some corrections for timespec_diff_us log: Correct formatting of timestamps log: Handle errors from clock_gettime() log: Avoid duplicate calls to logtime() log.c | 70 ++++++++++++++++++++++++++++++++++++++++------------------ util.c | 4 ++-- util.h | 2 +- 3 files changed, 52 insertions(+), 24 deletions(-) -- 2.45.2

2 7

[PATCH] passt, util: Close any open file that the parent might have leaked
by Stefano Brivio 07 Aug '24

07 Aug '24

If a parent accidentally or due to implementation reasons leaks any open file, we don't want to have access to them, except for the file passed via --fd, if any. This is the case for Podman when Podman's parent leaks files into Podman: it's not practical for Podman to close unrelated files before starting pasta, as reported by Paul. Use close_range(2) to close all open files except for standard streams and the one from --fd. Given that parts of conf() depend on other files to be already opened, such as the epoll file descriptor, we can't easily defer this to a more convenient point, where --fd was already parsed. Introduce a minimal, duplicate version of --fd parsing to keep this simple. Suggested-by: Paul Holzinger <pholzing(a)redhat.com> Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- conf.c | 1 + passt.c | 2 ++ util.c | 36 ++++++++++++++++++++++++++++++++++++ util.h | 1 + 4 files changed, 40 insertions(+) diff --git a/conf.c b/conf.c index 14d8ece..89f5b3d 100644 --- a/conf.c +++ b/conf.c @@ -1260,6 +1260,7 @@ void conf(struct ctx *c, int argc, char **argv) c->tcp.fwd_in.mode = c->tcp.fwd_out.mode = FWD_UNSET; c->udp.fwd_in.mode = c->udp.fwd_out.mode = FWD_UNSET; + optind = 1; do { name = getopt_long(argc, argv, optstring, options, NULL); diff --git a/passt.c b/passt.c index ea5bece..be7e84a 100644 --- a/passt.c +++ b/passt.c @@ -211,6 +211,8 @@ int main(int argc, char **argv) arch_avx2_exec(argv); + close_open_files(argc, argv); + isolate_initial(); c.pasta_netns_fd = c.fd_tap = c.pidfile_fd = -1; diff --git a/util.c b/util.c index 54a9f58..ca627c6 100644 --- a/util.c +++ b/util.c @@ -26,6 +26,7 @@ #include <errno.h> #include <stdbool.h> #include <linux/errqueue.h> +#include <getopt.h> #include "util.h" #include "iov.h" @@ -694,3 +695,38 @@ const char *str_ee_origin(const struct sock_extended_err *ee) return "<invalid>"; } + +/** + * close_open_files() - Close leaked files, but not --fd, stdin, stdout, stderr + * @argc: Argument count + * @argv: Command line options, as we need to skip any file given via --fd + */ +void close_open_files(int argc, char **argv) +{ + const struct option optfd[] = { { "fd", required_argument, NULL, 'F' }, + { 0 }, + }; + long fd = -1; + int name; + + do { + name = getopt_long(argc, argv, ":F", optfd, NULL); + + if (name == 'F') { + errno = 0; + fd = strtol(optarg, NULL, 0); + + if (fd < 0 || errno) + die("Invalid --fd: %s", optarg); + } + } while (name != -1); + + if (fd == -1) { + if (close_range(3, ~0U, CLOSE_RANGE_UNSHARE)) + die_perror("Failed to close files leaked by parent"); + } else { + if (close_range(3, fd - 1, CLOSE_RANGE_UNSHARE) || + close_range(fd + 1, ~0U, CLOSE_RANGE_UNSHARE)) + die_perror("Failed to close files leaked by parent"); + } +} diff --git a/util.h b/util.h index e8bf957..ab11ee7 100644 --- a/util.h +++ b/util.h @@ -183,6 +183,7 @@ int __daemon(int pidfile_fd, int devnull_fd); int fls(unsigned long x); int write_file(const char *path, const char *buf); int write_remainder(int fd, const struct iovec *iov, size_t iovcnt, size_t skip); +void close_open_files(int argc, char **argv); /** * af_name() - Return name of an address family -- 2.43.0

2 2

passt: new version 2024_08_06.ee36266 available
by Stefano Brivio 06 Aug '24

06 Aug '24

The new version with tag 2024_08_06.ee36266 includes the following changes: ee36266 log, passt: Keep printing to stderr when passt is running in foreground 3a082c4 tcp_splice: Fix side in OUT_WAIT flag setting 031df33 util: Use unsigned (size_t) value for iov length e877f90 udp_flow: move all udp_flow functions to udp_flow.c 623ceb1 udp_flow: Remove udp_meta_t from the parameters of udp_flow_from_sock() a5bbefa log: Make logfile_write() private f30ed68 pasta: Save errno on signal handler entry, restore on return when needed 0149d11 pasta: modify hostname when detaching new namespace 8fae3b7 Fix typo in README file f87b11c fedora/rpkg: List myself as author for changelog entries https://passt.top/passt/log/?qt=range&q=2024_07_26.57a21d2..2024_08_06.ee36… Packages: - Alpine Linux: https://pkgs.alpinelinux.org/packages?name=passt - Arch Linux: https://www.archlinux.org/packages/extra/x86_64/passt/ https://archlinuxarm.org/packages/aarch64/passt https://archlinuxarm.org/packages/armv7h/passt - Chimera: https://pkgs.chimera-linux.org/packages?name=passt - Clear Linux: https://github.com/clearlinux-pkgs/passt/ - Debian tracker: https://tracker.debian.org/pkg/passt - Copr (CentOS Stream, EPEL, Fedora, Mageia): https://copr.fedorainfracloud.org/coprs/sbrivio/passt/build/7871011/ permanent mirror: https://passt.top/builds/copr/0^20240806.gee36266/ - Fedora updates: https://bodhi.fedoraproject.org/updates/?packages=passt - Gentoo versions: https://packages.gentoo.org/packages/net-misc/passt - GNU Guix: https://packages.guix.gnu.org/packages/passt/ - NixOS: https://github.com/NixOS/nixpkgs/tree/nixos-unstable/pkgs/by-name/pa/passt - openSUSE: https://software.opensuse.org/package/passt - PLD Linux: https://git.pld-linux.org/cgi-bin/gitweb.cgi?p=packages/passt.git - Solus: https://github.com/getsolus/packages/tree/main/packages/p/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-gee36266-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_0ee36266-1_all.deb -- Stefano

1 0

[PATCH] tcp_splice: Fix side in OUT_WAIT flag setting
by Stefano Brivio 06 Aug '24

06 Aug '24

If the "from" (input) side for a given transfer is 0, and we can't complete the write right away, what we need to be waiting for is for output readiness on side 1, not 0, and the other way around as well. This causes random transfer failures for local TCP connections, depending if we ever need to wait for output readiness. Reported-by: Paul Holzinger <pholzing(a)redhat.com> Link: https://github.com/containers/podman/issues/23517 Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- tcp_splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcp_splice.c b/tcp_splice.c index 473562b..483e45d 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -577,7 +577,7 @@ eintr: if (conn->read[fromsidei] == conn->written[fromsidei]) break; - conn_event(c, conn, OUT_WAIT(fromsidei)); + conn_event(c, conn, OUT_WAIT(!fromsidei)); break; } -- 2.43.0

3 2

[PATCH] util: In ASSERT(), use "fprintf(stderr, ...)" rather than err(...)
by Laurent Vivier 06 Aug '24

06 Aug '24

We use our own implementation of assert() because the glic implementation uses syscalls that aren't in our seccomp filter, see 7a8ed9459dfe ("Make assertions actually useful"). And we replaced it by an err(), followed by an abort() (that is also catched by seccomp). We don't have a coredump or a backtrace but we have at least the error message... only if logging is enabled. As this kind of information is needed in any case, replace the "err()" function by an "fprintf(stderr, ...)". Signed-off-by: Laurent Vivier <lvivier(a)redhat.com> --- util.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util.h b/util.h index b7541ce24e5a..b44b4bfdccd7 100644 --- a/util.h +++ b/util.h @@ -13,6 +13,7 @@ #include <stdint.h> #include <string.h> #include <signal.h> +#include <stdio.h> #include <arpa/inet.h> #include "log.h" @@ -67,8 +68,10 @@ #define ASSERT(expr) \ do { \ if (!(expr)) { \ - err("ASSERTION FAILED in %s (%s:%d): %s", \ - __func__, __FILE__, __LINE__, STRINGIFY(expr)); \ + fprintf(stderr, \ + "ASSERTION FAILED in %s (%s:%d): %s\n", \ + __func__, __FILE__, __LINE__, \ + STRINGIFY(expr)); \ /* This may actually SIGSYS, due to seccomp, \ * but that will still get the job done \ */ \ -- 2.45.2

3 7

[PATCH] log, passt: Keep printing to stderr when passt is running in foreground
by Stefano Brivio 06 Aug '24

06 Aug '24

There are two cases where we want to stop printing to stderr: if it's closed, and if pasta spawned a shell (and --debug wasn't given). But if passt is running in foreground, we currently stop to report any message, even error messages, once we're ready, as reported by Laurent, because we set the log_runtime flag, which we use to indicate we're ready, regardless of whether we're running in foreground or not. Turn that flag (back) to log_stderr, and set it only when we really want to stop printing to stderr. Reported-by: Laurent Vivier <lvivier(a)redhat.com> Fixes: afd9cdc9bb48 ("log, passt: Always print to stderr before initialisation is complete") Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- log.c | 6 +++--- log.h | 2 +- passt.c | 12 +++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/log.c b/log.c index eb3a780..4ecc2ad 100644 --- a/log.c +++ b/log.c @@ -44,7 +44,7 @@ struct timespec log_start; /* Start timestamp */ int log_trace; /* --trace mode enabled */ bool log_conf_parsed; /* Logging options already parsed */ -bool log_runtime; /* Daemonised, or ready in foreground */ +bool log_stderr = true; /* Not daemonised, no shell spawned */ /** * logtime_fmt_and_arg() - Build format and arguments to print relative log time @@ -257,7 +257,7 @@ void vlogmsg(bool newline, int pri, const char *format, va_list ap) } if (debug_print || !log_conf_parsed || - (!log_runtime && (log_mask & LOG_MASK(LOG_PRI(pri))))) { + (log_stderr && (log_mask & LOG_MASK(LOG_PRI(pri))))) { (void)vfprintf(stderr, format, ap); if (newline && format[strlen(format)] != '\n') fprintf(stderr, "\n"); @@ -364,7 +364,7 @@ void passt_vsyslog(bool newline, int pri, const char *format, va_list ap) if (newline && format[strlen(format)] != '\n') n += snprintf(buf + n, BUFSIZ - n, "\n"); - if (log_sock >= 0 && send(log_sock, buf, n, 0) != n && !log_runtime) + if (log_sock >= 0 && send(log_sock, buf, n, 0) != n && log_stderr) fprintf(stderr, "Failed to send %i bytes to syslog\n", n); } diff --git a/log.h b/log.h index 5cb16d6..ba17f79 100644 --- a/log.h +++ b/log.h @@ -43,7 +43,7 @@ void logmsg_perror(int pri, const char *format, ...) extern int log_trace; extern bool log_conf_parsed; -extern bool log_runtime; +extern bool log_stderr; extern struct timespec log_start; void trace_init(int enable); diff --git a/passt.c b/passt.c index 6401730..ea5bece 100644 --- a/passt.c +++ b/passt.c @@ -290,15 +290,17 @@ int main(int argc, char **argv) if (isolate_prefork(&c)) die("Failed to sandbox process, exiting"); - if (!c.foreground) + if (!c.foreground) { __daemon(c.pidfile_fd, devnull_fd); - else + log_stderr = false; + } else { pidfile_write(c.pidfile_fd, getpid()); + } - log_runtime = true; - - if (pasta_child_pid) + if (pasta_child_pid) { kill(pasta_child_pid, SIGUSR1); + log_stderr = false; + } isolate_postfork(&c); -- 2.43.0

1 0

[PATCH] util: Use unsigned (size_t) value for iov length
by David Gibson 06 Aug '24

06 Aug '24

The "correct" type for the length of an IOV is unclear: writev() and readv() use an int, but sendmsg() and recvmsg() use a size_t. Using the unsigned size_t has some advantages, though, and it makes more sense for the case of write_remainder. Using size_t throughout here means we don't have a signed vs. unsigned comparison, and we don't have to deal with the case of iov_skip_bytes() returning a value which becomes negative when assigned to an integer. I believe this should fix a Coverity reported integer overflow that's showing up on openscanhub. It's not totally clear from the report what it thinks the path is, but it's on an (iovcnt - i) a few lines later. With both having unsigned type, the loop condition ensures this can't underflow. Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> --- util.c | 5 ++--- util.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/util.c b/util.c index f2e26a7a..54a9f580 100644 --- a/util.c +++ b/util.c @@ -592,10 +592,9 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags, * * #syscalls write writev */ -int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip) +int write_remainder(int fd, const struct iovec *iov, size_t iovcnt, size_t skip) { - int i; - size_t offset; + size_t offset, i; while ((i = iov_skip_bytes(iov, iovcnt, skip, &offset)) < iovcnt) { ssize_t rc; diff --git a/util.h b/util.h index b7541ce2..e8bf9572 100644 --- a/util.h +++ b/util.h @@ -182,7 +182,7 @@ void pidfile_write(int fd, pid_t pid); int __daemon(int pidfile_fd, int devnull_fd); int fls(unsigned long x); int write_file(const char *path, const char *buf); -int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip); +int write_remainder(int fd, const struct iovec *iov, size_t iovcnt, size_t skip); /** * af_name() - Return name of an address family -- 2.45.2

1 0

[PATCH 0/2] udp_flow: move all udp_flow functions to udp_flow.c
by Laurent Vivier 05 Aug '24

05 Aug '24

This helps to export them and use them with vhost-user version of udp.c There is only one code change: pass s_in rather than udp_meta_t to udp_flow_from_sock() as udp_meta_t is specific to the socket version of udp.c Otherwise, only code move Signed-off-by: Laurent Vivier <lvivier(a)redhat.com> Laurent Vivier (2): udp_flow: Remove udp_meta_t from the parameters of udp_flow_from_sock() udp_flow: move all udp_flow functions to udp_flow.c Makefile | 2 +- udp.c | 264 +-------------------------------------------------- udp_flow.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++++ udp_flow.h | 9 ++ 4 files changed, 286 insertions(+), 263 deletions(-) create mode 100644 udp_flow.c -- 2.45.2

3 7

[PATCH 0/2] Avoid duplicated clock_gettime() in logging
by David Gibson 05 Aug '24

05 Aug '24

Remove a small nit in the logging code. David Gibson (2): log: Make logfile_write() private log: Avoid duplicate calls to clock_gettime() log.c | 344 +++++++++++++++++++++++++++++----------------------------- log.h | 1 - 2 files changed, 172 insertions(+), 173 deletions(-) -- 2.45.2

2 5

[PATCH] pasta: Save errno on signal handler entry, restore on return when needed
by Stefano Brivio 03 Aug '24

03 Aug '24

Ed reported this: # Error: pasta failed with exit code 1: # Couldn't drop cap 3 from bounding set # : No child processes in a Podman CI run with tests being run in parallel. The error message itself, by the way, is fixed by commit 1cd773081f12 ("log: Drop newlines in the middle of the perror()-like messages"), but how can we possibly get ECHILD as failure code for prctl()? Well, we don't, but if we exit early enough, pasta_child_handler() might run before we're even done with isolation steps, and it calls waitid(), which sets errno. We need to restore it before returning from the signal handler (if we return after calling functions that might set it), as signal-safety(7) also implies: Fetching and setting the value of errno is async-signal-safe provided that the signal handler saves errno on entry and restores its value before returning. Eventually, we'll probably need to switch to signalfd(2) the day we want to implement multithreading, but this will do for the moment. Reported-by: Ed Santiago <santiago(a)redhat.com> Link: https://github.com/containers/podman/issues/23478 Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- pasta.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pasta.c b/pasta.c index 572048d..b4a3d99 100644 --- a/pasta.c +++ b/pasta.c @@ -61,6 +61,7 @@ int pasta_child_pid; */ void pasta_child_handler(int signal) { + int errno_save = errno; siginfo_t infop; (void)signal; @@ -85,6 +86,8 @@ void pasta_child_handler(int signal) waitid(P_ALL, 0, NULL, WEXITED | WNOHANG); waitid(P_ALL, 0, NULL, WEXITED | WNOHANG); + + errno = errno_save; } /** -- 2.43.0

3 2