From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932963AbcEQMaZ (ORCPT ); Tue, 17 May 2016 08:30:25 -0400 Received: from mail-db3on0117.outbound.protection.outlook.com ([157.55.234.117]:12420 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751291AbcEQMaX (ORCPT ); Tue, 17 May 2016 08:30:23 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=virtuozzo.com; From: Dmitry Safonov To: , CC: , , , , , , <0x7f454c46@gmail.com>, Dmitry Safonov , Shuah Khan , Subject: [PATCHv9 2/2] selftest/x86: add mremap vdso test Date: Tue, 17 May 2016 15:13:52 +0300 Message-ID: <1463487232-4377-3-git-send-email-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1463487232-4377-1-git-send-email-dsafonov@virtuozzo.com> References: <1463487232-4377-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM4PR01CA0020.eurprd01.prod.exchangelabs.com (10.164.74.158) To AM5PR0801MB1299.eurprd08.prod.outlook.com (10.167.216.150) X-MS-Office365-Filtering-Correlation-Id: cad52379-78c5-4984-17c9-08d37e4ce5f3 X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1299;2:rHJUv5iRtciuDHTStq4swR1nhMQtCfRLdOx9sVyBodbVyh7Y6LrI3fQqhKkVuLGZoP8UgTxmG51GoPbJEr6SotoeeDHaPKhjMLC5F4JxRPnjKQ0RnFeYWHMWx8Rc1bemJtayr7wq6LzrNCWX6ub4qSFjSzfP7Farcx+hB+zrVwUEaDlHyHMiKmR63jZHF9gw;3:/EYYuL/DIe3/kXj4d4UTjuPeDggdaSdJWY2ZnhPB8w1IuGa0quCVfKS3CpKPV6+msqS43RmY7fK7a15dEx6mm4JJIh7GwB6SMC6ISOhVPumsek9e2I+w/ejHsSj4p2Lb X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1299; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1299;25:txyZ+dWLjHtTI77Q9/MFdcaeVBQwGp0aGwPYFsF/2oEIYs7vylXQgE9/tiHdEqY0XwKgu1bIG2Yx/i5BIUg/lPhbMQ5uzVIS1GndlbsNbW+dXU0MXd6Qg2TT/6Gdp1TRauz9M8C6h44orc9xJjsFo1B2xtA4OcSCU7tbKid3zl+IfmaQUSKrEKmyGDNXFrsIQpaGf4rwjqhN/7s7MzCQU4/YPpGkTza1TDwn2nJfajwMVp/EQNCL4/olDWEKSKZFJtU+N12m5f4KDejiPo8/MSfs2HisM5lLWid8U8qWndKNzgxRbFVEzwfYDYxX9ZSziXinwhUJZXia9Fu3s72dUT1fQB+oSBRTKs+f893Z/vy1+2jHksI9UQsV16ZyacTYNQfa5FAaPoG8aN7faqKJrvY+j/9e/nHGfogLvu/dbSqwT/ALjVR41cLRfahQkSaoFtqsehTj2XVhvr5j9RlMxBzo3vyqJ4uUi1GQWG719yV3oLCdTzI+Vx3VkaQimphnKCMqVivg4MrDpTTOHvOoEVvAo1uqdFqLe6mNuGMO+iSTtKgy/mWvwMp/gJkx2yAKFFeLDt7DH5ldTJFh9xHXR2ceIdnTPscnhdLtzPiOM0ppsay1smvX++tfJ6rgucubxpspceklGKM3fG0KvuSp6HK8CKE42aJBySBV0AJtjWIUlsh9+Yps4itLZmvTtxbuyjMc6C5NrfzgGCZfOmhsxw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041072)(6043046);SRVR:AM5PR0801MB1299;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1299; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1299;4:Xn9j+pvQfQw3wdMmaZoWf+g7k9Onga+R92k1jWmEjrCNuWBdh5jFZAAAh+beVGhQiX2DVlZUzWUmBUvJYYCrDDoSVXlJCp1Nq7g4Yb7gI5O2zpV8hfFWLNSQI1G2O8Swfh7ZD7eSiTEOoH1+d8OOG6nlg8QqHNViMoJO0ZAEKjEiVXJepyHIsJFX/a7fZUX1d+eqkpJoufkCXRZUIgvXmxWaxpMIEy6Q/q/xT6BdX45TRt9pKk8EW+p8hzfJn2jaEr007zPHJV01xm2RhDCz1xOpcRI3kh1rkrsAWNBosxHmDKwykYbBfNdzF4BRk7OjMi2BBODtXrq9RqqFISKvezIZMf4zQXNl9k4JLp+mweLJiQhvg+bC5pgvJO0OQU2/DiTJiGgFL+ef70fI5Qkdx3nu7r+0KZCYEgXaE6CfFow= X-Forefront-PRVS: 0945B0CC72 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(50226002)(53416004)(50466002)(92566002)(47776003)(42186005)(66066001)(81166006)(229853001)(33646002)(8676002)(48376002)(189998001)(5008740100001)(2906002)(86362001)(2950100001)(77096005)(4326007)(19580395003)(5004730100002)(36756003)(586003)(3846002)(19580405001)(6116002)(5003940100001)(76176999)(5001770100001)(50986999);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0801MB1299;H:dsafonov.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1299;23:DNvlq2uppacaOe7HJ14AJntKxi4QZfhreQMJZhZsEgBI7mbmIwEjllEg9N0Mgtw3WYqBtL3EwzqUpWXhQ9Bp85BjC7LLE0Ib1hl0cEFtMnTc1UR74LWQMdcoUPAtQyCoicrKMTA3M58XAZB/5t6UE16WR/i1hUFF78AdCok/03bxDEnfhCcw0yXFdgmfDW0BlxyDemnxtsCpYvIqrsnK6IBxxMItIwyrNZ1itBAH8iWjVB0WlVXtC13m1RHJ/eOKb5vodLD+8IU/WYDApa48sRcJOZsNZF58aqFh3LaC/ZWO33TZsn1U3o9GDBtdyuCR7yDcUMiatJ6jlvBD7dv/oEiZSMNeVKf+NlL/yvWsMHP+OaEOCApH6d4oec4FQ3dzE4Kehgo2M+MfywfC+SUcudb2mzFlvyedNakfo4pvuvyIsfPASxb0Jh73RbcnaMPUsQZvHG+Sxe9tQhGm5cKxrfs4bsFx08cUExr1TgosucHUX5MiBxTNsOLGOP/2VeVQBTpDZw8n/kZKw7EbbSOECRaCpQDeGEDGhX8KMhLLC63YlxCq5kbqPhPWnUCzaI79X0ccaAzdoVd1+jXmc5DVS/ygLl+SmYh8DQnFRL7KvdOA5EcuN08vacZC0y4BqgcLuxbMiHrBUWTWbF5tDgORoxX7DWc6sH8rOPOE3FvAnoMNlRVTtLOqDkXTARWz8r4LzLgsteqAiwS+qI6mAc9JndYntaSQHMjNA6AJYfTgpafKYybXOwFUvwfwI6WQ82G+Gmmi9eC5Jq76OIGNy1aUGwGekwaBJmsT/Q+gYH7WS+aqpeJVZ6fFkl1U2IU3BFjc3l2XhqkITDtOsCN3tfP20ENxSpHZtkklypogl3bmAg9F+6AdbEed+0OM56dQuX2PNTsvU6vmIkIvD9sGyYt8cA== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1299;5:YBaFoDNnSj839pyEplCZlRZ3SXToCDxCnROyT062uy/BsqyW3G6hJHk92U63VP9/CAc6BClFNd2uIgcIl39VDLI63Y5GRYbiXqRShuj6+qfQD4KPzzQjWCMolItCh5m5Hckl36mk+eOKM7w67OEFqw==;24:Ebuu8nkbWTQZMmNjfznphdgfAB7rvL+pJqy+0DU6zMBIkmVFxTQ/62u7eOXTbmRlmnEKbr8ledSf9XsB0lUaEmHUdpn/+QW0BL2Lfzovusc=;7:kCwz3EOGO1KzyYDqX5JQY0SDkovuVhzxet521Qu5NC5xulyBKwnn1vL32+B4LzvYITLxhaKs/p0mN3xATqGmbwnp7qvp5axQMmzl7k9uEvgOZE79YyFFJShPvD63Qvth7a2m3SqVnqtc+85wQRpedi2RPpqR2l3Br4L6RMxfkzWyg3M9CrElzDm0YTv6xJ+6;20:yLhRNSbLlvemKjw0BxXag7X5qklACuMEfASkAvSCdg+DNiY+z81l7u1Cjf8TYOXQgPuJylGTewNxNopgqmPM3/p2KFXm2VZHiYCCAkCPm2ZqeInB6ALLTFSvSZkhAwhxo7HhmZIEWnEP2/HQy/GPDTRCQ5LOlWHsGYPP2+Ypy7E= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2016 12:15:12.0680 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1299 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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 Acked-by: Andy Lutomirski --- tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/test_mremap_vdso.c | 99 ++++++++++++++++++++++++++ 2 files changed, 100 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 c73425de3cfe..a691cdeb1fef 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -5,7 +5,7 @@ include ../lib.mk .PHONY: all all_32 all_64 warn_32bit_failure clean TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall \ - check_initial_reg_state sigreturn ldt_gdt iopl + check_initial_reg_state sigreturn ldt_gdt iopl test_mremap_vdso TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \ test_FCMOV test_FCOMI test_FISTTP \ vdso_restorer 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..831e2e0107d9 --- /dev/null +++ b/tools/testing/selftests/x86/test_mremap_vdso.c @@ -0,0 +1,99 @@ +/* + * 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 + +#define PAGE_SIZE 4096 + +static int try_to_remap(void *vdso_addr, unsigned long size) +{ + void *dest_addr, *new_addr; + + dest_addr = mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (dest_addr == MAP_FAILED) { + printf("[WARN]\tmmap failed (%d): %m\n", errno); + return 0; + } + + printf("[NOTE]\tMoving vDSO: [%p, %#lx] -> [%p, %#lx]\n", + vdso_addr, (unsigned long)vdso_addr + size, + dest_addr, (unsigned long)dest_addr + size); + fflush(stdout); + + new_addr = mremap(vdso_addr, size, size, + MREMAP_FIXED|MREMAP_MAYMOVE, dest_addr); + if ((unsigned long)new_addr == (unsigned long)-1) { + munmap(dest_addr, size); + if (errno == EINVAL) { + printf("[NOTE]\tvDSO partial move failed, will try with bigger size\n"); + return -1; /* retry with larger */ + } + printf("[FAIL]\tmremap failed (%d): %m\n", errno); + return 1; + } + + return 0; + +} + +int main(int argc, char **argv, char **envp) +{ + unsigned long auxval; + const char *ok_string = "[OK]\n"; + int ret = -1; + unsigned long vdso_size = PAGE_SIZE; + + auxval = getauxval(AT_SYSINFO_EHDR); + printf("\tAT_SYSINFO_EHDR is %#lx\n", auxval); + if (!auxval || auxval == -ENOENT) { + printf("[WARN]\tgetauxval failed\n"); + return 0; + } + + /* simpler than parsing ELF header */ + while (ret < 0) { + ret = try_to_remap((void *)auxval, vdso_size); + vdso_size += PAGE_SIZE; + } + + if (!ret) +#if defined(__i386__) + 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" (!!ret)); +#else + asm volatile ("syscall" : : + "a" (__NR_write), "D" (STDOUT_FILENO), + "S" (ok_string), "d" (strlen(ok_string))); + + asm volatile ("syscall" : : "a" (__NR_exit), "D" (!!ret)); +#endif + + return 0; +} -- 2.8.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 310DE6B025E for ; Tue, 17 May 2016 08:15:17 -0400 (EDT) Received: by mail-ob0-f199.google.com with SMTP id w8so17761858obg.0 for ; Tue, 17 May 2016 05:15:17 -0700 (PDT) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0117.outbound.protection.outlook.com. [104.47.0.117]) by mx.google.com with ESMTPS id dh8si1130744oec.66.2016.05.17.05.15.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 05:15:14 -0700 (PDT) From: Dmitry Safonov Subject: [PATCHv9 2/2] selftest/x86: add mremap vdso test Date: Tue, 17 May 2016 15:13:52 +0300 Message-ID: <1463487232-4377-3-git-send-email-dsafonov@virtuozzo.com> In-Reply-To: <1463487232-4377-1-git-send-email-dsafonov@virtuozzo.com> References: <1463487232-4377-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, mingo@redhat.com Cc: luto@amacapital.net, tglx@linutronix.de, 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 Acked-by: Andy Lutomirski --- tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/test_mremap_vdso.c | 99 ++++++++++++++++++++++++++ 2 files changed, 100 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 c73425de3cfe..a691cdeb1fef 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -5,7 +5,7 @@ include ../lib.mk .PHONY: all all_32 all_64 warn_32bit_failure clean TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall \ - check_initial_reg_state sigreturn ldt_gdt iopl + check_initial_reg_state sigreturn ldt_gdt iopl test_mremap_vdso TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \ test_FCMOV test_FCOMI test_FISTTP \ vdso_restorer 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..831e2e0107d9 --- /dev/null +++ b/tools/testing/selftests/x86/test_mremap_vdso.c @@ -0,0 +1,99 @@ +/* + * 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 + +#define PAGE_SIZE 4096 + +static int try_to_remap(void *vdso_addr, unsigned long size) +{ + void *dest_addr, *new_addr; + + dest_addr = mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (dest_addr == MAP_FAILED) { + printf("[WARN]\tmmap failed (%d): %m\n", errno); + return 0; + } + + printf("[NOTE]\tMoving vDSO: [%p, %#lx] -> [%p, %#lx]\n", + vdso_addr, (unsigned long)vdso_addr + size, + dest_addr, (unsigned long)dest_addr + size); + fflush(stdout); + + new_addr = mremap(vdso_addr, size, size, + MREMAP_FIXED|MREMAP_MAYMOVE, dest_addr); + if ((unsigned long)new_addr == (unsigned long)-1) { + munmap(dest_addr, size); + if (errno == EINVAL) { + printf("[NOTE]\tvDSO partial move failed, will try with bigger size\n"); + return -1; /* retry with larger */ + } + printf("[FAIL]\tmremap failed (%d): %m\n", errno); + return 1; + } + + return 0; + +} + +int main(int argc, char **argv, char **envp) +{ + unsigned long auxval; + const char *ok_string = "[OK]\n"; + int ret = -1; + unsigned long vdso_size = PAGE_SIZE; + + auxval = getauxval(AT_SYSINFO_EHDR); + printf("\tAT_SYSINFO_EHDR is %#lx\n", auxval); + if (!auxval || auxval == -ENOENT) { + printf("[WARN]\tgetauxval failed\n"); + return 0; + } + + /* simpler than parsing ELF header */ + while (ret < 0) { + ret = try_to_remap((void *)auxval, vdso_size); + vdso_size += PAGE_SIZE; + } + + if (!ret) +#if defined(__i386__) + 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" (!!ret)); +#else + asm volatile ("syscall" : : + "a" (__NR_write), "D" (STDOUT_FILENO), + "S" (ok_string), "d" (strlen(ok_string))); + + asm volatile ("syscall" : : "a" (__NR_exit), "D" (!!ret)); +#endif + + return 0; +} -- 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