From patchwork Sat Jun 25 09:36:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Chengming X-Patchwork-Id: 9198449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F3AFE6075F for ; Sat, 25 Jun 2016 09:41:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5091284F2 for ; Sat, 25 Jun 2016 09:41:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2ECA28500; Sat, 25 Jun 2016 09:41:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B873E284F2 for ; Sat, 25 Jun 2016 09:41:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bGk2u-0006tx-S6; Sat, 25 Jun 2016 09:38:36 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bGk2q-0006rH-UW for linux-arm-kernel@lists.infradead.org; Sat, 25 Jun 2016 09:38:34 +0000 Received: from 172.24.1.36 (EHLO szxeml434-hub.china.huawei.com) ([172.24.1.36]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CDW03072; Sat, 25 Jun 2016 17:36:40 +0800 (CST) Received: from [127.0.0.1] (10.177.236.183) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.235.1; Sat, 25 Jun 2016 17:36:30 +0800 Message-ID: <576E509A.7090702@huawei.com> Date: Sat, 25 Jun 2016 17:36:26 +0800 From: zhouchengming User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Yury Norov Subject: Re: [PATCH 17/23] arm64: ptrace: handle ptrace_request differently for aarch32 and ilp32 References: <1464048292-30136-1-git-send-email-ynorov@caviumnetworks.com> <1464048292-30136-18-git-send-email-ynorov@caviumnetworks.com> <57577611.9000607@huawei.com> <20160608170048.GA24482@yury-N73SV> In-Reply-To: <20160608170048.GA24482@yury-N73SV> X-Originating-IP: [10.177.236.183] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.576E50AB.0012, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 0de23ca63fc6221bc0243ae42bc70c4c X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160625_023833_517856_36D76764 X-CRM114-Status: GOOD ( 22.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-doc@vger.kernel.org, szabolcs.nagy@arm.com, catalin.marinas@arm.com, heiko.carstens@de.ibm.com, philipp.tomsich@theobroma-systems.com, joseph@codesourcery.com, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, Prasun.Kapoor@caviumnetworks.com, agraf@suse.de, geert@linux-m68k.org, kilobyte@angband.pl, arnd@arndb.de, pinskia@gmail.com, klimov.linux@gmail.com, broonie@kernel.org, bamvor.zhangjian@huawei.com, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Nathan_Lynch@mentor.com, linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com, christoph.muellner@theobroma-systems.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On 2016/6/9 1:00, Yury Norov wrote: > On Wed, Jun 08, 2016 at 09:34:09AM +0800, zhouchengming wrote: >> On 2016/5/24 8:04, Yury Norov wrote: >>> Here new aarch32 ptrace syscall handler is introsuced to avoid run-time >>> detection of the task type. >>> >>> Signed-off-by: Yury Norov > > [...] > >> Hello, I found ilp32 will use sys_ptrace, not compat_sys_ptrace. So I write >> a little patch to see if can solve the problem correctly. >> >> Thanks. >> >> From f6156236df578bb05c4a17e7f9776ceaf8f7afe6 Mon Sep 17 00:00:00 2001 >> From: Zhou Chengming >> Date: Wed, 8 Jun 2016 09:46:23 +0800 >> Subject: [PATCH] ilp32: use compat_sys_ptrace instead of sys_ptrace >> >> When we analyze a testcase of ptrace that failed on ilp32, we found >> the syscall that the ilp32 uses is sys_ptrace, not compat_sys_ptrace. >> Because in include/uapi/asm-generic/unistd.h it's defined like: >> __SYSCALL(__NR_ptrace, sys_ptrace) >> So we change it to __SC_COMP(__NR_ptrace, sys_ptrace, compat_sys_ptrace), >> let compat tasks use the compat_sys_ptrace. >> >> Signed-off-by: Zhou Chengming >> --- >> include/uapi/asm-generic/unistd.h | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/include/uapi/asm-generic/unistd.h >> b/include/uapi/asm-generic/unistd.h >> index 2862d2e..50ee770 100644 >> --- a/include/uapi/asm-generic/unistd.h >> +++ b/include/uapi/asm-generic/unistd.h >> @@ -364,7 +364,7 @@ __SC_WRAP(__NR_syslog, sys_syslog) >> >> /* kernel/ptrace.c */ >> #define __NR_ptrace 117 >> -__SYSCALL(__NR_ptrace, sys_ptrace) >> +__SC_COMP(__NR_ptrace, sys_ptrace, compat_sys_ptrace) >> >> /* kernel/sched/core.c */ >> #define __NR_sched_setparam 118 >> -- >> 1.7.7 >> > > Hi Zhou, > > Thank you for the catch. > > Could you also show the test that is failed for you. It should > probably be sent to LTP maillist. > > I'm not sure your fix correct as it affects other architectures that > use standard unistd.h. I think it's better to redirect the syscall in > arch/arm64/kernel/sys_ilp32.c with corresponding definition. > > Yury > > . > Sorry, I missed this mail. Thanks for your reply. :) I attach the testcase file of ptrace that failed on ilp32. I also think it's better to redirect the syscall in ilp32, so I changed the patch. From 7e692ba1adf02c2a2f125836f5222f455c9ffe56 Mon Sep 17 00:00:00 2001 From: Zhou Chengming Date: Sat, 25 Jun 2016 18:02:51 +0800 Subject: [PATCH] ilp32 should use compat_sys_ptrace The file include/uapi/asm-generic/unistd.h defines this: __SYSCALL(__NR_ptrace, sys_ptrace) It may cause some ptrace tests failed on ilp32. So we redirect the ptrace syscall in arch/arm64/kernel/sys_ilp32.c with corresponding definition. Signed-off-by: Zhou Chengming --- arch/arm64/kernel/sys_ilp32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c index d85fe94..06d5e1b 100644 --- a/arch/arm64/kernel/sys_ilp32.c +++ b/arch/arm64/kernel/sys_ilp32.c @@ -46,6 +46,9 @@ asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void); #define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper +/* ilp32 should use compat_sys_ptrace */ +#define sys_ptrace compat_sys_ptrace + #include #undef __SYSCALL