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 809D6C02198 for ; Tue, 11 Feb 2025 01:30:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 13C4028000B; Mon, 10 Feb 2025 20:30:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C57F28000A; Mon, 10 Feb 2025 20:30:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECF8328000B; Mon, 10 Feb 2025 20:30:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C30FB28000A for ; Mon, 10 Feb 2025 20:30:45 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5640F80904 for ; Tue, 11 Feb 2025 01:30:45 +0000 (UTC) X-FDA: 83105934450.19.20FCAAE Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf05.hostedemail.com (Postfix) with ESMTP id 8F2C8100002 for ; Tue, 11 Feb 2025 01:30:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kLcReoxo; spf=pass (imf05.hostedemail.com: domain of sashal@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739237443; 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=xjpIUk2AAPjl8SIr4mC9XsaVma9wSw5en2v0YQ8fayY=; b=F6cW0dedKIAAOVDowNDo4bce9bHtmEgzkoFH4zoxvPKrlyziwRsroDVgQDPzh8w8dty5pb 4SNuB+Y903L4N2VmpNmh7f/+2Dw9CXxzOeYTeIi1/ZtBf5tBmYjZn8Bev2IOuAhMjc/KV5 +qX7JPVKjruxQeEfJUASHoF0xTBowMY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kLcReoxo; spf=pass (imf05.hostedemail.com: domain of sashal@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739237443; a=rsa-sha256; cv=none; b=plTgHuRlOE5j77uuGEDiGRjJrJsc0lc5Ag4enIt+i/xA1QXRZkLfD6VBcjN1GWHVwT4WJG bO8Q7rbVLE381ukz0Ga3cm0Q4MIOsHPvO+BYDzRnmyy5rVvrzXCtcZMrrspofFZ02dClwy 8wID/riXyKSsjKRXAi9f4KoGSAEGhrc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 3E283A4207B; Tue, 11 Feb 2025 01:28:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6B7BC4CED1; Tue, 11 Feb 2025 01:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237442; bh=cs5U9jYcFMDHQ350d0rZgFDXqLFcs35hdxXvnPktz8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kLcReoxoF2pOl+exicn3qq+ns6ZOJDeaXg2B/fBlX7bo6Mo/lrmSoKCg929bBNkvJ 1Yj4hN6MDQ40vWI9YQTEhhQ5ajh1dC72UymUgtZSv8VkY2LuwE0pxCmjGtVpOSz+Xy M86hiNJNo0b4oBJrPl583+Q7BW48CY9URr8gTw0iah89Db3MHLPtzGkvd4EM/fq5CS zRrJ5DjI321buGXBlaMYP/SteO+6NcFlNcANLu3xz6Nm5LbXZRC+jTRET42nIKUFlU 57eRGizCKJSxSxVIOo0AhkYx4O0j5Q+d4bjFZU+KtI84PVNlhGUDWSy1QFu4XnFm9C vnRGFF4kS3R8A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Eric W. Biederman" , Richard Henderson , Arnd Bergmann , John Paul Adrian Glaubitz , Kees Cook , Sasha Levin , mattst88@gmail.com, paulmck@kernel.org, brauner@kernel.org, akpm@linux-foundation.org, viro@zeniv.linux.org.uk, broonie@kernel.org, rick.p.edgecombe@intel.com, linux-alpha@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 6.13 19/21] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support Date: Mon, 10 Feb 2025 20:29:52 -0500 Message-Id: <20250211012954.4096433-19-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211012954.4096433-1-sashal@kernel.org> References: <20250211012954.4096433-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.2 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8F2C8100002 X-Stat-Signature: at1dgcdf7iwq461ufcxzhd1myucxeg5m X-Rspam-User: X-HE-Tag: 1739237443-792925 X-HE-Meta: U2FsdGVkX1/h5Dn3T/woZ3Omnq8kseJd60WIKcTC5HX0dEf5HkmbbaIEpOIj13sIbCPlAyaQ6/nvW5H2MpW/iBMvmSu36Ws4TzH60ren6Ggvptv/FOpR9wkmGnkAIC02KEl5SNwlAIsuRVWDWP1cX5F/CEQg3iQH+3cDDkCizUTK208ZDh2UOTsMUD6N95YqzoT1xQxJTBNunxxiSOoWnrrVDnERFY1DXGN0eKmDUuIz8McS6shgqDNGN10iIJcQ+yO376dqNY2IGJ22rMajGTxUVaBD6B+dWTNsw9V/d9g9VP0BJLjKz/aNl8P7K9kfYE2VEmzJTIHcrJXljNbPXJ86+9+avd8AGweAgvCTslQReVeFA/06HJmaAaK+fqJYmbUYbJWeUmDIse9HAovUYyL/vWr3od+nBZ8nfAhbkxV4O5rHLooW8WXrdt1hFN28lTGKJ+eeBhPh6+QPw5gxLWoxlNs0sZsg4x8fk2LZ3ECbrcxGADn8amK4h2xL7Fl4lTpB4A1Lr+vOsVMgsWmJX270Cv3Uk3qZk048sRMLdH85b3MXL5yxdgSDnRXibsUQZv762B/HiIcj1jV+u2ZIyLfB28NrT6bvhhSamMTCaoS87POU8J+NH4vo106SFnZv3nLqcnJQ6jK0n16pva0YuGXFNi8CHa/SFARrKnl+RnuBn0hHnvyKwY0uI0CHO3nc4X3MJSuWX8kYySt8LZyQnLbcsgtlP8ClzUkwU9lK6sp2+lF51ZkyLFDhrn1KaVqey7y1S8uSyFsfvBdlcbnn2epwwHh/F8RDtfIVREGBTlybVkI9SkwV4v9Va0DX7uBdHjdCd46Fgro8QMtMfEJNe97xC9RmD2dQisV0HuDFF9YAWk3t7X0MzwN1g2f8r5DCm7VCK0Wf3ai0dZCYpxLUl3GcVIcJEvDhcO20hsoAoHtAg2qjoxHACq1lHmmnyLCJmtUTUZDNFuMARhfm4IV QPQdw6Xh jz2f1fNpg0PUqWUuK7ABGFwv2XGJrqJlAMF/dnyJoFsl/b2sAFCLhI88CMj/WBeq5fp/GrElBxEykXH/sXryWQAaW/In1xzDM4+MYewyWTCuqIaeaPAr/1XTOUHFNOxElXqnJksavjjjtAxb7KdQi9U6Q1VwdgC91lhsfO4dWf0QOPWa4zoUJZO1TD8eJBWxLvYNKAbovjUg0h9LMeHW3do6urmdJ6juACkY/f7jBue7GpddKYFdjhRFMpix+dOitiitXhwEi1i1cqXuct5/XwBSo9KaBFlu34VQ0Wac6wqpqOdZ5CKGkknLR/WJHPkgfs2oJ4MS82BgMwJHrbYPEG/FnXoPa4gKrUefZJbUog2BdhbEyntXhGa1sxRChfJHl8lKnp/K9zHuGT0Tbbeno12/MHzTeju2Im0TUaddmFOjnXkDHycAkCC/QWg== 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: From: "Eric W. Biederman" [ Upstream commit b029628be267cba3c7684ec684749fe3e4372398 ] 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 have the EF_ALPHA_32BIT flag set. Just in case someone somewhere has binaries that try to use alpha's 32bit pointer support. Link: https://lkml.kernel.org/r/CAFXwXrkgu=4Qn-v1PjnOR4SG0oUb9LSa0g6QXpBq4ttm52pJOQ@mail.gmail.com [1] Link: https://lkml.kernel.org/r/20250103140148.370368-1-glaubitz@physik.fu-berlin.de [2] Signed-off-by: Eric W. Biederman Reviewed-by: Richard Henderson Reviewed-by: Arnd Bergmann Reviewed-by: John Paul Adrian Glaubitz Tested-by: John Paul Adrian Glaubitz Link: https://lore.kernel.org/r/87y0zfs26i.fsf_-_@email.froward.int.ebiederm.org Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- 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 4d7c46f50382e..50c82187e60ec 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 635f0a5f5bbde..02e8817a89212 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 55bb1c09fd39d..5dce5518a2111 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 86185021f75ae..a08e8edef1a44 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; -- 2.39.5