linux-user: Show vdso address in /proc/pid/maps

Tested-by: Helge Deller <deller@gmx.de>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index a1583883fa47fe2fc34f690fa34a8436ac29bae8..46832358b0294bb3c4df3dc027e1839496db8690 100644 (file)
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3919,6 +3919,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct image_info *info)
     const VdsoImageInfo *vdso = vdso_image_info();
     if (vdso) {
         load_elf_vdso(&vdso_info, vdso);
+        info->vdso = vdso_info.load_bias;
     } else if (TARGET_ARCH_HAS_SIGTRAMP_PAGE) {
         abi_long tramp_page = target_mmap(0, TARGET_PAGE_SIZE,
                                           PROT_READ | PROT_WRITE,

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 12f638336ab620792d107c3e766dc13332b83461..4de9ec783f66a3730d0b0c681676df5733fd7b84 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -32,6 +32,7 @@ struct image_info {
         abi_ulong       brk;
         abi_ulong       start_stack;
         abi_ulong       stack_limit;
+        abi_ulong       vdso;
         abi_ulong       entry;
         abi_ulong       code_offset;
         abi_ulong       data_offset;

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d49cd314a2789e76de90321d53b64c6808d5c224..65ac3ac796397004e59ff1d241e131b14cf36015 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7992,6 +7992,8 @@ static void open_self_maps_4(const struct open_self_maps_data *d,
         path = "[stack]";
     } else if (start == info->brk) {
         path = "[heap]";
+    } else if (start == info->vdso) {
+        path = "[vdso]";
     }
 
     /* Except null device (MAP_ANON), adjust offset for this fragment. */