August 2024 - dev

[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