From patchwork Tue Feb 28 13:51:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Ungerer X-Patchwork-Id: 13154928 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 13AD8C7EE2E for ; Tue, 28 Feb 2023 13:52:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E4746B007D; Tue, 28 Feb 2023 08:52:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 794FD6B007E; Tue, 28 Feb 2023 08:52:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65CA06B0080; Tue, 28 Feb 2023 08:52:53 -0500 (EST) 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 571346B007D for ; Tue, 28 Feb 2023 08:52:53 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2F57D140A6C for ; Tue, 28 Feb 2023 13:52:53 +0000 (UTC) X-FDA: 80516841426.16.5DAA689 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 79A8910001F for ; Tue, 28 Feb 2023 13:52:51 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Boyhyv71; spf=pass (imf05.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=1677592371; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=aymF10duhQpdus2CaW1oS/BAnGBD6aVgFR8p+Bv6IxE=; b=NK+fpZR8tDl0oaMvfqAhdgvfLiQi/XlOGdDl70HqcGD5DfFnQgokkl/LZJt2xlZcgT1ZMi YkyE67t/N8sE79J226v9fyxgBwulKT9tgCgU6uEyEoIrAmai1kzV6iOLqRIWIwdK3N13nn BFvPbkL293KQrs50i+gvKuj56khwkEQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Boyhyv71; spf=pass (imf05.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=1677592371; a=rsa-sha256; cv=none; b=CiiWtRqCnlp4x5xSWdad+MqhfS6lvElNTtKQhgXUf2MF1fH3eMPeqBEx1kEbMhwagaHyu6 cI5ygYBXOtt85V+7cD0D0tCgsubc+nAc95emFYsNjoljB5TNbAhamt3lbaCX6NKNOlC/hx 8HdOuo7XtEaN6JP36Auukj6d9N/1bo8= 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 dfw.source.kernel.org (Postfix) with ESMTPS id A0EA061059; Tue, 28 Feb 2023 13:52:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3263C4339B; Tue, 28 Feb 2023 13:52:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677592370; bh=sUmjqdECpzhBzLfzvtQfNGKN7mDNJWpISMfwa2tW33U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Boyhyv71FzWm40DrM+Drdf72LjQFrF8AHpWmkg5DOe9wjg6w+XJdL/M9yJ/fIvYrH Po6NftZvGdme/ZlecbcNrBfx0klhFEcwZ06OJYzJNppwaap9/rEj+KA4n+KD78eCnp d9KS8dGiWMkM/WGE9yO5CyrQH+H9VzPXuDzFzb18BC0C8Xpf8nZ2+hZeJ1zSIkmIqS 99Owj8rS1vjZJn/XGaZgAebaYTR61DeKsel6vXO7AWDquYQ1DyZHjeDgsr31tVo94b lbTB2jyn2+RCN9nQb5kJ0YvmIhyVsil9h1mKkzoQroWo8WLvjGItnNlLFRHXiuPd+m fVjKuCUH/UF7Q== From: Greg Ungerer To: linux-riscv@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Greg Ungerer Subject: [PATCH 2/2] riscv: support the elf-fdpic binfmt loader Date: Tue, 28 Feb 2023 23:51:26 +1000 Message-Id: <20230228135126.1686427-3-gerg@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230228135126.1686427-1-gerg@kernel.org> References: <20230228135126.1686427-1-gerg@kernel.org> MIME-Version: 1.0 X-Stat-Signature: e4fben1g5ypci3cj84ib7ge9ydgb1w8k X-Rspam-User: X-Rspamd-Queue-Id: 79A8910001F X-Rspamd-Server: rspam06 X-HE-Tag: 1677592371-891048 X-HE-Meta: U2FsdGVkX1/iDuq/M0nmyw79IrwQmgZ+NwqU8PF1gijcvnWNHTE5tQu/rZ36+8+6TH8aJjZiqK+eQhMNdSQ+Tn52ZWkJRdTONu/LTze8uQd37LSJi671vMaGWsjJGxVjdArrFQS3HIp4/Y7IKAJPhF+APFmYdGBaycmEATWnAa9LvWf19HnlYsd/loZYJkhhZmMUSvUufr1HgFhu5911HcqnSU2aJsS/qROfzZwkbBXywgkYevnlPQhtve2jDhkSG1FAHv3Fsv/owQceUpy2ipVkUuOM13e1zjlw/fuBcmkrFqpSKQWtedSC4NXIjZijhVmTw4Y5KcUk8Of3GL0XWKus0S0Jyac9krZJNDiwDlvbTazdXm8gjYOhbaK3ZNFHD0Tvde7qEBVWWWuANfyd7cABdgaVah0q+YSeTSc05u/p88x5zszmshIU+pGvDQBocUbJO3eJXuuMhrIbpmIM2MctMLQH7rZ4z82UZIWhVMg2EBQHUEa2/D4Y3KOG+JVOwDpUjLFFrhnxefzKVieimhdoHnR/ZAv3KSjkc/OKq3MVVLiDBwUNHcxjBpnygFeMZFBd7Uib+a/6lo2fg9xTr2uCgMIlqhVOme/8Jtt+ZxDrwoAV1zn47928eFW3sn76Z8OBuwAFQh4oAuzwmhS6m18OGi2OiOmQrkDvTAlT9rQ7M/itU4FbXeUzmqSLwZGUWsZrBst1GkMdIAvv2MlElBx+BXIyCWH4gKYT9QT5Mh8YFKI6UrFwz2mF4WulcvZrjQtQWbL5liCHyGUgWeIFJuZwibW5EPPBS4/MSqao1sjLWsieXVNDPEDx67qf9tIDZ3VUfq3/aElLkilaxYtOGeTNTCZHlbaIKEpK5Mpzf0VtqSxPLnOftEAB9WECuv8kcXrTLPJLM0e8GhOjeetJf35mPdR3oxRFjFtOxh6Df7M2ItV22Rr6ftRjLdz4gWutL+p9c52FycJy0ATFcx5 wzB4/amY OFGtcz455x14UqXV9P7kTwC6DpjRGrcF5/wn61lk7sBoYahOkug4zJeeeCwXXYvdIrWcE6vefNL+5Ec+RqRwSVEsnkQTg5KB4VCyhbODFGh9UnfHYc01gIPuWBv2AitVXtp7taFd/a3ny7fbay0Jc9mUhrdb8QEBIZt2RYNqLTC+T7bl6QcrId8JVnC6rUEYUgakbm1m5v8bmCEIm+qFxmJA1z5Wn0ducc/CV/gctAmQvKzYt/KaKH+WbB3VmYdDjImAxS3hhMqzUcKusnIMySBy91n8fPoTCnuyFYcvy1G30iJrz1rF389PcwOiWeZ05MDnnEEUb9coTe53mfTjpr6D8joV33z+AhaCd 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: Add support for enabling and using the binfmt_elf_fdpic program loader on RISC-V platorms. The most important change is to setup registers during program load to pass the mapping addresses to the new process. One of the interresting features of the elf-fdpic loader is that it also allows appropriately compiled ELF format binaries to be loaded on nommu systems. Appropriate being those compiled with -pie. Signed-off-by: Greg Ungerer --- arch/riscv/include/asm/elf.h | 11 ++++++++++- arch/riscv/include/asm/mmu.h | 4 ++++ arch/riscv/include/uapi/asm/ptrace.h | 5 +++++ fs/Kconfig.binfmt | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index e7acffdf21d26..95747b35d3262 100644 --- a/arch/riscv/include/asm/elf.h +++ b/arch/riscv/include/asm/elf.h @@ -40,6 +40,7 @@ extern bool compat_elf_check_arch(Elf32_Ehdr *hdr); #define compat_elf_check_arch compat_elf_check_arch #define CORE_DUMP_USE_REGSET +#define ELF_FDPIC_CORE_EFLAGS 0 #define ELF_EXEC_PAGESIZE (PAGE_SIZE) /* @@ -67,6 +68,13 @@ extern bool compat_elf_check_arch(Elf32_Ehdr *hdr); #define ELF_HWCAP (elf_hwcap) extern unsigned long elf_hwcap; +#define ELF_FDPIC_PLAT_INIT(_r, _exec_map_addr, _interp_map_addr, dynamic_addr) \ + do { \ + (_r)->a1 = _exec_map_addr; \ + (_r)->a2 = _interp_map_addr; \ + (_r)->a3 = dynamic_addr; \ + } while (0) + /* * This yields a string that ld.so will use to load implementation * specific libraries for optimization. This is more specific in @@ -76,7 +84,6 @@ extern unsigned long elf_hwcap; #define COMPAT_ELF_PLATFORM (NULL) -#ifdef CONFIG_MMU #define ARCH_DLINFO \ do { \ /* \ @@ -104,6 +111,8 @@ do { \ NEW_AUX_ENT(AT_L3_CACHEGEOMETRY, \ get_cache_geometry(3, CACHE_TYPE_UNIFIED)); \ } while (0) + +#ifdef CONFIG_MMU #define ARCH_HAS_SETUP_ADDITIONAL_PAGES struct linux_binprm; extern int arch_setup_additional_pages(struct linux_binprm *bprm, diff --git a/arch/riscv/include/asm/mmu.h b/arch/riscv/include/asm/mmu.h index 5ff1f19fd45c2..af3fc3fb4d1ad 100644 --- a/arch/riscv/include/asm/mmu.h +++ b/arch/riscv/include/asm/mmu.h @@ -22,6 +22,10 @@ typedef struct { /* A local tlb flush is needed before user execution can resume. */ cpumask_t tlb_stale_mask; #endif +#ifdef CONFIG_BINFMT_ELF_FDPIC + unsigned long exec_fdpic_loadmap; + unsigned long interp_fdpic_loadmap; +#endif } mm_context_t; void __init create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t pa, diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 882547f6bd5c9..93a690509b133 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -10,6 +10,11 @@ #include +#define PTRACE_GETFDPIC 31 + +#define PTRACE_GETFDPIC_EXEC 0 +#define PTRACE_GETFDPIC_INTERP 1 + /* * User-mode register state for core dumps, ptrace, sigcontext * diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 93539aac0e5b2..f5693164ca9a3 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -58,7 +58,7 @@ config ARCH_USE_GNU_PROPERTY config BINFMT_ELF_FDPIC bool "Kernel support for FDPIC ELF binaries" default y if !BINFMT_ELF - depends on ARM || ((M68K || SUPERH || XTENSA) && !MMU) + depends on ARM || ((M68K || RISCV || SUPERH || XTENSA) && !MMU) select ELFCORE help ELF FDPIC binaries are based on ELF, but allow the individual load