[pull] master from upstream #19
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On 32-bit musl targets (for example, Alpine i386 / i586), we need to: - use the set of system calls already defined for i686. While Alpine's kernel supports i586 as well (Debian for example doesn't), it's the same architecture, so change i386/i486/i586 machine strings to i686 in seccomp.sh - allow clock_gettime64() as an alternative to clock_gettime() (not just added on top, rather replacing it), because clock_gettime() isn't available as a system call name at all in musl headers (while glibc aliases it to the kernel's clock_gettime64()) - similarly, allow timerfd_gettime64() as a name for timerfd_gettime() - allow timerfd_settime32() as a name for timerfd_settime(), even though there's no such system call declared in Linux kernel headers, as musl uses that name to distinguish it from timerfd_settime64() - unconditionally allow timerfd_settime64(), because musl uses it whenever the 'old' argument is non-NULL and sizeof(time_t) > 4, which happens to be the case in tcp_timer_handler() Reported-by: John D. Rowell <me@jdrowell.com> Link: https://bugs.passt.top/show_bug.cgi?id=177 Link: https://gitlab.alpinelinux.org/alpine/aports/-/issues/17686 Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
… / guest This is an approximation, as enabling SO_KEEPALIVE doesn't mean that a keep-alive segment will be sent right away, rather that keep-alive segments will start being sent if the connection is idle. On the other hand, we don't have direct control over the host-side TCP, so this is probably the best approximation we can get. By default, namespaces inherit keep-alive parameters from their parent namespace, so we can assume that, in case of a container, we'll wait for the same interval it took for the container to start sending us keep-alives, effectively doubling that interval. To keep this simple, set SO_KEEPALIVE whenever we see a keep-alive segment, instead of tracking its state. Keep-alive segments are relatively infrequent, so we don't expect any substantial cost from doing that. Reported-by: Dominic Kohls <Dominic.Wenzler@rewe-group.com> Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
…nd time I recently realised I couldn't see seconds elapsing in asciinema test recordings. That's because now that we display a SKIPPED counter, we need some extra room for characters, 64 in total: PASS: xxx | FAIL: xxx | SKIPPED: xxx | YYYY-MM-DDThh:mm:ss+00:00 Fixes: 4234ace ("test: Display count of skipped tests in status and summary") Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
The last argument of vu_collect() can't exceed @SiZe, but this isn't documented and it wasn't obvious to me, to the point that I actually proposed a change to "fix" callers so that they wouldn't overrun input buffers. Rename @frame_size to @collected, and clarify that it can only be up to @SiZe bytes. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
…IP version This fixes an issue and introduces a feature: - in local mode, we accidentally ignored the -4 / --ipv4-only and -6 / --ipv6-only command line options - if no template interface is available for a given IP version, instead of disabling that IP version, use local mode, separately, for it Link: https://bugs.passt.top/show_bug.cgi?id=129 Link: https://bugs.passt.top/show_bug.cgi?id=128 Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: Paul Holzinger <pholzing@redhat.com>
The image links may become invalid over time, so ignore download errors to prevent 'make assets' from failing. Link: https://bugs.passt.top/show_bug.cgi?id=150 Suggested-by: Stefano Brivio <sbrivio@redhat.com> Signed-off-by: Yumei Huang <yuhuang@redhat.com> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )