From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F6CCC6FD18 for ; Wed, 29 Mar 2023 13:49:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F55E6B0072; Wed, 29 Mar 2023 09:49:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A5586B0074; Wed, 29 Mar 2023 09:49:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46DE96B0075; Wed, 29 Mar 2023 09:49:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 381D16B0072 for ; Wed, 29 Mar 2023 09:49:07 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DF30CAC28B for ; Wed, 29 Mar 2023 13:49:06 +0000 (UTC) X-FDA: 80622067092.17.442A4CE Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf11.hostedemail.com (Postfix) with ESMTP id E4AAF4001A for ; Wed, 29 Mar 2023 13:49:03 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=L9cQD2qJ; spf=pass (imf11.hostedemail.com: domain of gerg@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gerg@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680097744; a=rsa-sha256; cv=none; b=w0T8t4+LSQarO/ugUsDSdcWqrTRfa5CG806uHdYHirqW1AEk3cQOh3w/rr4/HmSfiP+wN0 rnOGA6Q3Rh46+qHF+rosQs58y7ibCexNFlVqiRQH4tLst96stiuvRpjAj9+11cUPxmCS/O /mMp5AoDxAAI38nkTHrmCdssJ6qWnzs= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=L9cQD2qJ; spf=pass (imf11.hostedemail.com: domain of gerg@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gerg@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680097744; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=AVciClgdIFQR2joBsbvfANUOKQ9IRIm6tnahs4X1aBI=; b=h0CfE/rI6EDr+bxTXpY8paSteuBsVQAIm9JiCR52IMX+ETD69OYGwAvYUTTmK+W+9ka/XZ aYD8pqEUSx54xsdWgt7eg1qTVRh1T9WowfgNhOr3eM4p/RPYrqnsEYjspyGyqpWNHGUH8E /thidaSPOSVssZ0sMoGNTXB/8+1x+jo= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 16040B8232E; Wed, 29 Mar 2023 13:49:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C12BEC433D2; Wed, 29 Mar 2023 13:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680097740; bh=4CYRpZJwGBLZQdCvRQ/0yUVdTu1yQ3sxxG0UwTS2TfI=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=L9cQD2qJlnnTQf4Y0EZwxebIrjGPmUQ6Xgi71qfGoylBP9iTlc6dU8p1vRI2pDaa+ q7zMjW9cfp0uRsG2eMPutCkBUNUJD8CBhPB5eZ+pzf5oalAMOvEiExxUx6p3YNIaNB GHiNZu2sttJtexBuLl8Lo/G6znxaANW3rBSXJ85VIDsejwZ8192Vup2uMKfaaHUQA0 9VBgvNaHqRtxRq1aazYh5rzuiQFD/iKQ3omCp/ahlIy9NPMRD7dZY8+f3xz0pNzalh vSarXTZUItKG75CPSRZn0ybJQnsoJfTVqvqveMyZ/HlcvmWXwYp5M6JDym5lgMS0Hk r08PIi+/An4jg== Message-ID: Date: Wed, 29 Mar 2023 23:48:55 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH 1/2] binfmt_elf_fdpic: support 64-bit systems Content-Language: en-US To: Palmer Dabbelt , viro@zeniv.linux.org.uk, brauner@kernel.org, ebiederm@xmission.com, keescook@chromium.org Cc: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: From: Greg Ungerer In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: E4AAF4001A X-Rspamd-Server: rspam01 X-Stat-Signature: i41wyhczptzcz3tjxeo1np8yay9zseaa X-HE-Tag: 1680097743-969194 X-HE-Meta: U2FsdGVkX1/C5sDwwKAlgWDPHMW9xlYUgywi9RPSpT17oix6vwpu+i0dOL2dO0bfoekWagareJS7/Gtxf/wMV7K8CZR7KdZscFHZu7W3c7FMmkfQFI5GeTappmG+1oO+El3oIW71Y5z/+MiEL5ZSttaq53KNyGnOr2eu3/jbNZHGukY6whO2kJAaeiqk0G5zHu3LaQ3TSuBuKEeOlwaREA6gj4x685Nq/Ty82IFTBRvL84SsQjj518XXFCN++6/5anUHLVZIqWWqDv6fncXqSQ36BwSJn1WKJj2J8UZcDeyd2qSTvBLf/PI5NAh5qVI3jkmEkRgBDwJu100ll3qsf+a2yPFIL890hlqpOAjNiYtsKUrsXQ4XWKT1BPcpvYUW4oJEHHETEPn7HboV/+EOU8vo88IIaKyZWyVoWZ5TfsGO9ydu6WY7oyt1jczCP0vnk25dzsDQue93uv263RwGJgWkWT0qDYfccC1+4tkdwfQrNneXtXiK1hKCrrghtmWckVr1OqJ5knIYAFC59H3q6JOqJ8dt3sxHt/0r24oDAEvUIMw8ZI7HJLNNQ4AY0h1f6+sMCJhsNgku8AABos3V34u7XpnXm1WiwZffF7mkyMhWyn6PQw9TNLbwUCUcMqIP4JKV5OjghWj6Q6Kqet8Fp2pfz76nL97fMEZNggMHRGU56y86kdowEAu7ypFdGiHE2E8bzmNX1fqbPNuaUXHeD0W6N4dKISa5nEV4z4tSARreaNEns5Yn3S/9gKdRiMvwb6JLoVH8+qLXQoZELrA4P4QJdXDoim3qyIgVKoqLLPdp9spoaPYC+Nxw4eha9w0eDAJ0+tZ7TJRLSIuLdhcha+10qpy0DjFyU3lrQ17jSnXRGOEYK5IHk4pmE5qkf+V2giG5ZKcxQCwevWXZY49W9qz4/v0frWvdvqySqVBY0plAeRAwU3ubnmGIz/ddJh7AvaWIrvruBBaQBjGHgGl 1YlT6qyl aVR8IfckPtjYZe9cR6XXwx2zZSZgadSmQP9BMl7zuvM0abxV81SNGJnFiyEex48fVubEhUo0bFs5yWfJxj7o9kQ6oHTyibEjCN5pSME2++Fhsv6KWMfiYwdv0BBGYWN+qc0VDCW3dEV1+PAp7iJuRJGomrsvvHyR58jBW2/7hd/FyVYXZ5uzVHErok1APylhGZP6xr98QZCkzbjsHrN3TXfeGkwI90d9VY8fK7KQFizDYc6G7DOmf1D95dA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 22/3/23 08:49, Palmer Dabbelt wrote: > On Tue, 28 Feb 2023 05:51:25 PST (-0800), gerg@kernel.org wrote: >> The binfmt_flat_fdpic code has a number of 32-bit specific data >> structures associated with it. Extend it to be able to support and >> be used on 64-bit systems as well. >> >> The new code defines a number of key 64-bit variants of the core >> elf-fdpic data structures - along side the existing 32-bit sized ones. >> A common set of generic named structures are defined to be either >> the 32-bit or 64-bit ones as required at compile time. This is a >> similar technique to that used in the ELF binfmt loader. >> >> For example: >> >>   elf_fdpic_loadseg is either elf32_fdpic_loadseg or elf64_fdpic_loadseg >>   elf_fdpic_loadmap is either elf32_fdpic_loadmap or elf64_fdpic_loadmap >> >> the choice based on ELFCLASS32 or ELFCLASS64. >> >> Signed-off-by: Greg Ungerer >> --- >>  fs/binfmt_elf_fdpic.c          | 38 +++++++++++++++++----------------- >>  include/linux/elf-fdpic.h      | 14 ++++++++++++- >>  include/uapi/linux/elf-fdpic.h | 15 ++++++++++++++ >>  3 files changed, 47 insertions(+), 20 deletions(-) > > Adding some of the binfmt/fs folks, who weren't directly on the mail. It's looking like we're generally OK with this in RISC-V land, though there's still no userspace posted.  I don't think there's any rush here and it might be prudent to wait for userspace to start going through a bit of a review, but figured I'd at least poke everyone to see if there's any thoughts. > > I'm fine either way, so > Acked-by: Palmer Dabbelt > > if that helps any.  Also happy to take this through the RISC-V tree along with the other if that's easier, but again no rush. Just following up. I haven't seen any feedback on this - did I miss any? Regards Greg >> diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c >> index a05eafcacfb27..2eea6dd429fd6 100644 >> --- a/fs/binfmt_elf_fdpic.c >> +++ b/fs/binfmt_elf_fdpic.c >> @@ -138,7 +138,7 @@ static int is_constdisp(struct elfhdr *hdr) >>  static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, >>                   struct file *file) >>  { >> -    struct elf32_phdr *phdr; >> +    struct elf_phdr *phdr; >>      unsigned long size; >>      int retval, loop; >>      loff_t pos = params->hdr.e_phoff; >> @@ -560,8 +560,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, >>      sp &= ~7UL; >> >>      /* stack the load map(s) */ >> -    len = sizeof(struct elf32_fdpic_loadmap); >> -    len += sizeof(struct elf32_fdpic_loadseg) * exec_params->loadmap->nsegs; >> +    len = sizeof(struct elf_fdpic_loadmap); >> +    len += sizeof(struct elf_fdpic_loadseg) * exec_params->loadmap->nsegs; >>      sp = (sp - len) & ~7UL; >>      exec_params->map_addr = sp; >> >> @@ -571,8 +571,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, >>      current->mm->context.exec_fdpic_loadmap = (unsigned long) sp; >> >>      if (interp_params->loadmap) { >> -        len = sizeof(struct elf32_fdpic_loadmap); >> -        len += sizeof(struct elf32_fdpic_loadseg) * >> +        len = sizeof(struct elf_fdpic_loadmap); >> +        len += sizeof(struct elf_fdpic_loadseg) * >>              interp_params->loadmap->nsegs; >>          sp = (sp - len) & ~7UL; >>          interp_params->map_addr = sp; >> @@ -740,12 +740,12 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, >>                    struct mm_struct *mm, >>                    const char *what) >>  { >> -    struct elf32_fdpic_loadmap *loadmap; >> +    struct elf_fdpic_loadmap *loadmap; >>  #ifdef CONFIG_MMU >> -    struct elf32_fdpic_loadseg *mseg; >> +    struct elf_fdpic_loadseg *mseg; >>  #endif >> -    struct elf32_fdpic_loadseg *seg; >> -    struct elf32_phdr *phdr; >> +    struct elf_fdpic_loadseg *seg; >> +    struct elf_phdr *phdr; >>      unsigned long load_addr, stop; >>      unsigned nloads, tmp; >>      size_t size; >> @@ -767,7 +767,7 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, >> >>      params->loadmap = loadmap; >> >> -    loadmap->version = ELF32_FDPIC_LOADMAP_VERSION; >> +    loadmap->version = ELF_FDPIC_LOADMAP_VERSION; >>      loadmap->nsegs = nloads; >> >>      load_addr = params->load_addr; >> @@ -843,8 +843,8 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, >>              if (phdr->p_vaddr >= seg->p_vaddr && >>                  phdr->p_vaddr + phdr->p_memsz <= >>                  seg->p_vaddr + seg->p_memsz) { >> -                Elf32_Dyn __user *dyn; >> -                Elf32_Sword d_tag; >> +                Elf_Dyn __user *dyn; >> +                Elf_Sword d_tag; >> >>                  params->dynamic_addr = >>                      (phdr->p_vaddr - seg->p_vaddr) + >> @@ -854,11 +854,11 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, >>                   * one item, and that the last item is a NULL >>                   * entry */ >>                  if (phdr->p_memsz == 0 || >> -                    phdr->p_memsz % sizeof(Elf32_Dyn) != 0) >> +                    phdr->p_memsz % sizeof(Elf_Dyn) != 0) >>                      goto dynamic_error; >> >> -                tmp = phdr->p_memsz / sizeof(Elf32_Dyn); >> -                dyn = (Elf32_Dyn __user *)params->dynamic_addr; >> +                tmp = phdr->p_memsz / sizeof(Elf_Dyn); >> +                dyn = (Elf_Dyn __user *)params->dynamic_addr; >>                  if (get_user(d_tag, &dyn[tmp - 1].d_tag) || >>                      d_tag != 0) >>                      goto dynamic_error; >> @@ -927,8 +927,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( >>      struct file *file, >>      struct mm_struct *mm) >>  { >> -    struct elf32_fdpic_loadseg *seg; >> -    struct elf32_phdr *phdr; >> +    struct elf_fdpic_loadseg *seg; >> +    struct elf_phdr *phdr; >>      unsigned long load_addr, base = ULONG_MAX, top = 0, maddr = 0; >>      int loop, ret; >> >> @@ -1011,8 +1011,8 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, >>                           struct file *file, >>                           struct mm_struct *mm) >>  { >> -    struct elf32_fdpic_loadseg *seg; >> -    struct elf32_phdr *phdr; >> +    struct elf_fdpic_loadseg *seg; >> +    struct elf_phdr *phdr; >>      unsigned long load_addr, delta_vaddr; >>      int loop, dvset; >> >> diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h >> index 3bea95a1af537..e533f45131945 100644 >> --- a/include/linux/elf-fdpic.h >> +++ b/include/linux/elf-fdpic.h >> @@ -10,13 +10,25 @@ >> >>  #include >> >> +#if ELF_CLASS == ELFCLASS32 >> +#define Elf_Sword            Elf32_Sword >> +#define elf_fdpic_loadseg        elf32_fdpic_loadseg >> +#define elf_fdpic_loadmap        elf32_fdpic_loadmap >> +#define ELF_FDPIC_LOADMAP_VERSION    ELF32_FDPIC_LOADMAP_VERSION >> +#else >> +#define Elf_Sword            Elf64_Sxword >> +#define elf_fdpic_loadmap        elf64_fdpic_loadmap >> +#define elf_fdpic_loadseg        elf64_fdpic_loadseg >> +#define ELF_FDPIC_LOADMAP_VERSION    ELF64_FDPIC_LOADMAP_VERSION >> +#endif >> + >>  /* >>   * binfmt binary parameters structure >>   */ >>  struct elf_fdpic_params { >>      struct elfhdr            hdr;        /* ref copy of ELF header */ >>      struct elf_phdr            *phdrs;        /* ref copy of PT_PHDR table */ >> -    struct elf32_fdpic_loadmap    *loadmap;    /* loadmap to be passed to userspace */ >> +    struct elf_fdpic_loadmap    *loadmap;    /* loadmap to be passed to userspace */ >>      unsigned long            elfhdr_addr;    /* mapped ELF header user address */ >>      unsigned long            ph_addr;    /* mapped PT_PHDR user address */ >>      unsigned long            map_addr;    /* mapped loadmap user address */ >> diff --git a/include/uapi/linux/elf-fdpic.h b/include/uapi/linux/elf-fdpic.h >> index 4fcc6cfebe185..ec23f08711292 100644 >> --- a/include/uapi/linux/elf-fdpic.h >> +++ b/include/uapi/linux/elf-fdpic.h >> @@ -32,4 +32,19 @@ struct elf32_fdpic_loadmap { >> >>  #define ELF32_FDPIC_LOADMAP_VERSION    0x0000 >> >> +/* segment mappings for ELF FDPIC libraries/executables/interpreters */ >> +struct elf64_fdpic_loadseg { >> +    Elf64_Addr    addr;        /* core address to which mapped */ >> +    Elf64_Addr    p_vaddr;    /* VMA recorded in file */ >> +    Elf64_Word    p_memsz;    /* allocation size recorded in file */ >> +}; >> + >> +struct elf64_fdpic_loadmap { >> +    Elf64_Half    version;    /* version of these structures, just in case... */ >> +    Elf64_Half    nsegs;        /* number of segments */ >> +    struct elf64_fdpic_loadseg segs[]; >> +}; >> + >> +#define ELF64_FDPIC_LOADMAP_VERSION    0x0000 >> + >>  #endif /* _UAPI_LINUX_ELF_FDPIC_H */ >