mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: Compilers' name for armv6l and armv7l is "arm"

Browse source 
When I switched from 'uname -m' to 'gcc -dumpmachine' to fetch the
architecture name for, among others, seccomp.sh, I didn't realise
that "armv6l" and "armv7l" are just Linux kernel names -- compilers
just call that "arm".

Fix the "syscalls" annotation we use to define seccomp profiles
accordingly, otherwise pasta will be terminated on sigreturn() on
armv6l and armv7l.

Fixes: 213c397492 ("passt, pasta: Run-time selection of AVX2 build")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2024-04-11 17:34:04 +02:00
parent 954589b64b
commit 5d5208b67d
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fwd.c
View file

@ -38,7 +38,7 @@
* @exclude: Bitmap of ports to exclude from setting (and clear) * @exclude: Bitmap of ports to exclude from setting (and clear)
* *
* #syscalls:pasta lseek * #syscalls:pasta lseek
* #syscalls:pasta ppc64le:_llseek ppc64:_llseek armv6l:_llseek armv7l:_llseek * #syscalls:pasta ppc64le:_llseek ppc64:_llseek arm:_llseek
*/ */
static void procfs_scan_listen(int fd, unsigned int lstate, static void procfs_scan_listen(int fd, unsigned int lstate,
uint8_t *map, const uint8_t *exclude) uint8_t *map, const uint8_t *exclude)

4
log.c
View file

@ -220,7 +220,7 @@ void logfile_init(const char *name, const char *path, size_t size)
* @fd: Log file descriptor * @fd: Log file descriptor
* @now: Current timestamp * @now: Current timestamp
* *
* #syscalls lseek ppc64le:_llseek ppc64:_llseek armv6l:_llseek armv7l:_llseek * #syscalls lseek ppc64le:_llseek ppc64:_llseek arm:_llseek
*/ */
static void logfile_rotate_fallocate(int fd, const struct timespec *now) static void logfile_rotate_fallocate(int fd, const struct timespec *now)
{ {
@ -257,7 +257,7 @@ static void logfile_rotate_fallocate(int fd, const struct timespec *now)
* @fd: Log file descriptor * @fd: Log file descriptor
* @now: Current timestamp * @now: Current timestamp
* *
* #syscalls lseek ppc64le:_llseek ppc64:_llseek armv6l:_llseek armv7l:_llseek * #syscalls lseek ppc64le:_llseek ppc64:_llseek arm:_llseek
* #syscalls ftruncate * #syscalls ftruncate
*/ */
static void logfile_rotate_move(int fd, const struct timespec *now) static void logfile_rotate_move(int fd, const struct timespec *now)

5
passt.c
View file

@ -192,10 +192,9 @@ void exit_handler(int signal)
* #syscalls read write writev * #syscalls read write writev
* #syscalls socket bind connect getsockopt setsockopt s390x:socketcall close * #syscalls socket bind connect getsockopt setsockopt s390x:socketcall close
* #syscalls recvfrom sendto shutdown * #syscalls recvfrom sendto shutdown
* #syscalls armv6l:recv armv7l:recv ppc64le:recv * #syscalls arm:recv ppc64le:recv arm:send ppc64le:send
* #syscalls armv6l:send armv7l:send ppc64le:send
* #syscalls accept4|accept listen epoll_ctl epoll_wait|epoll_pwait epoll_pwait * #syscalls accept4|accept listen epoll_ctl epoll_wait|epoll_pwait epoll_pwait
* #syscalls clock_gettime armv6l:clock_gettime64 armv7l:clock_gettime64 * #syscalls clock_gettime arm:clock_gettime64
*/ */
int main(int argc, char **argv) int main(int argc, char **argv)
{ {

4
pasta.c
View file

@ -12,8 +12,8 @@
* Author: Stefano Brivio <sbrivio@redhat.com> * Author: Stefano Brivio <sbrivio@redhat.com>
* *
* #syscalls:pasta clone waitid exit exit_group rt_sigprocmask * #syscalls:pasta clone waitid exit exit_group rt_sigprocmask
* #syscalls:pasta rt_sigreturn|sigreturn armv6l:sigreturn armv7l:sigreturn * #syscalls:pasta rt_sigreturn|sigreturn
* #syscalls:pasta ppc64:sigreturn s390x:sigreturn * #syscalls:pasta arm:sigreturn ppc64:sigreturn s390x:sigreturn
*/ */
#include <sched.h> #include <sched.h>

2
tcp_splice.c
View file

@ -28,7 +28,7 @@
* - FIN_SENT_0: FIN (write shutdown) sent to accepted socket * - FIN_SENT_0: FIN (write shutdown) sent to accepted socket
* - FIN_SENT_1: FIN (write shutdown) sent to target socket * - FIN_SENT_1: FIN (write shutdown) sent to target socket
* *
* #syscalls:pasta pipe2|pipe fcntl armv6l:fcntl64 armv7l:fcntl64 ppc64:fcntl64 * #syscalls:pasta pipe2|pipe fcntl arm:fcntl64 ppc64:fcntl64
*/ */
#include <sched.h> #include <sched.h>