From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360AbcEJNph (ORCPT ); Tue, 10 May 2016 09:45:37 -0400 Received: from mail-am1on0141.outbound.protection.outlook.com ([157.56.112.141]:55552 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752263AbcEJNpd (ORCPT ); Tue, 10 May 2016 09:45:33 -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 resend 2/2] selftest/x86: add mremap vdso test Date: Tue, 10 May 2016 16:29:11 +0300 Message-ID: <1462886951-23376-2-git-send-email-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1462886951-23376-1-git-send-email-dsafonov@virtuozzo.com> References: <1462886951-23376-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: HE1PR03CA0031.eurprd03.prod.outlook.com (10.163.170.169) To HE1PR0801MB1305.eurprd08.prod.outlook.com (10.167.247.147) X-MS-Office365-Filtering-Correlation-Id: eea441be-7b7a-4cff-dc21-08d378d744c5 X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1305;2:10BVnEe00HBAZwouqtFHZnEVyPliQhtWqG69itwO71+gZbXgMhsAKv6XF70UKKPv6FjB8gIbxdZZoM32EDnhV6SK7leiSnVhLMxFfcn4y66Of/WbvvnvAnluw2cZFo25iUuncsaqCVqKGpaKrk5C/IifLkn8iLs+/FNZS3OK/+xt6rreowYZLyTWqA+Gk+Js;3:/y4sjCjZ9QyOmVeJ9K/gRSQEhb2LSuyq7BhDN97S8gq7AxiJF0BCBtuHH8OiMrSD7Xp8icI7Fei62rwC7SapQdm2O+GovLsSik75E5RrawD4urLzIwZAEqeQ10rp5V4e;25:aT/jfwzXCHqAv+R6qSMXMhAkCVMnwBqOgUoxhNn+ndnb5C+bWKBHi4CtOvYzdYKOOkqL/wRGdX4wpZFsjLL+ZYYco13NTh1mnvZd8V9FTSUU4Bx4746r3l05SNyjaCLEAaeXwY+pl3zNFZB7kIOdT8uSG4h1yhLxxC98yQELf/97KdgQAa+VdHe9yYoDiE8nc26yUp5yYTwgI1SitpdLtkoTBA0h+Quecg6qsZsr8mRiOwGw9LweH25uHZGQZN5UWFXLtlC+fHfnPF6p5NODioA7LPSMIJyWQQ8HGnuwhBP/w2AjWVE0rTfHobze9Y98TFExRHRgttjv/ptNVis8kJy5kdZhOs3EghVBU1etsB6YH598VkOdYmvH3sEDgMi5+aX0woEc2iC1lv0WEaDd+dVXHZlZcNUSiu3lp4NHxDroZDD+OJ/Ru3YQ7KuqDXMk X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1305; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041072)(6043046);SRVR:HE1PR0801MB1305;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1305; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1305;4:pYBeeIOGb8j3xEDOnFUdD/cgEm9WaNcFpvsdJixFhOTUgSUaGkQ3MprVPzy2ARCYi70d/1pxkzwThCK67ucVr/wD95ISGpo8v5X3/betg+NtkMFDF3xLSefnKCLSKYvScYfhsVI2MxrAriK2+SCxZj8CSqar2F90a9nmlM3tRaGxptv8CWYk3qS73VJSUMFTVTQd20mU4vzfiFFL/FO7idroZw6hahdGqQCG2rNR/Ofx5XRo/t+DSQeks87z7DueEJwWptSVz1zoTwUXibhlx8HcxyDJmEgJiDzmVmV6GJ33HEn+aZquo5D5wF6Y7/VadOhS+aVgyhedKsDc3DMa3tKoxxxr+LaCDLp12BjpxdL3pG17MmgfppNCNG39eptztF8jtPvIIhgqS8BDdsTJZk/uw2nLTaPpyeQzSiuu1is= X-Forefront-PRVS: 0938781D02 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(229853001)(50986999)(76176999)(66066001)(5003940100001)(86362001)(47776003)(92566002)(19580395003)(19580405001)(2950100001)(77096005)(36756003)(5008740100001)(33646002)(5001770100001)(50226002)(5004730100002)(42186005)(53416004)(2906002)(50466002)(6116002)(586003)(81166005)(48376002)(189998001)(3846002)(2004002);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0801MB1305;H:dsafonov.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1305;23:xuFuq/N97rvD5G2eXLIsPHjVwQlIVFRmZIr2ZOfTwYwMstXg1ZQsK4U4ean4hsrNRvVSTWvqxoCpJchpxcWUPk80S77860hyDSvujvOfFEJbNWML8BwaNMN1UPNpBiUcU7ji3iiLh2QWHI5pi9TuiagXnER/0EBmcUILzjWMUCyqHTpyRpruytgB/sGFo/Bi4MidSysLb6ggKDev1xA4lWN8qKq6VHTDcBT9ZNTfTzmuOXp3tpBLplTzULCoBJF0AZmiEiQGgCBI9yXtbd3q8Uel2yc8lOnUVk+SqTze8DIElCGnhM1gt56asfD0pFskdzlSfknjG2WNuojYfTyh1pcpXySvVFzhinCTH5GvL22Xy5pijss8WfUQZiqwbh0IkWJCSqZObHLM0qlX4xXHmR5UNwi+SgzjGgGigUWp17zWde7LwHoNBlA6mMaRvgT2dCLMPfcYaRRO2DWt+44I7aa17SWaMDuphpdNQNli0jlSh4YKFmbdkCoV8cX/BV6NfsIb8e2xWb3R/nodzAI+WWjcWzwxJI3NDtKS9wkr4OKgXIorR9aaieWLVouKzNV6CFrNwFO62hv62Fapd2wTi+2B32IMA+A3rX0FWkZzfHgrPQeZaR8QEslWEX8J/p1Wb1gU3Z1hLij7/mcwCmiMAnMerNx2+vbIdEQZKTbOQgUJtdx8pwb9UbP4npL907GS1JTAiJxO4T/8oXczunP9QRJO7ZXVp1JVrCfEY2pfBlW8OvDBkohC3x/nymRY+t+3tdHqRqCtIH9DkiUO43oTwdYfPy3Q0y1qrTG19iJzcoWBqqj5GyU1W/coiaslKUom/5vwOe7liZ7Rk7drydG2BzHL8DH82tunww9hhfbVLUyqMKmLtelGZr1RNC/B+GHc X-Microsoft-Exchange-Diagnostics: 1;HE1PR0801MB1305;5:Hk7bFFKz26AnBh0JWmpcE3hCs0rj+J3SOaO6pfJ3NIfm0qmluSXtFOp+l4EuByn7L2rczLOPerCAGRDLj+0hpUaFkHfTj/iW+3eDNwfOq500dF1i7Iklf6rF6rvv/DUWaKx+D9nSqhwIt1D7THAd2A==;24:ctOUTKYU4jlMEjJwp5ASZRN13tsjBYm4Pa46KywES8WKCPWmYivLfhy4kuOu4ZRtwtAUwZC8RidS3vwH/4p11Kci0hLRXNISrOLPsTDTtOw=;7:owqwRuoFLJZjwPxa7aZTGJODDF/q5cUX1ZVyhO/ageAQNLvUsyqbcl9EiU3+8E8PhsQ+K5yb7xgFH6pY59uK+zMISlMUnjRwIogHzY1H54wk9KOmCNz+P3Mk7s3eB9UGmZQczICHQbdVSnNBFJgfvCv6RM38VM+xWD60doGYyKMoBLH2IKMUgA2BiFUer9Yq;20:5OU+XfZLaiF2GmqVphx8LZ4N3tQnY+1/Eh3AT+ZUD4ra7lKMIZ+SX5h8XvppMUkl5pqM7eA6fXvJE1E/sNcGctFTYlSMoqs/kp5wfPd85Zv0g23BwaWzCM6WkE8GkSy4m+SkE5wAiaUB0U6+0ordjAvGrudBpVq4R1EuKz3fusY= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2016 13:30:34.2740 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1305 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 --- 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