[CRIU] [PATCHv2 4/9] compat/x86/vdso: add 32-bit vdso symbols to array

Dmitry Safonov dsafonov at virtuozzo.com
Thu Aug 4 08:07:44 PDT 2016


32-bit vDSO blob contains additional symbols on x86.
I wanted to add it under ifdefs (CONFIG_X86_{64,32}), but
it looks like, we need to keep VDSO_SYMBOL_MAX the same
and the additional cost is just a little bit larger
rt symtab massive.

Cc: Cyrill Gorcunov <gorcunov at openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
 criu/arch/x86/include/asm/vdso.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/criu/arch/x86/include/asm/vdso.h b/criu/arch/x86/include/asm/vdso.h
index a1cc9bb9751b..37296f96af30 100644
--- a/criu/arch/x86/include/asm/vdso.h
+++ b/criu/arch/x86/include/asm/vdso.h
@@ -12,13 +12,16 @@
  * This is a minimal amount of symbols
  * we should support at the moment.
  */
-#define VDSO_SYMBOL_MAX	4
+#define VDSO_SYMBOL_MAX	7
 
 #define ARCH_VDSO_SYMBOLS			\
 	"__vdso_clock_gettime",			\
 	"__vdso_getcpu",			\
 	"__vdso_gettimeofday",			\
-	"__vdso_time"
+	"__vdso_time",				\
+	"__kernel_vsyscall",			\
+	"__kernel_sigreturn",			\
+	"__kernel_rt_sigreturn"
 
 
 struct vdso_symtable;
-- 
2.9.0



More information about the CRIU mailing list