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 C0C87EB64DC for ; Tue, 11 Jul 2023 11:53:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3199F6B0074; Tue, 11 Jul 2023 07:53:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A3306B0075; Tue, 11 Jul 2023 07:53:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 143E26B0078; Tue, 11 Jul 2023 07:53:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 044666B0074 for ; Tue, 11 Jul 2023 07:53:28 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C82A6120162 for ; Tue, 11 Jul 2023 11:53:27 +0000 (UTC) X-FDA: 80999170854.28.C775A17 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id EC12340009 for ; Tue, 11 Jul 2023 11:53:25 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Fb6+NKqr; spf=pass (imf04.hostedemail.com: domain of gerg@kernel.org designates 139.178.84.217 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=1689076406; a=rsa-sha256; cv=none; b=za0s+nPh7tUiNnnTxAlpvZDfwH4qYhLFLK0v17rral3/KR7m932Lc3LEFSg85ovvA5LMht 6FTu1pAMJG1SYXPW8xM/MDwu8cBpIc3HbPz+dIZ9t1pmNIrYBW+IrUERCOgHn4K3tEj+L0 HurAHb/pPhM+TO/Ll9WEIe5os74WNBA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Fb6+NKqr; spf=pass (imf04.hostedemail.com: domain of gerg@kernel.org designates 139.178.84.217 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=1689076406; 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=JmMLZPP6TUeQWoVDAac6otlOfnY09aE6UTulrVlI430=; b=zBfIds4oxpR7RPANq/xMTTdP44boFMsKfgXmBrv4hgwKatlFfIuOtH/Ysm05vsUBz3tqM9 22NfUeQ6dMLYC0dpWyv0827Q+NFEEL6G1BDjzoU32Zh8W2L2cQqA/n6XKpkoRdWWGXp2bj NT3GU+6WDttFtAnvl5jmy+dqgLaPp6Q= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CB7C26149D; Tue, 11 Jul 2023 11:53:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36EFAC433C7; Tue, 11 Jul 2023 11:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689076404; bh=2lodsvAsBtthqZRROxTMtuXenav5ZKbH+wvYGWGzH10=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Fb6+NKqr2zbWSErNHidZHN1vqzd8SbkDlf+Z/L4TfVtVtIs+uptklE5M/CP+CHXbC 5A2Xu0Kx1xdrx+ye6gN7DaMTvREnc3QBb9Y+QU8d7dURlV65p5fmj/+U+mmZZSFxq3 hcN/rpId9QtYHHPaEbHB8j2IFa5SgfLQDhw/jeW8od/xFS3Nnx3CNBOKI62WpHqyHV VXx2FD6uhmLwaV2RGQ7P9Z7icBitcBOwpP9l0rkjJbOJTbO+OKoGkmRnvA4TOT8n1q Xzz91C30xd17iC0I2jflayiHAuXiyKgOpts/hW8xlUP9jRhSAbEJCzMxpgQGof0suA OfqBMPU04HglQ== Message-ID: Date: Tue, 11 Jul 2023 21:53:19 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH 1/2] binfmt_elf_fdpic: support 64-bit systems Content-Language: en-US To: Palmer Dabbelt Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, ebiederm@xmission.com, keescook@chromium.org, 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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: EC12340009 X-Stat-Signature: n7tnt3it5n4tbnqqu5hnp8h4xafk8wgx X-Rspam-User: X-HE-Tag: 1689076405-15851 X-HE-Meta: U2FsdGVkX198xIb/ubdCW6SdQbYckRlyWKsdUSyS79+bdmckJ/squ8FIlPQuOgVwaqXnLNMkdtqayDfRD3oxyAtppbjE6iqKEey3j+QGMw4GjRoKI53IHcQ2mh6/IL3YA5h2+rX6+Pm0FaDZjRuO90bgiIw08OWWwFbUp+s1ymXqtBfTczAcw1GeDltbkFPM86cjkJy+Q5mAL3cIjnlVmSq+7OBff/ZtV+W9DK7uxNOjOzQD0YNyoj0+V07acymSrsJ33WIwx9xExU9Z2+VzQrh409k/csha7HWIToR3FDPwyCkYjdie8dJnI2pG7KL5F/CXzQtMJU4cJzybdYA2nniiVOAJKyCitesqtrgcdsdiEtET3nFnMnVKpCnuKNWQQ+lddS2ETOyW9YmNKuLu14Cj0fxWdHggYMpyQ9yQw+8Eaiykt8jAft0zjPKzSnMOJpeZtHz85dNvNuxhfwDhQW8R72CpBe0HLFlJL+iH88wx26j0I3lhmNZcjpHneSPaDjjUS6euDpWWpHIe5+Y0KLmw6gDQeOSFKCC0rNZlHm4APbLD3NPF8Pzkw6HTwcEp836YjxLwxWDaKXUthQYNPfCiXoFCqT7lixF49les5rEtoUAKIylCOywXswwg5LlVOAVfWHJjlAn1yQiIJkWC/sZ0njtgflVfg3FmVr49BXc9jjVKrlB7/NAkIECkqDivSIA2OMcHtMc4KUMRHXHPvhnCpr6aq+rKB7TXK1eCjgOO5SzFwxv8yMCgxVQkqUWLf0RhJPGLvhaeZs2WUO0fxn28UuMR5plpJ8Y9ilgm0ucEsbXluSDUFKmJltJSop3BNlE785/HvuSy+RVjrcDj0paGaFMbpi7lwZbUSILlbZYnlri4Ti4syYv0O9b0w0IfGd70yqA+msEObPC74OKE2F26OUHqe5PcD1s5ZBz4x0pdrrKVlclEGcx9zgzzUpb4yFrOv5/w2K77LlHILBl 0gQnHcVf IsXd2dal324mqkHY7WsQDXKX8GhmOPC/oAnt4cw2O5jH+Q+8PNNceGuLkKyG9+Rt7UNPRzLKU0RcyYFcUqZs0U1gegE8wvM4nQoccpdO6x79ZmiGwtr9FAHwZ9qFm25f9S4m8cfJb1F5+gHgqvHZ7pHqlRoroO1JK4GAzCzZBi5MfWXM+lYEOoR3glB1CTNsjElJgESwcNsHpLBdPVgYa+nlEu3tWRlpoJi4DfPnHg7CjlHkIN2NQZWHLoOvtbu3jYYtjVaWWpbAVMW1f/D8klVyXijOy8pib70KojbFaCcJn2b6bXbzbZrookFcQe6ziVCo5Vr/JQzWSoifX3evqBQwcFR3ep4kmo8OkEYBqFFOVMC7S3+h19Ju0UTQYTnJDpZCqWDR+NZhtp8CcD60EZpFPUnDslYC2ia7o2/x9+wrCa5JgSJfhu/kkMnMSn+n7WjsZTAmvjPmnKlA= 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: Hi Palmer, On 11/7/23 09:18, Palmer Dabbelt wrote: > On Thu, 20 Apr 2023 07:58:29 PDT (-0700), gerg@kernel.org wrote: >> Hi Palmer, >> >> On 19/4/23 13:27, Palmer Dabbelt wrote: >>> On Wed, 29 Mar 2023 06:48:55 PDT (-0700), gerg@kernel.org wrote: >>>> >>>> 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? >>> >>> If you did then I did too.  I'm not really sure what to do here: it looks fine to me, but it's not really my area so I'd prefer to have someone who understands this stuff a bit better chime in. >>> >>> It looks like some Arm patches recently went in through that tree, though, so maybe that's how things are supposed to go here? >> >> There doesn't seem to be anyone who is clearly the designated maintainer >> for binfmt_elf_fdpic, or even just sheparding fixes for it. It mostly seems >> to be tree-wide changes and cleanups that are getting done to it. >> >> So I have no idea... I have at least one fix inside binfmt_elf_fdpic.c for >> ARM architecture that I am preparing now too, not sure how that is going to >> go either. > > Looks like maybe nobody is taking these, then?  Certainly nobody has chimed in. Yes, its been complete silence >  There's been some minor conflicts over the past few months, do you mind sending a v2?  If nobody says anything on that I'll just take it via the RISC-V tree. Sounds like a good plan. I will send out a v2 today. 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 */ >>>>>