From: Dmitry Safonov <dsafonov@virtuozzo.com>
To: <linux-kernel@vger.kernel.org>
Cc: <luto@amacapital.net>, <tglx@linutronix.de>, <mingo@redhat.com>,
<hpa@zytor.com>, <x86@kernel.org>, <akpm@linux-foundation.org>,
<linux-mm@kvack.org>, <0x7f454c46@gmail.com>,
Dmitry Safonov <dsafonov@virtuozzo.com>,
Shuah Khan <shuahkh@osg.samsung.com>,
<linux-kselftest@vger.kernel.org>
Subject: [PATCHv5 3/3] selftest/x86: add mremap vdso 32-bit test
Date: Mon, 18 Apr 2016 16:43:45 +0300 [thread overview]
Message-ID: <1460987025-30360-3-git-send-email-dsafonov@virtuozzo.com> (raw)
In-Reply-To: <1460987025-30360-1-git-send-email-dsafonov@virtuozzo.com>
Should print on success:
[root@localhost ~]# ./test_mremap_vdso_32
AT_SYSINFO_EHDR is 0xf773f000
[NOTE] Moving vDSO: [f773f000, f7740000] -> [a000000, a001000]
[OK]
Or segfault if landing was bad (before patches):
[root@localhost ~]# ./test_mremap_vdso_32
AT_SYSINFO_EHDR is 0xf774f000
[NOTE] Moving vDSO: [f774f000, f7750000] -> [a000000, a001000]
Segmentation fault (core dumped)
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: linux-kselftest@vger.kernel.org
Suggested-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
---
v5: initial version
tools/testing/selftests/x86/Makefile | 2 +-
tools/testing/selftests/x86/test_mremap_vdso.c | 72 ++++++++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/x86/test_mremap_vdso.c
diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index b47ebd170690..c7162b511ab0 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -7,7 +7,7 @@ include ../lib.mk
TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall \
check_initial_reg_state sigreturn ldt_gdt iopl
TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \
- test_FCMOV test_FCOMI test_FISTTP \
+ test_FCMOV test_FCOMI test_FISTTP test_mremap_vdso \
vdso_restorer
TARGETS_C_32BIT_ALL := $(TARGETS_C_BOTHBITS) $(TARGETS_C_32BIT_ONLY)
diff --git a/tools/testing/selftests/x86/test_mremap_vdso.c b/tools/testing/selftests/x86/test_mremap_vdso.c
new file mode 100644
index 000000000000..a470790e2118
--- /dev/null
+++ b/tools/testing/selftests/x86/test_mremap_vdso.c
@@ -0,0 +1,72 @@
+/*
+ * 32-bit test to check vdso mremap.
+ *
+ * Copyright (c) 2016 Dmitry Safonov
+ * Suggested-by: Andrew Lutomirski
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+/*
+ * Can be built statically:
+ * gcc -Os -Wall -static -m32 test_mremap_vdso.c
+ */
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <sys/mman.h>
+#include <sys/auxv.h>
+#include <sys/syscall.h>
+
+#if !defined(__i386__)
+int main(int argc, char **argv, char **envp)
+{
+ printf("[SKIP]\tNot a 32-bit x86 userspace\n");
+ return 0;
+}
+#else
+
+#define PAGE_SIZE 4096
+#define VDSO_SIZE PAGE_SIZE
+
+int main(int argc, char **argv, char **envp)
+{
+ unsigned long vdso_addr, dest_addr;
+ void *new_addr;
+ const char *ok_string = "[OK]\n";
+
+ vdso_addr = getauxval(AT_SYSINFO_EHDR);
+ printf("\tAT_SYSINFO_EHDR is 0x%lx\n", vdso_addr);
+ if (!vdso_addr || vdso_addr == -ENOENT) {
+ printf("[FAIL]\tgetauxval failed\n");
+ return 1;
+ }
+
+ /* to low for stack, to high for lib/data/code mappings */
+ dest_addr = 0x0a000000;
+ printf("[NOTE]\tMoving vDSO: [%lx, %lx] -> [%lx, %lx]\n",
+ vdso_addr, vdso_addr + VDSO_SIZE,
+ dest_addr, dest_addr + VDSO_SIZE);
+ new_addr = mremap((void *)vdso_addr, VDSO_SIZE, VDSO_SIZE,
+ MREMAP_FIXED|MREMAP_MAYMOVE, dest_addr);
+ if ((unsigned long)new_addr == (unsigned long)-1) {
+ printf("[FAIL]\tmremap failed (%d): %m\n", errno);
+ return 1;
+ }
+
+ asm volatile ("int $0x80" : : "a" (__NR_write), "b" (STDOUT_FILENO),
+ "c" (ok_string), "d" (strlen(ok_string)));
+ asm volatile ("int $0x80" : : "a" (__NR_exit), "b" (0));
+
+ return 0;
+}
+#endif
--
2.8.0
next prev parent reply other threads:[~2016-04-18 13:45 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-11 15:22 [PATCH] x86/vdso: add mremap hook to vm_special_mapping Dmitry Safonov
2016-04-11 15:41 ` kbuild test robot
2016-04-11 15:54 ` Dmitry Safonov
2016-04-14 16:32 ` [PATCHv2] " Dmitry Safonov
2016-04-14 22:58 ` Andy Lutomirski
2016-04-15 8:46 ` Dmitry Safonov
2016-04-15 9:18 ` Ingo Molnar
2016-04-15 9:51 ` Dmitry Safonov
2016-04-15 12:08 ` Dmitry Safonov
2016-04-15 13:20 ` [PATCHv3 1/2] " Dmitry Safonov
2016-04-15 13:20 ` [PATCHv3 2/2] x86: rename is_{ia32,x32}_task to in_{ia32,x32}_syscall Dmitry Safonov
2016-04-15 16:52 ` Andy Lutomirski
2016-04-15 16:55 ` Dmitry Safonov
2016-04-15 13:53 ` [PATCHv3 1/2] x86/vdso: add mremap hook to vm_special_mapping kbuild test robot
2016-04-15 14:12 ` [PATCHv4 " Dmitry Safonov
2016-04-15 14:12 ` [PATCHv4 2/2] x86: rename is_{ia32,x32}_task to in_{ia32,x32}_syscall Dmitry Safonov
2016-04-15 16:58 ` [PATCHv4 1/2] x86/vdso: add mremap hook to vm_special_mapping Andy Lutomirski
2016-04-18 11:18 ` Dmitry Safonov
2016-04-18 15:37 ` Andy Lutomirski
2016-04-18 13:43 ` [PATCHv5 1/3] x86: rename is_{ia32,x32}_task to in_{ia32,x32}_syscall Dmitry Safonov
2016-04-18 13:43 ` [PATCHv5 2/3] x86/vdso: add mremap hook to vm_special_mapping Dmitry Safonov
2016-04-18 14:03 ` kbuild test robot
2016-04-18 14:17 ` [PATCHv6 " Dmitry Safonov
2016-04-18 14:23 ` [PATCHv7 " Dmitry Safonov
2016-04-20 16:22 ` Dmitry Safonov
2016-04-21 19:52 ` Andy Lutomirski
2016-04-22 10:45 ` Dmitry Safonov
2016-04-23 23:09 ` [PATCHv5 " kbuild test robot
2016-04-18 13:43 ` Dmitry Safonov [this message]
2016-04-21 20:01 ` [PATCHv5 3/3] selftest/x86: add mremap vdso 32-bit test Andy Lutomirski
2016-04-22 11:34 ` Dmitry Safonov
2016-04-19 9:34 ` [tip:x86/asm] x86/entry: Rename is_{ia32,x32}_task() to in_{ia32,x32}_syscall() tip-bot for Dmitry Safonov
2016-04-19 11:15 ` Ingo Molnar
2016-04-19 11:35 ` Borislav Petkov
2016-04-19 17:00 ` H. Peter Anvin
2016-04-19 16:04 ` Andy Lutomirski
2016-04-22 8:36 ` Ingo Molnar
2018-10-18 1:47 ` in_compat_syscall() returns from kernel thread for X86_32 NeilBrown
2018-10-18 2:37 ` Andy Lutomirski
2018-10-18 2:49 ` Al Viro
2018-10-18 4:36 ` NeilBrown
2018-10-18 17:26 ` Andy Lutomirski
2018-10-20 6:02 ` Andreas Dilger
2018-10-20 7:58 ` Andy Lutomirski
2018-10-24 1:47 ` NeilBrown
2018-10-24 13:15 ` Theodore Y. Ts'o
2018-10-24 14:32 ` Theodore Y. Ts'o
2019-01-11 22:21 ` Pavel Machek
2018-10-25 3:46 ` NeilBrown
2018-10-25 4:45 ` Andy Lutomirski
2016-04-25 11:37 ` [PATCHv8 1/2] x86/vdso: add mremap hook to vm_special_mapping Dmitry Safonov
2016-04-25 11:37 ` [PATCHv8 2/2] selftest/x86: add mremap vdso test Dmitry Safonov
2016-04-25 21:39 ` Andy Lutomirski
2016-04-25 21:38 ` [PATCHv8 1/2] x86/vdso: add mremap hook to vm_special_mapping Andy Lutomirski
[not found] ` <e0a10957-ddf7-1bc4-fad6-8b5836628fce@virtuozzo.com>
2016-05-05 11:52 ` Ingo Molnar
2016-05-05 11:55 ` Dmitry Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460987025-30360-3-git-send-email-dsafonov@virtuozzo.com \
--to=dsafonov@virtuozzo.com \
--cc=0x7f454c46@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=shuahkh@osg.samsung.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).