From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932201AbcDYLiv (ORCPT ); Mon, 25 Apr 2016 07:38:51 -0400 Received: from mail-db5eur01on0119.outbound.protection.outlook.com ([104.47.2.119]:28886 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932160AbcDYLis (ORCPT ); Mon, 25 Apr 2016 07:38:48 -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: [PATCHv8 2/2] selftest/x86: add mremap vdso test Date: Mon, 25 Apr 2016 14:37:03 +0300 Message-ID: <1461584223-9418-2-git-send-email-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1461584223-9418-1-git-send-email-dsafonov@virtuozzo.com> References: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> <1461584223-9418-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: DB5PR06CA0027.eurprd06.prod.outlook.com (10.162.165.37) To VI1PR0801MB1311.eurprd08.prod.outlook.com (10.167.197.149) X-MS-Office365-Filtering-Correlation-Id: ca083cab-4c8f-49c7-d84e-08d36cfe2910 X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;2:/zk1VpTKqp/VdRdrCneU6bjzN3zUdZsiMtTumGdGcBJE0tlAy0uQq+R7ZOZEYJ2ga+DbOAiCxmkAKo1Is4zL3Zt36FvlrvsFfqkEU1+tOsdurCq+SiVEtv+NLumsVnww8pRufhnN+9GAcEoe4lYtQufYWZiNeXBuE2JoPGA4ZWOvIoXRNe5fN6ubV1MWtoyj;3:JlRTcXuGu5Q6Zt8FqJPnnyIRv6SWpWTlXadcPBl4TWicgJMg/4yspVO27kLZLg8CQZ+1GhaJZTXhGYUnejkSB2PxkuVS9LxcddYmW5WkWKGJNSLvcRi+KnhYfxI870UR;25:hXdUbutlsXKk6VzVIEaAxYDbQTDbraGc44HNTEjXiuTvptBMpdT7z0AG0tzdfXwrSBVNMfJ+7FERmtpEIzv1WHHI+SQ03sTW7l4Vs+XwTTAAPI4O5cSVbz4pLr0M8lOQUTQqvrS2bw8i20Eg6XAFjx6WhN4OqHdnGwlHzwVfoQ+8VX85SI0CIyJpPvIyB2E3zu2CHnxhapdrPXC7o1M8+ABEJFbb2QtAi6sIUZmuFhwXXSfKsqd0PsmFLGjWY44XrFY6rNyc1iFDlQYQT7FfZ/UmzP0Lj43OeC/Xy+rIXkfwsPmjx59pdmYUUhskbkHzg95FD+Ji1Oo88Q08Wmnz6zupxThXA+oAC2P1u5E5QCGVf1NTutCNuxDWFw9XaXBhe0vQrKw/iY8Itq5ZP8T8bLCszLn4NxReWoXgvPqItxUgiwYl4F+K5FOPLQA8ecmg0VEuea0ccBUHT6N1zDoOQTzkSWOuGDJIi+jOWNzU2a+Aqqe6C/WdC1S1I2BTk2gZFft9l28R+ZE8FAbi49qsc+Fcen29bqEjRkwJPk5BsKaVwN4nJ5gmQKb3yy78UuoXeCsB+208e86oF3ruynnAlmd2PTZaMUJAz2jXDmPXhsPcbm2ZUH82jR72JouSMJPA X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1311; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101521062)(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046);SRVR:VI1PR0801MB1311;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1311; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;4:7vCBX799Nw8lTUj8HOn1COa7upV53GjaeZ5bXSRwUVV32J/T1q9UyfYFS6+0vSLYj8lX7cmOTHPTNJnopGccmExkEt7p8EwZm5YuXAjcqtbjVRLbwYuF57qblI4/+iJpvTaimmfyjyWsJIUw9e7OWowz7jOPXqyiGwWNQGLnkNaRrFPLWDIjZXcnhDCIZE3AtSz5yd7RyOuF2yvfF3IUpVzkYV9wsTFnpYmqRvL3p9UoIcOS5N9Cw4tg1GjThtrRjey+sA7zNqBgk2U6Mqhagj5A9pyMCvu+Qln8+PgcdxdCDMPOPCQuJrMGLnhlC9q5zkAYllxKLDQt55Bzf1zWXeclTpQKAUsFl9mXSySMLxl/Tm/aiJo9WSUv9vyZP4gGiIjK6TTiCUGZFr1reoZBhO71mhVyKbTyeg574a+JZdadENVYj5V3AdrCyzzuB8LS87gEIc22qk0aK0H3iHtmEw== X-Forefront-PRVS: 0923977CCA X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(1096002)(189998001)(3846002)(6116002)(86362001)(586003)(229853001)(110136002)(50466002)(5003940100001)(77096005)(48376002)(33646002)(42186005)(19580395003)(19580405001)(53416004)(2351001)(92566002)(81166005)(4326007)(47776003)(66066001)(50986999)(76176999)(2906002)(5004730100002)(36756003);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0801MB1311;H:dsafonov.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;23:1q5AY62uAv8p0AvnXlP1lRyO+2J5P77FHkrC3JvXDCHy3hWGY6AWN8Cn0LljVFxcncB4kWKGuFoqtJkjlRTpA9UgdtKH9Igg4C9tl1jtk9QTTJrxM1QcHQM++uk2IQtpSapZokxz/SZ9jjJefAjI3kyHQ6m9jsLZ+R1y56Dn36n1bzuIYeY2AFgdK8derFkKGMD7Fk5mFIFMWtVy5NE0cuk6aNEfUXbFUQI/jpqTvXg3diAXiZrV7PBVLgi3gpncfAnXeqUaup77Uta//aXbMd1oltEhiZNVkAR+UF9zK6EheVexYCgJfPM1JyjEOiiYT2sQ2PhXuuot442c6W3rw5JQ8JFi5izET12b1aFP97PZ1dvM9HD3IgMZ0fpJaalAvLHl3yQBdEeAlCBQeZJLHm4lbXoi/QaLEy7Wm6PMZSHRNWb0ch9vEpsH8mIoFuMHuJQpEdOPL6I9GKihdAj7rP0lBbr2Ewr9XKKnEY9eSJVqtpSe9Og8GTrvnj1oojWcf+5TzKzn18ao6HG6yLe16B5suB36O9i8utUov5Crjwsoya0uIao81Czk1MyYsWSBYszJ01qSOe1bv+G0TzE4Qm7R2+kFUDYwwFANA3Jh02Sz4Za3oGkJEfRBkoiGcHBl4AZW5x6Zo8BLKku8PEE+CnCKDs6aceyWm97V5ZBB4CziEaPOR5/E9vsHFS7BHDu3GQLJbRjOb8HUhCQ4UiLVj0nZof37JaC7rUmNLIUBHffUoz8KoTVqPMEJI4/tioT6AbWavX6NRlIhJCkh4sE8tgdVe3WvwIDZEVHrtj1U68mPM6HAC2JWeUe69NJmJvb8/HgEhYqDSMfhM/eqOYNG6A== X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;5:AGAmUlDk8YOP2T908crK3eCNLs4iy/b1J5Dt3v+sAwxv1rhcFtrsPfEuRWtUI1b1n5D/AhrGxN/0YxZimAwAezB70S8C8lSZ3efCslsdkgqlrF8V04b+hh5mvENS9hVbH/OfGsKWo1bZuovvqkkcRQ==;24:dWqzKbZ+tn7fUwxUPMhcd2DbJ4qFVOrr4vbe6/BAiF8HUNwBUbzFOV0wmr1Wl9gMIC1dDR7zFzj1/ZjfSz+xnNPRaNK40lVElN6hd5U6cDA=;7:jyLyTNavU0cSWljehe00Ng9wq5buhA74CC6vXM8m1YVmCwuAsAQwKIlR1/degeM5lY1E+m4RmmBVf10q/eZxqHGk4SnZtB8HOjIviKmYKdAXKYWuNk0wa+b064hFABnc/9LPRBTLCuPkbuw9EKRlV7U3YDskhvsNPxyASBhYvORf4SjjMsFxHlPJMgfdRhTP;20:Q3q6GzHtRMRmyFXk84BAyr3obw9JTfCx67lstIfX1bhlvDVZJ4BBafDIjebvsSJTCPQARCEDcoF9O0+ZQLRf+J7iyoHx3Si3fe5rkFCeI6mhjKwrCrJFqYae+KiXAXAFxmHTCkOf/07xOUPWJ2ERXXEdhZNYdtJqqcCzcY2L7Vk= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2016 11:38:43.8177 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1311 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 --- v8: run test for x86_64 too; removed fixed VDSO_SIZE - check EINVAL mremap return for partial remapping v5: initial version 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 b47ebd170690..ba865f2efcce 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-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by kanga.kvack.org (Postfix) with ESMTP id 109016B0253 for ; Mon, 25 Apr 2016 07:38:48 -0400 (EDT) Received: by mail-qg0-f72.google.com with SMTP id b14so241402774qge.2 for ; Mon, 25 Apr 2016 04:38:48 -0700 (PDT) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0133.outbound.protection.outlook.com. [104.47.2.133]) by mx.google.com with ESMTPS id 130si10251387qkh.144.2016.04.25.04.38.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 04:38:47 -0700 (PDT) From: Dmitry Safonov Subject: [PATCHv8 2/2] selftest/x86: add mremap vdso test Date: Mon, 25 Apr 2016 14:37:03 +0300 Message-ID: <1461584223-9418-2-git-send-email-dsafonov@virtuozzo.com> In-Reply-To: <1461584223-9418-1-git-send-email-dsafonov@virtuozzo.com> References: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> <1461584223-9418-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 --- v8: run test for x86_64 too; removed fixed VDSO_SIZE - check EINVAL mremap return for partial remapping v5: initial version 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 b47ebd170690..ba865f2efcce 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