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 60A97C02198 for ; Tue, 11 Feb 2025 01:33:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D002728000F; Mon, 10 Feb 2025 20:33:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CADC628000D; Mon, 10 Feb 2025 20:33:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B28FD28000F; Mon, 10 Feb 2025 20:33:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9297528000D for ; Mon, 10 Feb 2025 20:33:06 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5693C140A45 for ; Tue, 11 Feb 2025 01:33:06 +0000 (UTC) X-FDA: 83105940372.05.BF48B48 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id 83BBBC0005 for ; Tue, 11 Feb 2025 01:33:04 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Xd1oqB50; spf=pass (imf28.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=1739237584; 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=SxyqVwnNxmKI6VtuoxuvrWQEVil1IOPBXXoZOdeKz14=; b=ixAbkK8MiPqz2cK6LkaEgM5jrHGYrmkOCfUI4zGXUKmltmsnQJJ9upJFqOGIsLPxNE/Lns D7oedfi6uZTvmoKlWFgVAMsGJOISMQGRc2Oup73/bcr+7ylRB0ALiSBBIToavBSx7spzFt YCP48IrCFOjEB+xJzUJSV4CcqO9W8sk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Xd1oqB50; spf=pass (imf28.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=1739237584; a=rsa-sha256; cv=none; b=NMIP7RxlFQrdYRyi/N8RApxoyNyMQN9xRuoAP3ywfL5ZqF9uz/dg99yLk3p47Xw/rmZQJj ej+4rXr4wmQLpw8ugOcIjUD6GBvK0GVR86J/o53xfOcH59szdvB2r/iDbFXG8a6eUmptrN 3MldBLvhkHfeBYxSpq7YvYxw9T9A8UM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2A6045C6001; Tue, 11 Feb 2025 01:32:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADE12C4CED1; Tue, 11 Feb 2025 01:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237583; bh=9JDAfwiHQZA0CMfuWS0zwByLT1iFvASOULym5ITbciI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xd1oqB50Tt9ZCuGlpy5eSCd9dgAWHu+WTbX2/+qmH2rS8nT+H6Ht998Tw9a8xeElO FN6H5u4/WJBFD3qlrDHP8iMjokhAzq7B1v/0oyC8L9JSo0YMxAgDaMWlfFaZHiCVJe D5dZvsRPE/twz5/eiPR7Kj07/boDeWDdaGR32x4F96zp67av7+5gOXwnzkBUD8Yhq9 yrzfF0h012gkxqPgLRpA12i66zh2LdFfQhJoTKbh1jvGR9hh+4Nk89nfGtjHyjheMy VNNzQD8PkWafnMg88PAVtt3UTCXCItwQfWhrBhIfIbLEoFuebFUaQirISuKLJBg6gB CSG9p5tcLMcHA== 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, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, rick.p.edgecombe@intel.com, broonie@kernel.org, linux-alpha@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.10 7/8] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support Date: Mon, 10 Feb 2025 20:32:47 -0500 Message-Id: <20250211013248.4098848-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211013248.4098848-1-sashal@kernel.org> References: <20250211013248.4098848-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.234 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 83BBBC0005 X-Stat-Signature: 8jyidrsgkydikicaatbbogph8pqs7sp7 X-HE-Tag: 1739237584-698259 X-HE-Meta: U2FsdGVkX1+jQWL3Y8X+zSyPfRJUfGudbxR91zIFdPkKehGQA+253fFEicjAmkVBrF9hGWtAm/GQcVAxi2NLMB1rO9NpfOJV5RcDDjAODOdQ7EQ2xLk9Lea6iFycjl+4ZUf5tmmn3iQ9UhyDFaaR3K2xaxWkLL/ZRaKpDHV074StnCNrTQLje7cCiW15Jz+PJj+fDbFctb8p5WsFsDXJgWpAo5FOogkojKSDVapz4XimNOgvq/XIfhcO+i6bg+tDvK0WkFbzaQAb4W76NTOZAnlp45EBFXIqOzuO2udGzHDu2+WO7/JudmIZlAJ3uSzSCcUCKXGtMHMDsGY/m+F/CFkOgJUnIRkqqjGEyi6u6Ikuxj1YGjDDLd1tmhqbt1YbOpHlfb3ruHFZf01u5NvD3B67F+YjSCu95cbeG62w++h1GKlBhK5ntdc3W+95WA1gpGkv00G21F395Q7mSn2V/zbPOfjfjsot8HxuJVYEwyTrvpbHc6U4wKHX3nVt2ybOMRRACjB7u4DQ+QfNBP6dE9gULoMD99T/nrnviHZyOF64koceaCAFPdQw8Lo8aujFTWEHbrE11J4J+jnuwZiKq0m85hTEX18kAXqnfYW6PwB/0Muikfc28tx4JKKkXFLUzpbYUvdwj5WDLZ48FboSuBWjKtV8ARgMvZVdg4vhZPixUro1jOJIj5nkoHnsWWA+A3612BA3GjcZVlzj4ety2OKMDbM0WuYOXcZ/OTmIjsY1CLM4Wl7yaEX7lhV0RcdSn3xeKLtBu8vuTRHwqqXIXt7zMPILY1AqSVssttEObYe85Hj+dZdVFOO841s/3tYBnGbe3v+h4+d1wfSqDNFxQwygtVoryOnQtWgqPUvGHZFPXqgWedcIx7T5yqA6R1NlX+4fvc+R5Vhd/94ONlgG3FIPb1LNzNS/CE+JC3dLIy9kGqwb9s0Zjd7FhT0q6SYxmHVQXt1YP3BrVIzAov+ ia7YBM4P 5qj3Jad60YuRemJ9w+5r/4RO51Ljelg4lQTydP0f43EuR6Pj549bSUCP3zoHI+i9vRyEC2KdNjLo0s9uHv0+sVKbhkuOSuTrDndVfh5X1gOtTGVjDdteUhPwWyv9fpdPh5naPgULbQRjU6etMUnG5/KMMGZe+ZTPPcH3Q0KgFI73hgsEgyod0QHuVPKW8EPe2GnyT5x206ec/Z9PyyzjZnwBBocNCTFL741PXkdsqrBLwmkV458aIfvQx62javC1gm/pVgiXNHJ52qLUQ7HObzco7lBkqOmpCtbyEro1yezqEP4aRkOFQ0P/iAUIr8Qpl6HoFLFgFqeA1TdAJx276amrsRuoz5Z6nmi2s6z26/bKIlafe6hZlAGElspqaU2sDKMOhqkghCI53OwGeEsAm87XU3LFE3U3E8pM1DJeymTpu1QEoi+o3Xe6adQ== 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 8049997fa372a..2039a8c8d5473 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. @@ -145,10 +145,6 @@ extern int dump_elf_task_fp(elf_fpreg_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 12c120e436a24..1cffeda415a44 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -347,7 +347,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset) 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 6100431da07a3..d27db62c3247d 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) typedef struct { unsigned long seg; diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index d5367a1c6300c..6f53eecbb5755 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1212,8 +1212,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, @@ -1235,13 +1234,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long 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