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 E0C70C02198 for ; Tue, 11 Feb 2025 01:32:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 758D828000A; Mon, 10 Feb 2025 20:32:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 70996280008; Mon, 10 Feb 2025 20:32:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D05828000A; Mon, 10 Feb 2025 20:32:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3AD50280008 for ; Mon, 10 Feb 2025 20:32:08 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B3EFD12095F for ; Tue, 11 Feb 2025 01:32:07 +0000 (UTC) X-FDA: 83105937894.13.F57EA2F Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf28.hostedemail.com (Postfix) with ESMTP id 0B754C0006 for ; Tue, 11 Feb 2025 01:32:05 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Qk3Zun0I; spf=pass (imf28.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=1739237526; 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=Pe0s6EFHMhuPD+oRZez5/ulI2KD1QLtATvcIgixqSjs=; b=qoAuZYTrjSb2HxzeKExP4D6dESqxJlvB4+FiQL6KVNozCC7KWp2gP7z+ihl+Snx+2d0m3w 2MtU/HOC4jxdfj+ZSHitZiJaJd/JVaVaebdH7X3zFAC+8lE8XPuoBNmymhjyYaoeM7GkmH NLHtVXY+TkcZ2oGmQvUZhksOOVO59O8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Qk3Zun0I; spf=pass (imf28.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=1739237526; a=rsa-sha256; cv=none; b=NW2NRPPUCNgz0hoEDKdFWFb+oy/U+LKGkuD/7+8vI0fq/H1Z6VaRBIwGcE90fr+jfdx/5o EU82GuOBiZbnBxR02fLeJXu390u8diwADildH6XpibHby8njJ7NqUHf8sKO4w6jOHZeFl8 kvefrShpqF8LFs6UtrPGCXyPKEpt8sI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id B9696A42088; Tue, 11 Feb 2025 01:30:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 443E0C4CEE7; Tue, 11 Feb 2025 01:32:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237525; bh=P72an3e1vo2m0gnAleO0ICIl3WNOaFBtZO7YjWEr43k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qk3Zun0IjIT+484QXLNzqrxCpkJXlTl3KjTKSRJPwHhhaNPiCcp/dNFh+4f1/RxEi iIDhuvK+QLyPhzGzj4CTMULXZrzcj0HcEuZGzVERAbSM18IbAT4nFMNoqa5HnanUgh KnsE5EWN0v96okuZUEHRbXuiNM6/h7im5wN+ub8s3Yf1ySINb1B7OOHgHt+DBujV/R IiAFhKkmERpX1koiWdAsUDIGmD+DQOmSpiSAgVvqJWHfBtZsVCp5WKrLQ1tHRcbsRW 3v+BwN8MpeG0dv/w5gK2qrIgYKZkxkd3/EvvZuvVwFThL2uVicEr0DIZIWoE6TfzIx hDFtW3ZL7MCvA== 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, broonie@kernel.org, rick.p.edgecombe@intel.com, linux-alpha@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 6.6 14/15] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support Date: Mon, 10 Feb 2025 20:31:34 -0500 Message-Id: <20250211013136.4098219-14-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211013136.4098219-1-sashal@kernel.org> References: <20250211013136.4098219-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.76 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 0B754C0006 X-Stat-Signature: z71chg744eze8azb4fa54gmxhkabx6ht X-HE-Tag: 1739237525-981973 X-HE-Meta: U2FsdGVkX1+X43eVu4kfhtOIYcN4qKIr/+3JuvZ977b6T0rYLmfDWwJyhO4sLU9wbCo/8ieI3Am/DMLRvt08cGdc5kAz5UayPP/+wkRKUrWWW/Y8F/LC2wgo8VZSOuhSe5E8Ffj+eQ0vwgb/MA16FZfa0hYOvobr7F/Sa1ymXldoE6QPqticd5Jd0FxCmDtKqi7CpuqbssILxkUjD1zM8xHgDo6mEBjJd6OrviehadChyMU8DIHPLrg5qSuqGPLFfNnMDM6S3C9VBhQxpIZi4b1cW2aNlthnOy2syN9WfPFnu5BahzqeYqcRGYB+OQCc3Y+VlZG8l1tOY3PipdzHyLBfwSpnubK+UEwntzcokw5I8NtBdwOKVNqnh22Vjwg6f7D7ClSEgG+aHqVwML45ZjudXzUyh7os74YtKZhl1ngd6LbcTbqHoHsjmXo/8mGwxk/2Ds4kXA/HiBwQGd2sVgsY8hrmb+ZfkGJaH1opT20Iw7rWh2uWogBVQ3Uso4vz4ELkvmbn9NXI6Q4OIBrrdHokc8ydJK17bj+DfcGPL8K2OdXuqYujqlDz9JDRShFiIwLbPK3BaE1HaKVh8T8N2KT0Wnk+v3+QceY8Ies3sCkvV/Pc/nBwVEgwlqUi1X/IgHIFrs8KmoCSzU1pM2m//PoHtU3re8JcfeGT9USqY6XvUnJGEzf0kqb8k3mGeIfvG5qei/1xThaBHeZg99tQuiwT8qVtr/iB1DuB/g02hqsryILCtb34YHBYzVIhJnnogYtsQFeBwJ7nLXkGSv8DSu4MWwgiHv9ClU0prRyTuJ84Et7ysuSiQIvtDBMwDOonCxMgab2g3ecnd2vwwVBsoKDf190s2CQ7uiNFel9F5b3d2Yl7ONuAAqYR1vD8W9EpkjYDuF6vaXZN5F+Ry+AcAw/dY//MnZ56yAz6C3yeiEfsRDjsN7iiVVnUcnKhNvv9EMHBe0yWdLb/shHWcsd Utb9+4a/ NsgBcPAWj0ltEpitK3np6NCDMbHqAL6FhUKU0pOxlnG9bCUJROGanR5QhTr9qQnyRgC0y/n/yTrdow1mhC3lc4yif5NVHn/vz2GsxzJGIePzdQPPJu4lm4hP72IccAqfUNl7sA7it0iRM3p18XinWs1BGOINWeBPCLWDvr0QXSqZFPPnBbDUTSdJALzt8TrycuMsniN20ghggDnvo2E4ohkdeB1DQUsbVnFysOKltLaFVI6GR0OgQOEzIQTZOprzdKDBFkuPjmLHgAnSgvWPaJAx4crOeMbevx90UZto0P+Zfx5R8Ho/myjuF4vRVsbaBNve7a9rk3dUkdX7N93lgqo1PreM9NBlYuNmYCSJT1l5s7QJG0TPlz3iWffVUWQMgS7PB/1YVaXz1jCwOdtIxZ7I6mk6paPoYOBmddAgTemF3x6QWVgeoR2vOfw== 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 e6da23f1da830..adc87404ef87f 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. @@ -139,10 +139,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 5db88b6274396..ebd076fad804f 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, @@ -1234,13 +1233,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