diff options
author | Randy MacLeod <randy.macleod@windriver.com> | 2021-12-29 17:37:27 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-04 23:14:05 +0000 |
commit | b4c2b4df01733a692c961f00071e49381da5e594 (patch) | |
tree | e27b5e13bb2668e3df91e11223251dfbf0e2049b /meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch | |
parent | b93a99b973f6cc07e338dc4a3e396a5c8f18c8e5 (diff) | |
download | poky-b4c2b4df01733a692c961f00071e49381da5e594.tar.gz |
valgrind: backport rseq work-around
Using glibc-2.35-alpha, valgrind ptests mostly all fail with the error:
WARNING: unhandled amd64-linux syscall: 334
You may be able to write your own handler.
With this patch applied qemux86-64 ptest results were:
TOTAL: 728
PASSED: 709
FAILED: 0
SKIPPED: 19
This patch implements the Linux rseq syscall as ENOSYS while
a proper fix is being worked on as desribed in the patch
commit log.
(From OE-Core rev: 6ca008072df0371b6b1cfdd7030da6494ff012bd)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch | 198 |
1 files changed, 198 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch new file mode 100644 index 0000000000..be1536980c --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch | |||
@@ -0,0 +1,198 @@ | |||
1 | From 1024237358f01009fe233cb1294f3b8211304eaa Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Fri, 10 Dec 2021 17:41:59 +0100 | ||
4 | Subject: [PATCH] Implement linux rseq syscall as ENOSYS | ||
5 | |||
6 | This implements rseq for amd64, arm, arm64, ppc32, ppc64, | ||
7 | s390x and x86 linux as ENOSYS (without warning). | ||
8 | |||
9 | glibc will start using rseq to accelerate sched_getcpu, if | ||
10 | available. This would cause a warning from valgrind every | ||
11 | time a new thread is started. | ||
12 | |||
13 | Real rseq (restartable sequences) support is pretty hard, so | ||
14 | for now just explicitly return ENOSYS (just like we do for clone3). | ||
15 | |||
16 | Upstream-Status: Backport [ 1024237358f01009fe233cb1294f3b8211304eaa ] | ||
17 | |||
18 | https://sourceware.org/pipermail/libc-alpha/2021-December/133656.html | ||
19 | --- | ||
20 | coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ | ||
21 | coregrind/m_syswrap/syswrap-arm-linux.c | 1 + | ||
22 | coregrind/m_syswrap/syswrap-arm64-linux.c | 3 ++- | ||
23 | coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ | ||
24 | coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ | ||
25 | coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ | ||
26 | coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ | ||
27 | include/vki/vki-scnums-arm-linux.h | 1 + | ||
28 | include/vki/vki-scnums-arm64-linux.h | 4 +++- | ||
29 | include/vki/vki-scnums-ppc32-linux.h | 1 + | ||
30 | include/vki/vki-scnums-ppc64-linux.h | 1 + | ||
31 | include/vki/vki-scnums-s390x-linux.h | 5 ++++- | ||
32 | 12 files changed, 23 insertions(+), 3 deletions(-) | ||
33 | |||
34 | diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
35 | index 5062324a1..18b25f80a 100644 | ||
36 | --- a/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
37 | +++ b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
38 | @@ -862,6 +862,8 @@ static SyscallTableEntry syscall_table[] = { | ||
39 | |||
40 | LINXY(__NR_statx, sys_statx), // 332 | ||
41 | |||
42 | + GENX_(__NR_rseq, sys_ni_syscall), // 334 | ||
43 | + | ||
44 | LINX_(__NR_membarrier, sys_membarrier), // 324 | ||
45 | |||
46 | LINX_(__NR_copy_file_range, sys_copy_file_range), // 326 | ||
47 | diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
48 | index 556dd844b..d583cef0c 100644 | ||
49 | --- a/coregrind/m_syswrap/syswrap-arm-linux.c | ||
50 | +++ b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
51 | @@ -1024,6 +1024,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
52 | LINX_(__NR_pwritev2, sys_pwritev2), // 393 | ||
53 | |||
54 | LINXY(__NR_statx, sys_statx), // 397 | ||
55 | + GENX_(__NR_rseq, sys_ni_syscall), // 398 | ||
56 | |||
57 | LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403 | ||
58 | LINX_(__NR_clock_settime64, sys_clock_settime64), // 404 | ||
59 | diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
60 | index b87107727..2066a38ea 100644 | ||
61 | --- a/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
62 | +++ b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
63 | @@ -823,8 +823,9 @@ static SyscallTableEntry syscall_main_table[] = { | ||
64 | // (__NR_pkey_mprotect, sys_ni_syscall), // 288 | ||
65 | // (__NR_pkey_alloc, sys_ni_syscall), // 289 | ||
66 | // (__NR_pkey_free, sys_ni_syscall), // 290 | ||
67 | + LINXY(__NR_statx, sys_statx), // 291 | ||
68 | |||
69 | - LINXY(__NR_statx, sys_statx), // 397 | ||
70 | + GENX_(__NR_rseq, sys_ni_syscall), // 293 | ||
71 | |||
72 | LINXY(__NR_io_uring_setup, sys_io_uring_setup), // 425 | ||
73 | LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 | ||
74 | diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
75 | index 6263ab845..637b2504e 100644 | ||
76 | --- a/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
77 | +++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
78 | @@ -1028,6 +1028,8 @@ static SyscallTableEntry syscall_table[] = { | ||
79 | |||
80 | LINXY(__NR_statx, sys_statx), // 383 | ||
81 | |||
82 | + GENX_(__NR_rseq, sys_ni_syscall), // 387 | ||
83 | + | ||
84 | LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403 | ||
85 | LINX_(__NR_clock_settime64, sys_clock_settime64), // 404 | ||
86 | |||
87 | diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
88 | index a26b41c32..93956d3cc 100644 | ||
89 | --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
90 | +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
91 | @@ -1019,6 +1019,8 @@ static SyscallTableEntry syscall_table[] = { | ||
92 | |||
93 | LINXY(__NR_statx, sys_statx), // 383 | ||
94 | |||
95 | + GENX_(__NR_rseq, sys_ni_syscall), // 387 | ||
96 | + | ||
97 | LINXY(__NR_io_uring_setup, sys_io_uring_setup), // 425 | ||
98 | LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 | ||
99 | LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 | ||
100 | diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
101 | index 5c9209859..73f9684c4 100644 | ||
102 | --- a/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
103 | +++ b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
104 | @@ -860,6 +860,8 @@ static SyscallTableEntry syscall_table[] = { | ||
105 | |||
106 | LINXY(__NR_statx, sys_statx), // 379 | ||
107 | |||
108 | + GENX_(__NR_rseq, sys_ni_syscall), // 381 | ||
109 | + | ||
110 | LINXY(__NR_io_uring_setup, sys_io_uring_setup), // 425 | ||
111 | LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 | ||
112 | LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 | ||
113 | diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
114 | index 1d8f45d33..8662ff501 100644 | ||
115 | --- a/coregrind/m_syswrap/syswrap-x86-linux.c | ||
116 | +++ b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
117 | @@ -1619,6 +1619,8 @@ static SyscallTableEntry syscall_table[] = { | ||
118 | /* Explicitly not supported on i386 yet. */ | ||
119 | GENX_(__NR_arch_prctl, sys_ni_syscall), // 384 | ||
120 | |||
121 | + GENX_(__NR_rseq, sys_ni_syscall), // 386 | ||
122 | + | ||
123 | LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403 | ||
124 | LINX_(__NR_clock_settime64, sys_clock_settime64), // 404 | ||
125 | |||
126 | diff --git a/include/vki/vki-scnums-arm-linux.h b/include/vki/vki-scnums-arm-linux.h | ||
127 | index ff560e19d..485db8b26 100644 | ||
128 | --- a/include/vki/vki-scnums-arm-linux.h | ||
129 | +++ b/include/vki/vki-scnums-arm-linux.h | ||
130 | @@ -432,6 +432,7 @@ | ||
131 | #define __NR_pkey_alloc 395 | ||
132 | #define __NR_pkey_free 396 | ||
133 | #define __NR_statx 397 | ||
134 | +#define __NR_rseq 398 | ||
135 | |||
136 | |||
137 | |||
138 | diff --git a/include/vki/vki-scnums-arm64-linux.h b/include/vki/vki-scnums-arm64-linux.h | ||
139 | index 9aa3b2b5f..acdfb39c6 100644 | ||
140 | --- a/include/vki/vki-scnums-arm64-linux.h | ||
141 | +++ b/include/vki/vki-scnums-arm64-linux.h | ||
142 | @@ -323,9 +323,11 @@ | ||
143 | #define __NR_pkey_alloc 289 | ||
144 | #define __NR_pkey_free 290 | ||
145 | #define __NR_statx 291 | ||
146 | +#define __NR_io_pgetevents 291 | ||
147 | +#define __NR_rseq 293 | ||
148 | |||
149 | #undef __NR_syscalls | ||
150 | -#define __NR_syscalls 292 | ||
151 | +#define __NR_syscalls 294 | ||
152 | |||
153 | ///* | ||
154 | // * All syscalls below here should go away really, | ||
155 | diff --git a/include/vki/vki-scnums-ppc32-linux.h b/include/vki/vki-scnums-ppc32-linux.h | ||
156 | index 6987ad941..08fa77df0 100644 | ||
157 | --- a/include/vki/vki-scnums-ppc32-linux.h | ||
158 | +++ b/include/vki/vki-scnums-ppc32-linux.h | ||
159 | @@ -415,6 +415,7 @@ | ||
160 | #define __NR_pkey_alloc 384 | ||
161 | #define __NR_pkey_free 385 | ||
162 | #define __NR_pkey_mprotect 386 | ||
163 | +#define __NR_rseq 387 | ||
164 | |||
165 | #endif /* __VKI_SCNUMS_PPC32_LINUX_H */ | ||
166 | |||
167 | diff --git a/include/vki/vki-scnums-ppc64-linux.h b/include/vki/vki-scnums-ppc64-linux.h | ||
168 | index 6827964fd..a76fa6d32 100644 | ||
169 | --- a/include/vki/vki-scnums-ppc64-linux.h | ||
170 | +++ b/include/vki/vki-scnums-ppc64-linux.h | ||
171 | @@ -407,6 +407,7 @@ | ||
172 | #define __NR_pkey_alloc 384 | ||
173 | #define __NR_pkey_free 385 | ||
174 | #define __NR_pkey_mprotect 386 | ||
175 | +#define __NR_rseq 387 | ||
176 | |||
177 | #endif /* __VKI_SCNUMS_PPC64_LINUX_H */ | ||
178 | |||
179 | diff --git a/include/vki/vki-scnums-s390x-linux.h b/include/vki/vki-scnums-s390x-linux.h | ||
180 | index 6487e20c9..869c04584 100644 | ||
181 | --- a/include/vki/vki-scnums-s390x-linux.h | ||
182 | +++ b/include/vki/vki-scnums-s390x-linux.h | ||
183 | @@ -342,8 +342,11 @@ | ||
184 | #define __NR_s390_guarded_storage 378 | ||
185 | #define __NR_statx 379 | ||
186 | #define __NR_s390_sthyi 380 | ||
187 | +#define __NR_kexec_file_load 381 | ||
188 | +#define __NR_io_pgetevents 382 | ||
189 | +#define __NR_rseq 383 | ||
190 | |||
191 | -#define NR_syscalls 381 | ||
192 | +#define NR_syscalls 384 | ||
193 | |||
194 | /* | ||
195 | * There are some system calls that are not present on 64 bit, some | ||
196 | -- | ||
197 | 2.30.2 | ||
198 | |||