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 5833FC02198 for ; Tue, 11 Feb 2025 01:31:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DBF4B28000C; Mon, 10 Feb 2025 20:31:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D6EF928000A; Mon, 10 Feb 2025 20:31:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C370628000C; Mon, 10 Feb 2025 20:31:34 -0500 (EST) 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 A627F28000A for ; Mon, 10 Feb 2025 20:31:34 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 58EE5160943 for ; Tue, 11 Feb 2025 01:31:34 +0000 (UTC) X-FDA: 83105936508.22.0BB4E51 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id 8BE24180008 for ; Tue, 11 Feb 2025 01:31:32 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tRJkQRTH; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 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=1739237492; a=rsa-sha256; cv=none; b=MMUas3wIvL6gfsyvbVEWoBE6n/76PmymzQtERUmN0wbzSlJQ7eUUeg5NxRPGyfgMScBuPD EvjTVw6/VMwmg/7oPP/tuL6aKcYF4MgX1+kmtNI+XgxOSZ7O04n4zCOG+5CU6rmj842UuS e3UMFaZyMNfyJhO/KGdQOaI8BmIfpSU= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tRJkQRTH; spf=pass (imf24.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 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=1739237492; 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=FsM0OzpvZmTavrvmRE1JC7lbXCWicZ/F581CutXOX7I=; b=n+h+k6QmcFlVsXiyQ5cmCM+u1Uljl9H6JZJt+/UmwpHI6cFNAuceYaRU2pBDkyEut19vAc 2zcqwzxzCWJzqqcA/QG6sYcaf218QGGfou+mFO6ORVOIGIGjFULyQIcfbkUA94NswoPmcK cWR5Qla42tiVZAnNLalJszjzhkjwygk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 14FD65C5783; Tue, 11 Feb 2025 01:30:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9BA9C4CED1; Tue, 11 Feb 2025 01:31:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237491; bh=Ig8qMJYAZQesBNaEZK5qBZeRt3E0wfZj2uGiS9IzUYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tRJkQRTHAURM9owh9TbWPruUwz96QVSbCA0oYnlfjTkSP/kF5GmP9Shwyi7z0jN0A V7mFOp0XEZEhgBiZIbzf7yTVduaa3PWFEI5TuPuuSY0FMbSUOUTa2tofhGH2Qj+oiT 5gGNNmR7IYbcPMBQpU77Z1+o2YxXV0IHBPgPfjMnCcwK1Vy10obNMm4XIw1yIX5DCJ J21/wJ9B89sOsnTq6nNHXQEYwrWPZb1RB23g2j0PinTinoeWjNZ8wupxGGjF/Vr5UA XsC2TScd3n3RwD8Q//ADX7oYkUycyi+9FRNy4YB9pOO2MGU4yGYPMRvY19lpNqqd3Q RWqm+gWqsgnHA== 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, viro@zeniv.linux.org.uk, brauner@kernel.org, akpm@linux-foundation.org, broonie@kernel.org, rick.p.edgecombe@intel.com, linux-alpha@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 6.12 17/19] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support Date: Mon, 10 Feb 2025 20:30:45 -0500 Message-Id: <20250211013047.4096767-17-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211013047.4096767-1-sashal@kernel.org> References: <20250211013047.4096767-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.13 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8BE24180008 X-Stat-Signature: bc5m7f9sozmi8cg4kep979ydrqq3wmp4 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739237492-639513 X-HE-Meta: U2FsdGVkX19/hrbFQIXx0SC5kHHxLlfX+MxujfYgOHc5tYymyBh9TsCOABmF5niUIgb/CrfmSmZQEBe2LnqVHQ7wPIA4+DcedFnwuWLVHV/exyj8cUKrdrmQtB15dfsK+P01Cp3pKzH+IQ8WpES0Q4rYugJOIRfJ1Hi1sWDGhMcUu/6k1UyW45uic1P7eSARQkzLw+v/ILiDjToi/gYzzomIj01paTSGN2iSIPNVmHRGjVl3ezpqIjgNq2Iv0eq6gan77pu0HaDELdRIL3vF+CnxYMax4Tfm73m1HKHo4u+UqD7Ouo3F1N/RZuBiJXdI9wG73pxF2wwFJ7TxEwChSrl8tb1BGQWtUZZ5BOfGt1o5DCkEww3Z9m3fry6wDJKtlDoZBMRVHAbIF258gLOLTgf4ywOlzrwuf/PmPkegOvtKyyyIcgTvAJx1HxF0NIPOoe7s1CWDxPFdeK3Ji/NKsN34SEvZxhHDFX9zyQebtnGnAY2qTN+fZuu/A6Pd3VTYrL2wLsiSuuz1vBuYff/zAHjXjiI6ARoLovIydkDfj7O9e51hV0RdQc2G0+4+2R0XahQzWVgKkA1ssvzVfIwiP7l88rwmMZY34tjTfTmCDst+UdMOf08JNiWCptOfz4OWRe3mFW7Zbhz/k2L0s0loe6m99P/4bNthAWTnKNAT2ZetyAUyScp4sqT+CJNeS5ef7wibBDV55ephVTflmiyP5s2hTN8/7vr/buLa1VsM8ka8itasx9bctjxuQh49f0ITy28HUvuzBoZDsrIHn7nIsbM3muFklyVf433yxHrygo2XMh/4Qtjw2atKkmkG1a+fJLojYTEokhK9RHYY+4ictTj6w98JHz8Nuedu4mhzUpuEdqHHLwf/wlWFlfwKOnPrp+aIfEn1lYrZ/yMoL6WBtR4kYen5RG9+6L4bS7Yk7qVqA3vLCWq+AhUXX+OStbHqAj6CipIFAVHMs2/rC5Z OWStrA6U yYPNug37cwQKCC1808xPr2jsnntQJ8RqH5yyoGavLgA5op2LG4qK9dFuAmFJiWCaRSG8l3HCRGQo92G2MLQc8x0XsbKzY7owq5dOuOtP4njBDxe3fki2D7c2Jk0/T7g+tHoWLfRU7BD6QbD6E+CYnoK9t8qH6/W3xg3sd0M6oMqBvtfTzu4FPKeZIDAkUNdmg7WchoiqAMIKTzXuoq5EzA3WhhCmWPRlERBhpM4iATcNzArADA/oXLEihHVWACCOiATcMW2KSC7A2HSkLHuNDeuERx5m+B7ABNJpYQlMgiRJx+Vf4j3qApNwfjSfCC+zASrbpfd2e/ERmtJaCSxp6c1NRf2/vi0Sn3CqBmDxosl1+mLZZPbgHx1jJOq85gWY7GKHcwcfTfwXE/oXsbBguP8pQYLRlMO1G7zCmB9Ew5azYR5z2S1aY7ijuyA== 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 c0424de9e7cda..077a1407be6d7 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1211,8 +1211,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, @@ -1231,13 +1230,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