From patchwork Wed Jul 20 19:22:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 72472 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp43927qga; Wed, 20 Jul 2016 12:23:53 -0700 (PDT) X-Received: by 10.98.36.15 with SMTP id r15mr64856332pfj.1.1469042629215; Wed, 20 Jul 2016 12:23:49 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o18si4858995pag.285.2016.07.20.12.23.48; Wed, 20 Jul 2016 12:23:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755228AbcGTTXk (ORCPT + 29 others); Wed, 20 Jul 2016 15:23:40 -0400 Received: from alt22.smtp-out.videotron.ca ([70.80.0.73]:36508 "EHLO alt22.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754717AbcGTTWu (ORCPT ); Wed, 20 Jul 2016 15:22:50 -0400 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id Px4xbzMwjzCgpPx4ybbSCV; Wed, 20 Jul 2016 15:22:48 -0400 X-Authority-Analysis: v=2.1 cv=QfzGxpvv c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=cAmyUtKerLwA:10 a=KKAkSRfTAAAA:8 a=tBb2bbeoAAAA:8 a=4-o70nTs-70vGUyL8pgA:9 a=cvBusfyB2V15izCimMoJ:22 a=Oj-tNtZlA1e06AYgeCfH:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 1D7F42DA06A4; Wed, 20 Jul 2016 15:22:46 -0400 (EDT) From: Nicolas Pitre To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alexander Viro , David Howells , Greg Ungerer Subject: [PATCH v4 11/12] binfmt_flat: add MMU-specific support Date: Wed, 20 Jul 2016 15:22:40 -0400 Message-Id: <1469042561-7360-12-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org> References: <1469042561-7360-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfGTe9Y3fdSPJMlDmXbS5qQ4lNegC3ALlmsknNxQnASGjKTVL5IxPTC6QU2sElCFKNPwvhKAt90j0XS7Ys7LyDRqWeNeSRSfAk1GLgc505HAZMNlfMBDA RSE3p3/U48/ZtJvSqBVzvGcBLQA6C5klY/gLRVBYVuSn2VeMaczcrxuCsB6oxvqHYSBm589peyrKpyE7vWj0mflOgdPvuNjnzypXmk7AxTWvuB2KDkB9Ahon EmCg5ZBTG3oseClarRsidgIVk03V+eGqSdQWYFebAT5VbqDDLDrzrCDL+dwlhjRZ1T1RChoG7tz5vzNP2BfAUw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not much else to do at this point except for the different stack setups. SuperH and Xtensa could be added to the allowed list if they implement __put_user_unaligned() and __get_user_unaligned(). Signed-off-by: Nicolas Pitre Reviewed-by: Greg Ungerer --- fs/Kconfig.binfmt | 3 ++- fs/binfmt_flat.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 72c03354c1..4c09d93d95 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -89,7 +89,8 @@ config BINFMT_SCRIPT config BINFMT_FLAT bool "Kernel support for flat binaries" - depends on !MMU && (!FRV || BROKEN) + depends on !MMU || ARM || M68K + depends on !FRV || BROKEN help Support uClinux FLAT format binaries. diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index aa7971ce6a..7b999aebad 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -537,7 +537,7 @@ static int load_flat_file(struct linux_binprm *bprm, * case, and then the fully copied to RAM case which lumps * it all together. */ - if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) { + if (!IS_ENABLED(CONFIG_MMU) && !(flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP))) { /* * this should give us a ROM ptr, but if it doesn't we don't * really care @@ -677,7 +677,9 @@ static int load_flat_file(struct linux_binprm *bprm, */ current->mm->start_brk = datapos + data_len + bss_len; current->mm->brk = (current->mm->start_brk + 3) & ~3; +#ifndef CONFIG_MMU current->mm->context.end_brk = memp + memp_size - stack_len; +#endif } if (flags & FLAT_FLAG_KTRACE) { @@ -870,7 +872,7 @@ static int load_flat_binary(struct linux_binprm *bprm) { struct lib_info libinfo; struct pt_regs *regs = current_pt_regs(); - unsigned long stack_len; + unsigned long stack_len = 0; unsigned long start_addr; int res; int i, j; @@ -884,7 +886,9 @@ static int load_flat_binary(struct linux_binprm *bprm) * pedantic and include space for the argv/envp array as it may have * a lot of entries. */ - stack_len = PAGE_SIZE * MAX_ARG_PAGES - bprm->p; /* the strings */ +#ifndef CONFIG_MMU + stack_len += PAGE_SIZE * MAX_ARG_PAGES - bprm->p; /* the strings */ +#endif stack_len += (bprm->argc + 1) * sizeof(char *); /* the argv array */ stack_len += (bprm->envc + 1) * sizeof(char *); /* the envp array */ stack_len = ALIGN(stack_len, FLAT_STACK_ALIGN); @@ -912,6 +916,11 @@ static int load_flat_binary(struct linux_binprm *bprm) set_binfmt(&flat_format); +#ifdef CONFIG_MMU + res = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT); + if (!res) + res = create_flat_tables(bprm, bprm->p); +#else /* Stash our initial stack pointer into the mm structure */ current->mm->start_stack = ((current->mm->context.end_brk + stack_len + 3) & ~3) - 4; @@ -921,6 +930,7 @@ static int load_flat_binary(struct linux_binprm *bprm) res = transfer_args_to_stack(bprm, ¤t->mm->start_stack); if (!res) res = create_flat_tables(bprm, current->mm->start_stack); +#endif if (res) return res;