From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752468AbcDRNo7 (ORCPT ); Mon, 18 Apr 2016 09:44:59 -0400 Received: from mail-am1on0148.outbound.protection.outlook.com ([157.56.112.148]:43584 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751316AbcDRNo6 (ORCPT ); Mon, 18 Apr 2016 09:44:58 -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 Subject: [PATCHv5 1/3] x86: rename is_{ia32,x32}_task to in_{ia32,x32}_syscall Date: Mon, 18 Apr 2016 16:43:43 +0300 Message-ID: <1460987025-30360-1-git-send-email-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> References: <1460388169-13340-1-git-send-email-dsafonov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: VI1PR07CA0112.eurprd07.prod.outlook.com (10.165.229.166) To AM5PR0801MB1298.eurprd08.prod.outlook.com (10.167.216.149) X-MS-Office365-Filtering-Correlation-Id: 6f3158ae-6d77-413f-aa2d-08d3678f9ee2 X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1298;2:TWh0PhdUGzUswT76lLoIH9BBgAWwL7L6m33v160jt8iet37s9w20IN0cWcN7VvhPY+aivhelqisvnBR+fzgJQlStsajudmdj2AmRvhReaef/z54z/jLHqaRw5sg0WtaY/MTbaT3+lZxT9EtTKuGtXMkv1B6Ydf/8IHjeQSnScorbXtthzlXobO7b/ZWR0tGm;3:jBPkDfwIqpymFTQ+j1F+fuksDN2lHk9WiswE28Qpg+4IlNQE2Fy7C1dOm7eFELiXn+EfaJKQr8TxqSh2WmHjc+dcauQOeaYToeq0MqTb2zgBDcHFYCtVLrCJJx7szoKf;25:lYTyhHye2ARlxiqfs28WIChQX8xYX0p4jrXc2G2AMAMyIbVVabc215ir2/LWv8UB+HVKiEt0G213l3AXwyoJPbqpAL++sI6omB7uLCvAij8rIOP4t2JVq9wgOqHEjTZ+uR6RxYgmZ37OzAXZHSlEFW/9pXZ1sMRt79WY8GANLB2/wTk5EEwlXleXIhyKzn4brfqeVWutVkM9K+8lS4farQRyiUH+yycl+0n9ntteym/7M5qB115HMIHarQGncCxlS/ov1oWsfnojyD/FsdPrq8O31Enk65AV2lve3P8XeYjXZdlsBaYEprbvGIYOtxD6sh1kkw6YhvTPvD8thLcRYA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1298; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101521026)(6040130)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041046)(6043046);SRVR:AM5PR0801MB1298;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1298; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1298;4:eCieRdJSlaHJL9Ud8LsOYSlVtsXrjhUUeJURiV2MR+n7kMxdKwKvgfrz3wLmOQZyTLD4KgHizXJ6gczhV1GHc5akvw2EtpEiWfriS0LDsoT1OhOIC+MB6GpOo4FcQPs+0zM4BKRieeoKPjkHHipfsZqj8FzUEOxBZjjmpYdmtlSeNTZU9aiIP4LUciOnb3a7C/YxHfR1S6NXt5SzQ89N2RhidyV39iFNdVe2VaSekIaN/hx3NW7LRxa8aYIeQGTcE40uoSCKXQfcmBL/mxiT/+fOSCI+hk3wgER0OrKuGtYKBH0Ny2y+1wFnY98tcGesgfr1s0mLHRrTNjNiQ6Kv+I0zqDUNAI+Q5xb9EogEq6ktrMOYBj4QlJlIm7SCDgZQSzcdn6DpA/XcsMFOP7VPI+M5yxz8MJB4CmXvGnQr6adDQYGhZizelB3EbACNp/rJMIKA3UZF+k/GcsbJbJcv2g== X-Forefront-PRVS: 0916FC3A18 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(4001430100002)(53416004)(19580405001)(81166005)(5008740100001)(92566002)(19580395003)(86362001)(50226001)(42186005)(4326007)(66066001)(76176999)(50986999)(6116002)(3846002)(586003)(1096002)(2906002)(107886002)(110136002)(189998001)(36756003)(229853001)(47776003)(2351001)(2950100001)(33646002)(48376002)(77096005)(50466002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0801MB1298;H:dsafonov.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1298;23:E+x6WNRgn+NV3F3Qrz9Devs0qRQdVuvnb1rhcn87v+XynczIMwffiCHuMMzUZqknrqbKtr/NM6VqLTV2f1ZXEhG6wpwEpXEu41sHe92TS3XIMxM6qFrpIsKw3MhccbVFlZaGg8yZhHyILcqqHlwc6ZcOwDgQjUe7brPKTpEAVq2Z2kKjhD7xJpiPv7xJIXESSVKWcq49WpI16EFqZ7jyeBD2VkrM4kWBJbSKtbMa2xQovE1ITeFry84Yktr8xwi+c+2xqmgDDhjMMJ2f2RyFUIbCVqzRzCU2C60xacMOfPrcmIhlQG/jQpV/6drdZ/uEu2pPwcYl4HsyRb0UD581oxSHsV8LpD36ETlRdKcnuL7qiUQXW95DqUR10jewDdPbvMYLRIWKX/vZeD3GZe+Lcz99AxEpa5xoGZPOp8VcxB6S42n0BrX+M0xC4c5N3D45NGVuzIxSK4MkagJLcblX3HrQQCiuW09XnrrjArenDR9ERk9BM7IDoOfZTkDmRQwpMjelNrpAM5gAMeUcKXuUGIIeuEmlwdzt/ljVYaR1J4IhVp7T8LHME0qc9epHT8mpoY1koSty4Q4AjlmjCwfWt46cn6hAXde2gNxACRhJeqtTlq0THdSeXiuOHCQiJPV0G0BzbVxDBGRCU1Ru49LLkfqzQDgLUTIzomZFi7EF5mr/HlFIVZs6GCWxTRzYB2MHRlHb+EaDrwXjd72I4ms09rAu1QKYbnEgmR7cbE8bRXpoSYSQ9uqZeHwwNc/vt1d7WgwJPNAd5rqloNlD0Do/QC4ZQRfb9lZWQzqf1ViS5XpDpqtLiTgTerrjY3bPBtF/BWv+3hLKwrrYkxyyXgLmhvu80VuxFlzinSywDH/hnitorP+yNWHzuQMigkpryzmU9BrTiBaqrQaAdHIw4w5RPQ== X-Microsoft-Exchange-Diagnostics: 1;AM5PR0801MB1298;5:5Waorm+JrLfasXNLZKnq7rirAnmz1ncE1gdiHiK30HaDLm+d1lUcx//DdnTXhGSNbpm6ovEbMh0pe5ef1YtreUtgDqNrEfR6IWoUMkNuwpCJWH8I131Uh4k4pszMqNn00xQ5Af6dGVer6L2kNScypI3C5zPS5hJoJ9OQN91hessotaJzgSxKNWCKIGytHtzc;24:KYiWVwPJb8oKaE0vmtyK605Is2jBB1dvVKdaXOQamZZCgo0KnRPDIfQ9q9KVE2RBMpQ9j1PIHslLGYTuYlMmC/leze6NG9k8eal5z2x3EA0=;7:Bz1i2+BVMnFsfFnre8Xj+1g2Jj8rqctEmjOeWRR6sZM7R7CgM+MxNYsb2+ObsI3A3FbWVq2HUDct/yPcNnskqJYqGxOY2h239Y/i4gm2pDdc2plac6SeOIKPzORuhvfAoWdGXqQb+JFwzpWA06HFzeYHwKvYtRTZR8Y21isASpfH0p4kGAByHac6Kx0Nzdiy6suqh48Pzj6lWsjNnRzHpQcOecPIX2MQGZg5AykYQd0=;20:b1Z0MfihO/d9MYGdHgYj1xSwlIES3abo492MbkfkSHkaeBwFd465YzATz4vAW+lqFwYyyxKWQErXEf3lYt60u6XDjHD1TgUvh0gtkolNNWgNikqGNtZxfeJ58yR0P7icYhPPsS3TGBRF1wLrzy1280QJz5kqgYK/CMGhNLZHjp8= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2016 13:44:52.0354 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1298 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Impact: clearify meaning Suggested-by: Andy Lutomirski Suggested-by: Ingo Molnar Signed-off-by: Dmitry Safonov Acked-by: Andy Lutomirski --- v3: initial patch arch/x86/entry/common.c | 2 +- arch/x86/include/asm/compat.h | 4 ++-- arch/x86/include/asm/thread_info.h | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- arch/x86/kernel/signal.c | 2 +- arch/x86/kernel/uprobes.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index e79d93d44ecd..ec138e538c44 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -191,7 +191,7 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch, long syscall_trace_enter(struct pt_regs *regs) { - u32 arch = is_ia32_task() ? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64; + u32 arch = in_ia32_syscall() ? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64; unsigned long phase1_result = syscall_trace_enter_phase1(regs, arch); if (phase1_result == 0) diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h index ebb102e1bbc7..5a3b2c119ed0 100644 --- a/arch/x86/include/asm/compat.h +++ b/arch/x86/include/asm/compat.h @@ -307,7 +307,7 @@ static inline void __user *arch_compat_alloc_user_space(long len) return (void __user *)round_down(sp - len, 16); } -static inline bool is_x32_task(void) +static inline bool in_x32_syscall(void) { #ifdef CONFIG_X86_X32_ABI if (task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT) @@ -318,7 +318,7 @@ static inline bool is_x32_task(void) static inline bool in_compat_syscall(void) { - return is_ia32_task() || is_x32_task(); + return in_ia32_syscall() || in_x32_syscall(); } #define in_compat_syscall in_compat_syscall /* override the generic impl */ diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index ffae84df8a93..30c133ac05cd 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -255,7 +255,7 @@ static inline bool test_and_clear_restore_sigmask(void) return true; } -static inline bool is_ia32_task(void) +static inline bool in_ia32_syscall(void) { #ifdef CONFIG_X86_32 return true; diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 6cbab31ac23a..4a62ec457b56 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -210,7 +210,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp, */ if (clone_flags & CLONE_SETTLS) { #ifdef CONFIG_IA32_EMULATION - if (is_ia32_task()) + if (in_ia32_syscall()) err = do_set_thread_area(p, -1, (struct user_desc __user *)tls, 0); else diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 32e9d9cbb884..0f4d2a5df2dc 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -1266,7 +1266,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { #ifdef CONFIG_X86_X32_ABI - if (!is_ia32_task()) + if (!in_ia32_syscall()) return x32_arch_ptrace(child, request, caddr, cdata); #endif #ifdef CONFIG_IA32_EMULATION diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 548ddf7d6fd2..aa31265aa61d 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -762,7 +762,7 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs) static inline unsigned long get_nr_restart_syscall(const struct pt_regs *regs) { #ifdef CONFIG_X86_64 - if (is_ia32_task()) + if (in_ia32_syscall()) return __NR_ia32_restart_syscall; #endif #ifdef CONFIG_X86_X32_ABI diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index bf4db6eaec8f..98b4dc87628b 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -516,7 +516,7 @@ struct uprobe_xol_ops { static inline int sizeof_long(void) { - return is_ia32_task() ? 4 : 8; + return in_ia32_syscall() ? 4 : 8; } static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs) -- 2.8.0