From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by kanga.kvack.org (Postfix) with ESMTP id 993C36B0260 for ; Mon, 18 Apr 2016 09:45:01 -0400 (EDT) Received: by mail-pa0-f69.google.com with SMTP id dx6so192526673pad.0 for ; Mon, 18 Apr 2016 06:45:01 -0700 (PDT) Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1on0101.outbound.protection.outlook.com. [157.56.112.101]) by mx.google.com with ESMTPS id i10si3684448paz.90.2016.04.18.06.44.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 06:44:58 -0700 (PDT) From: Dmitry Safonov Subject: [PATCHv5 3/3] selftest/x86: add mremap vdso 32-bit test Date: Mon, 18 Apr 2016 16:43:45 +0300 Message-ID: <1460987025-30360-3-git-send-email-dsafonov@virtuozzo.com> In-Reply-To: <1460987025-30360-1-git-send-email-dsafonov@virtuozzo.com> References: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> <1460987025-30360-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: 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 , Shuah Khan , linux-kselftest@vger.kernel.org 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 Cc: linux-kselftest@vger.kernel.org Suggested-by: Andy Lutomirski Signed-off-by: Dmitry Safonov --- 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 +#include +#include +#include + +#include +#include +#include + +#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 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org