From patchwork Sat Jan 11 00:16:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 13935622 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 AE39BE77188 for ; Sat, 11 Jan 2025 00:17:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23FAE8D000C; Fri, 10 Jan 2025 19:17:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EFCC8D0002; Fri, 10 Jan 2025 19:17:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 042D18D000C; Fri, 10 Jan 2025 19:17:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D56718D0002 for ; Fri, 10 Jan 2025 19:17:22 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9402EA0F6D for ; Sat, 11 Jan 2025 00:17:22 +0000 (UTC) X-FDA: 82993256724.17.F2728D3 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by imf12.hostedemail.com (Postfix) with ESMTP id 162704000D for ; Sat, 11 Jan 2025 00:17:19 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.231 as permitted sender) smtp.mailfrom=ebiederm@xmission.com; dmarc=pass (policy=none) header.from=xmission.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736554640; a=rsa-sha256; cv=none; b=21mh4Kuy0o8fLn+DuFdDc3tVEW0a+1C2YqOm6aMMJ1KcuRIhcsu12Ss2B3rhcOehADfq3C Lfyz4w6QPb14gLXIyHwoHTfr6Z7G4feaK4frk+hK9bPu4CejLTJhpT1Gadj6QhjJauS6Gs 35QPEQIjQjeMB0MKMaAl3TqlQWhX0ko= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=pass (imf12.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.231 as permitted sender) smtp.mailfrom=ebiederm@xmission.com; dmarc=pass (policy=none) header.from=xmission.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736554640; 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: in-reply-to:in-reply-to:references:references; bh=PB1AJO877iMLMmQuMvMCCuxpLsBQgJ/QMECVfKp1OKQ=; b=8fXdsOWAgKIg1ka2kueK++uYI5kO0XR0xqyT5CtdhwxMJEaA69ecHKhb3arBLnkslaQ6Xh pwAj/8M9RIvvM1q4oXNk3zjrS2jLXFP2kHvPhUm9SY+w4senklt6VgMHE7xFwoMrnA3NAQ Eco+74/UUZZFk+w0CMq29izvWkx30Sc= Received: from in01.mta.xmission.com ([166.70.13.51]:52578) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1tWPBj-00F6GA-2j; Fri, 10 Jan 2025 17:17:15 -0700 Received: from ip72-198-198-28.om.om.cox.net ([72.198.198.28]:42048 helo=email.froward.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1tWPBh-00CzIE-Tg; Fri, 10 Jan 2025 17:17:14 -0700 From: "Eric W. Biederman" To: John Paul Adrian Glaubitz Cc: Arnd Bergmann , Richard Henderson , Matt Turner , Kees Cook , "Paul E. McKenney" , linux-alpha@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Michael Cree , Sam James , "Maciej W. Rozycki" , Geert Uytterhoeven , Michael Karcher , Chris Hofstaedtler , util-linux@vger.kernel.org, linux-mips@vger.kernel.org, loongarch@lists.linux.dev References: <20250103140148.370368-1-glaubitz@physik.fu-berlin.de> <24f03227-1b55-4e50-b6e9-7ac74fda2602@app.fastmail.com> <678ee681-12c3-4e79-a04b-495daf343846@app.fastmail.com> <82d33a2d-dffe-4268-a175-4536b3f9c07f@app.fastmail.com> Date: Fri, 10 Jan 2025 18:16:28 -0600 In-Reply-To: (John Paul Adrian Glaubitz's message of "Thu, 09 Jan 2025 10:12:03 +0100") Message-ID: <87jzb2tdb7.fsf_-_@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-XM-SPF: eid=1tWPBh-00CzIE-Tg;;;mid=<87jzb2tdb7.fsf_-_@email.froward.int.ebiederm.org>;;;hst=in01.mta.xmission.com;;;ip=72.198.198.28;;;frm=ebiederm@xmission.com;;;spf=pass X-XM-AID: U2FsdGVkX19QbIllH2f8XF6Psw43DyF7Jy4S+gf143M= Subject: [PATCH] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support X-SA-Exim-Connect-IP: 166.70.13.51 X-SA-Exim-Rcpt-To: loongarch@lists.linux.dev, linux-mips@vger.kernel.org, util-linux@vger.kernel.org, zeha@debian.org, kernel@mkarcher.dialup.fu-berlin.de, geert@linux-m68k.org, macro@orcam.me.uk, sam@gentoo.org, mcree@orcon.net.nz, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-alpha@vger.kernel.org, paulmck@kernel.org, kees@kernel.org, mattst88@gmail.com, richard.henderson@linaro.org, arnd@arndb.de, glaubitz@physik.fu-berlin.de X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Scanned: No (on out01.mta.xmission.com); SAEximRunCond expanded to false X-Rspamd-Queue-Id: 162704000D X-Stat-Signature: t1co4mf17gzqqz978iw1zexicpc6pbzq X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1736554639-807696 X-HE-Meta: U2FsdGVkX1/T7EyhtjWjM6grJBdyLpNirmsATRg4I1GOufObQhuLj50IaX/s8/QcFFXDSYConmeaCCcw+ioKXNiHL6c75wEkoS4/VNQwKxs/3kfpvZ8/1zCkbjIcEiFRb6BMTc5kRtfux26BXy8VdifBxwTVK+81cU2fDzpTyEUgdI0pxp6TyoZiwfZ1D9HGgffxP0wdhwfV77gD46oe88wMicjS/7FbcGoo5nSKAUYa9tlmBCL03HN+rHuaqCGKULRi2H2iU6UkziqKk/8GH3E5HGVvYGikfbecvbAM3Pd9JfEyf+WSMu8z9RsF1QKJPlSrsVd0I9fb5OX6cM0xZ00KDlSDxSGkKIX1dJc/VtbaaEU2E0c1L1RBg5qpXfMeoC0a3Ll8SKoCA8ZkPxE4ufzK89NLuUmauo9/ZJGwocoCjg1O+9axGJx9LBH3T7+gwNKwBsRUf6JuPPEaAp/ZHRDKH7sAYOUX6oKcCBM9pJR0niiZqrzFp7rK7bJLO6rWpyIKs+k0zsQCO+9KwSzjGLihy6x/OunA6PMeh6Z/7NAM72F1pREgx6toFQewMQ6TVSmt1RzzRLC+M+/SEoXaYrZ9M28pOkbkjvFZniInh2/4y0Ddl8r7rjfWBwZsrPSCBEeAnxOOoyCnHSUqotTBF43tJSxhMVVVA1Zon+sHTwi7cDzJjW+CRxZbB+B+AaCekmN3MJ5sTV883K43hL5413+bOIg+85f+0EYn2fwpD4e6rzkH0urFckY8jatcOLDbauPkMvrZrWoyaeF59VKCv6kT9LeXbXm6/i1vEApIUs3DR6Nw+8o6lvsyi7K5kcMJFOHTigdRrBG+HFdvZeD01/j2FZizBkBX14McZUFXcTPOcYhtk0p0tl3K6+laq7ReyhTMIvhe/+R2PxMjmpPFjtxtSWL7uauEQya58gLX/nwyX+6pJbcHnVpFTWWorI/U/aeM0SqqOTnVttpgfS0 HVy2c2qB 9vTcFsMs9PiWQlPq637JYdqPxcPGAZVAQs0+J3JOxOnV7+19sIlmbj2RNiKDYNqdGsgDCZgLmG1c8EKueY4hGjNe9bSHl1LH/gYJ6rVJ2azZ+5j2cUe6zXBQt9rVum8LmcpgijVCOWe2CdeyuzbXCz7N4uIMEWcFEugW9ERC7atYWbm9i5UfeOGSNHXtzb4nQwjMO 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: List-Subscribe: List-Unsubscribe: Richard Henderson writes[1]: > There was a Spec benchmark (I forget which) which was memory bound and ran > twice as fast with 32-bit pointers. > > I copied the idea from DEC to the ELF abi, but never did all the other work > to allow the toolchain to take advantage. > > Amusingly, a later Spec changed the benchmark data sets to not fit into a > 32-bit address space, specifically because of this. > > I expect one could delete the ELF bit and personality and no one would > notice. Not even the 10 remaining Alpha users. In [2] it was pointed out that parts of setarch weren't working properly on alpha because it has it's own SET_PERSONALITY implementation. In the discussion that followed Richard Henderson pointed out that the 32bit pointer support for alpha was never completed. Fix this by removing alpha's 32bit pointer support. As a bit of paranoia refuse to execute any alpha binaries that hafe the EF_ALPHA_32BIT flag set. Just to fail explicitly in case someone somewhere has binaries that trying to use alpha's 32bit pointer support. [1] https://lkml.kernel.org/r/CAFXwXrkgu=4Qn-v1PjnOR4SG0oUb9LSa0g6QXpBq4ttm52pJOQ@mail.gmail.com [2] https://lkml.kernel.org/r/20250103140148.370368-1-glaubitz@physik.fu-berlin.de Signed-off-by: "Eric W. Biederman" Reviewed-by: Richard Henderson --- arch/alpha/include/asm/elf.h | 6 +----- arch/alpha/include/asm/pgtable.h | 2 +- arch/alpha/include/asm/processor.h | 8 ++------ arch/alpha/kernel/osf_sys.c | 11 ++--------- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h index 4d7c46f50382..50c82187e60e 100644 --- a/arch/alpha/include/asm/elf.h +++ b/arch/alpha/include/asm/elf.h @@ -74,7 +74,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; /* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA) +#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT)) /* * These are used to set parameters in the core dumps. @@ -137,10 +137,6 @@ extern int dump_elf_task(elf_greg_t *dest, struct task_struct *task); : amask (AMASK_CIX) ? "ev6" : "ev67"); \ }) -#define SET_PERSONALITY(EX) \ - set_personality(((EX).e_flags & EF_ALPHA_32BIT) \ - ? PER_LINUX_32BIT : PER_LINUX) - extern int alpha_l1i_cacheshape; extern int alpha_l1d_cacheshape; extern int alpha_l2_cacheshape; diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h index 635f0a5f5bbd..02e8817a8921 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -360,7 +360,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) extern void paging_init(void); -/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */ +/* We have our own get_unmapped_area */ #define HAVE_ARCH_UNMAPPED_AREA #endif /* _ALPHA_PGTABLE_H */ diff --git a/arch/alpha/include/asm/processor.h b/arch/alpha/include/asm/processor.h index 55bb1c09fd39..5dce5518a211 100644 --- a/arch/alpha/include/asm/processor.h +++ b/arch/alpha/include/asm/processor.h @@ -8,23 +8,19 @@ #ifndef __ASM_ALPHA_PROCESSOR_H #define __ASM_ALPHA_PROCESSOR_H -#include /* for ADDR_LIMIT_32BIT */ - /* * We have a 42-bit user address space: 4TB user VM... */ #define TASK_SIZE (0x40000000000UL) -#define STACK_TOP \ - (current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL) +#define STACK_TOP (0x00120000000UL) #define STACK_TOP_MAX 0x00120000000UL /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -#define TASK_UNMAPPED_BASE \ - ((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2) +#define TASK_UNMAPPED_BASE (TASK_SIZE / 2) /* This is dead. Everything has been moved to thread_info. */ struct thread_struct { }; diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 86185021f75a..a08e8edef1a4 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1210,8 +1210,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) return ret; } -/* Get an address range which is currently unmapped. Similar to the - generic version except that we know how to honor ADDR_LIMIT_32BIT. */ +/* Get an address range which is currently unmapped. */ static unsigned long arch_get_unmapped_area_1(unsigned long addr, unsigned long len, @@ -1230,13 +1229,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags, vm_flags_t vm_flags) { - unsigned long limit; - - /* "32 bit" actually means 31 bit, since pointers sign extend. */ - if (current->personality & ADDR_LIMIT_32BIT) - limit = 0x80000000; - else - limit = TASK_SIZE; + unsigned long limit = TASK_SIZE; if (len > limit) return -ENOMEM;