From patchwork Thu May 26 13:49:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhangjian X-Patchwork-Id: 9137001 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 EE6046075C for ; Thu, 26 May 2016 13:55:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0F5B282F2 for ; Thu, 26 May 2016 13:55:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5732282FE; Thu, 26 May 2016 13:55:39 +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 45212282F2 for ; Thu, 26 May 2016 13:55:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b5vjh-0002Bq-El; Thu, 26 May 2016 13:54:05 +0000 Received: from [58.251.152.52] (helo=szxga04-in.huawei.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b5vjd-0001qB-69 for linux-arm-kernel@lists.infradead.org; Thu, 26 May 2016 13:54:03 +0000 Received: from 172.24.1.46 (EHLO lggeml426-hub.china.huawei.com) ([172.24.1.46]) by szxrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id BKA62174; Thu, 26 May 2016 21:41:46 +0800 (CST) Received: from [127.0.0.1] (10.111.72.170) by lggeml426-hub.china.huawei.com (10.72.61.36) with Microsoft SMTP Server id 14.3.235.1; Thu, 26 May 2016 21:49:57 +0800 Subject: Re: [PATCH 16/23] arm64: ilp32: introduce binfmt_ilp32.c To: Yury Norov , , , , , , , , References: <1464048292-30136-1-git-send-email-ynorov@caviumnetworks.com> <1464048292-30136-17-git-send-email-ynorov@caviumnetworks.com> From: "Zhangjian (Bamvor)" Message-ID: <5746FEF6.9070405@huawei.com> Date: Thu, 26 May 2016 21:49:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <1464048292-30136-17-git-send-email-ynorov@caviumnetworks.com> X-Originating-IP: [10.111.72.170] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.5746FF14.03A7, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 4b23d86a25bb18aec26972be2ea0dbc3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160526_065402_045393_EE26D258 X-CRM114-Status: GOOD ( 20.16 ) 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: kilobyte@angband.pl, pinskia@gmail.com, szabolcs.nagy@arm.com, Nathan_Lynch@mentor.com, heiko.carstens@de.ibm.com, agraf@suse.de, Prasun.Kapoor@caviumnetworks.com, klimov.linux@gmail.com, broonie@kernel.org, geert@linux-m68k.org, Hanjun Guo , schwidefsky@de.ibm.com, "Zhangjian \(Bamvor\)" , philipp.tomsich@theobroma-systems.com, joseph@codesourcery.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 Hi, yury The coredump is usable in our platform. It miss the following definition: +#define compat_elf_greg_t elf_greg_t +#define compat_elf_gregset_t elf_gregset_t And it leads to the wrong register save in core dump. After apply this patch, gdb could debug core dump files. Here is the full patch: From 102624840aa5dacdd1bbfe3b390290f52f530ea2 Mon Sep 17 00:00:00 2001 From: Bamvor Jian Zhang Date: Thu, 26 May 2016 21:00:16 +0800 Subject: [PATCH hulk-4.1-next] arm64: ilp32: fix coredump issue ILP32 use aarch64 register and 32bit signal struct which means it could not make use of the existing compat_elf_prstatus/elf_prstatus and compat_elf_prpsinfo/elf_prpsinfo. This patch fix this issue by introducing the different compat_elf_greg_t, compat_elf_gregset_t for aarch64 ilp32 and aarch32 el0. Tested pass on huawei's hardware in bigendian. Signed-off-by: Bamvor Jian Zhang --- arch/arm64/include/asm/elf.h | 14 +++++++------- arch/arm64/kernel/binfmt_elf32.c | 3 +++ arch/arm64/kernel/binfmt_ilp32.c | 8 +++++++- arch/arm64/kernel/ptrace.c | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 0106d18..9019441 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -154,18 +154,18 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp); /* 1GB of VA */ -#define STACK_RND_MASK (is_compat_task() ? \ - 0x7ff >> (PAGE_SHIFT - 12) : \ - 0x3ffff >> (PAGE_SHIFT - 12)) +#define STACK_RND_MASK (is_compat_task() ? \ + 0x7ff >> (PAGE_SHIFT - 12) : \ + 0x3ffff >> (PAGE_SHIFT - 12)) #ifdef CONFIG_COMPAT -#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3) +#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3) /* AArch32 registers. */ -#define COMPAT_ELF_NGREG 18 -typedef unsigned int compat_elf_greg_t; -typedef compat_elf_greg_t compat_elf_gregset_t[COMPAT_ELF_NGREG]; +#define COMPAT_ELF_NGREG 18 +typedef unsigned int compat_a32_elf_greg_t; +typedef compat_a32_elf_greg_t compat_a32_elf_gregset_t[COMPAT_ELF_NGREG]; #endif /* CONFIG_COMPAT */ diff --git a/arch/arm64/kernel/binfmt_elf32.c b/arch/arm64/kernel/binfmt_elf32.c index 7b9b445..f75253c 100644 --- a/arch/arm64/kernel/binfmt_elf32.c +++ b/arch/arm64/kernel/binfmt_elf32.c @@ -31,4 +31,7 @@ struct linux_binprm; extern int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp); +#define compat_elf_greg_t compat_a32_elf_greg_t +#define compat_elf_gregset_t compat_a32_elf_gregset_t + #include "../../../fs/compat_binfmt_elf.c" diff --git a/arch/arm64/kernel/binfmt_ilp32.c b/arch/arm64/kernel/binfmt_ilp32.c index b827a9a..01baf83 100644 --- a/arch/arm64/kernel/binfmt_ilp32.c +++ b/arch/arm64/kernel/binfmt_ilp32.c @@ -2,7 +2,9 @@ * Support for ILP32 Linux/aarch64 ELF binaries. */ -#include +#include +#include +#include #include #undef ELF_CLASS @@ -30,9 +32,13 @@ * The machine-dependent core note format types are defined in elfcore-compat.h, * which requires asm/elf.h to define compat_elf_gregset_t et al. */ +#define compat_elf_greg_t elf_greg_t +#define compat_elf_gregset_t elf_gregset_t #define elf_prstatus compat_elf_prstatus #define elf_prpsinfo compat_elf_prpsinfo +#include + /* * Compat version of cputime_to_compat_timeval, perhaps this * should be an inline in . diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 5c86135..9784c77 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -913,8 +913,8 @@ static const struct user_regset aarch32_regsets[] = { [REGSET_COMPAT_GPR] = { .core_note_type = NT_PRSTATUS, .n = COMPAT_ELF_NGREG, - .size = sizeof(compat_elf_greg_t), - .align = sizeof(compat_elf_greg_t), + .size = sizeof(compat_a32_elf_greg_t), + .align = sizeof(compat_a32_elf_greg_t), .get = compat_gpr_get, .set = compat_gpr_set }, @@ -947,7 +947,7 @@ static int compat_ptrace_read_user(struct task_struct *tsk, compat_ulong_t off, tmp = tsk->mm->start_data; else if (off == COMPAT_PT_TEXT_END_ADDR) tmp = tsk->mm->end_code; - else if (off < sizeof(compat_elf_gregset_t)) + else if (off < sizeof(compat_a32_elf_gregset_t)) return copy_regset_to_user(tsk, &user_aarch32_view, REGSET_COMPAT_GPR, off, sizeof(compat_ulong_t), ret); @@ -968,7 +968,7 @@ static int compat_ptrace_write_user(struct task_struct *tsk, compat_ulong_t off, if (off & 3 || off >= COMPAT_USER_SZ) return -EIO; - if (off >= sizeof(compat_elf_gregset_t)) + if (off >= sizeof(compat_a32_elf_gregset_t)) return 0; set_fs(KERNEL_DS); @@ -1116,9 +1116,11 @@ static long compat_a32_ptrace(struct task_struct *child, compat_long_t request, unsigned long addr = caddr; unsigned long data = cdata; void __user *datap = compat_ptr(data); + unsigned int pr_reg_size = sizeof(compat_a32_elf_gregset_t); int ret; switch (request) { + case PTRACE_PEEKUSR: ret = compat_ptrace_read_user(child, addr, datap); break; @@ -1130,17 +1132,15 @@ static long compat_a32_ptrace(struct task_struct *child, compat_long_t request, case COMPAT_PTRACE_GETREGS: ret = copy_regset_to_user(child, &user_aarch32_view, - REGSET_COMPAT_GPR, - 0, sizeof(compat_elf_gregset_t), - datap); + REGSET_COMPAT_GPR, 0, + pr_reg_size, datap); break; case COMPAT_PTRACE_SETREGS: ret = copy_regset_from_user(child, &user_aarch32_view, - REGSET_COMPAT_GPR, - 0, sizeof(compat_elf_gregset_t), - datap); + REGSET_COMPAT_GPR, 0, + pr_reg_size, datap); break; case COMPAT_PTRACE_GET_THREAD_AREA: