From patchwork Mon Jan 13 05:39:01 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: 13936747 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 22389E7719A for ; Mon, 13 Jan 2025 05:39:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADEB86B0083; Mon, 13 Jan 2025 00:39:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A8EC86B0088; Mon, 13 Jan 2025 00:39:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92F036B0089; Mon, 13 Jan 2025 00:39:15 -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 748646B0083 for ; Mon, 13 Jan 2025 00:39:15 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 28A35A1B37 for ; Mon, 13 Jan 2025 05:39:15 +0000 (UTC) X-FDA: 83001325470.09.8968E79 Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by imf22.hostedemail.com (Postfix) with ESMTP id D9BAFC0002 for ; Mon, 13 Jan 2025 05:39:12 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=xmission.com; spf=pass (imf22.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.232 as permitted sender) smtp.mailfrom=ebiederm@xmission.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736746753; a=rsa-sha256; cv=none; b=RTS+HG+/Z3yFpgf47Ax9nh+4pOAyDh3HR2nUYJeL3quRwrwedsPVO6mvgN+aSo2dYV1Cxl jdreHferPnYOYvyLzpNyLNYRYVU5WH4F25dvQ4CpMtORGygUWIYLr6iJUH4QBqrepqfsQ+ nExSBw0q+64Pc/FUSfa/6011VZa0cxo= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=xmission.com; spf=pass (imf22.hostedemail.com: domain of ebiederm@xmission.com designates 166.70.13.232 as permitted sender) smtp.mailfrom=ebiederm@xmission.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736746753; 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=QZ2N2GoAlcJqPQt1Nw1CZD9hwdbSYdGRpM5L/KoEc8E=; b=M/taa3/CJCaWH1ObRgayif1Q1cCgyhggDUSZVG+gR4CSJ38hBZEoqd+prp01HspVJiZpBk +KD+wp7X8dgJw4pBAF4y0M/lq5r2MT/h2dTZbBz9atAD8hCXUXgQm6nXhUnq390Uow30X9 JJh7KiZvEwmbGrswGESkyfKXsGZUpnU= Received: from in02.mta.xmission.com ([166.70.13.52]:46270) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1tXDAM-000Zuw-Io; Sun, 12 Jan 2025 22:39:10 -0700 Received: from ip72-198-198-28.om.om.cox.net ([72.198.198.28]:48892 helo=email.froward.int.ebiederm.org.xmission.com) by in02.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1tXDAL-004RGo-7j; Sun, 12 Jan 2025 22:39:10 -0700 From: "Eric W. Biederman" To: John Paul Adrian Glaubitz Cc: "Maciej W. Rozycki" , 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 , 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> <87jzb2tdb7.fsf_-_@email.froward.int.ebiederm.org> <2758fa70d237ff972b0c8d7114777dc4a20c8f3b.camel@physik.fu-berlin.de> <78f3ae1f68842a9d1af62caaac3929834ce6ecfa.camel@physik.fu-berlin.de> Date: Sun, 12 Jan 2025 23:39:01 -0600 In-Reply-To: <78f3ae1f68842a9d1af62caaac3929834ce6ecfa.camel@physik.fu-berlin.de> (John Paul Adrian Glaubitz's message of "Sun, 12 Jan 2025 15:56:39 +0100") Message-ID: <87y0zfs26i.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=1tXDAL-004RGo-7j;;;mid=<87y0zfs26i.fsf_-_@email.froward.int.ebiederm.org>;;;hst=in02.mta.xmission.com;;;ip=72.198.198.28;;;frm=ebiederm@xmission.com;;;spf=pass X-XM-AID: U2FsdGVkX1/9OtitEyjluGDWnz1LKndqn62cBkz1tkc= Subject: [PATCH v2] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support X-SA-Exim-Connect-IP: 166.70.13.52 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, 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, macro@orcam.me.uk, glaubitz@physik.fu-berlin.de X-SA-Exim-Mail-From: ebiederm@xmission.com X-SA-Exim-Scanned: No (on out02.mta.xmission.com); SAEximRunCond expanded to false X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D9BAFC0002 X-Stat-Signature: uabtrihcbnhpiz7xk8m3gds4qon5698k X-HE-Tag: 1736746752-889228 X-HE-Meta: U2FsdGVkX18lUxSklWNGNZvQFqlvcXQw4O4AkmqvvsdzYVZpwtSmcbzz1hcHi76+wDB/UUB0ISUs1mePLk5q3Su37IDUR/OxZgIeMocyDN8AMAhC7jNoBj4iG7pWR8VOvEucoznUnjQ5xSLRbhEt0AP17BqyQv3yFdXuwZzanNBZATmL+GNvvRVilfuQ5G45F94wmYAtTsZJyYcC7arVVGpCTSEkN3YGL/98b5m6Jey2CnSqYkhGhiYFcOAEWxPLIVPWxqDNnOGbA776Vxidvlu7nJKwxZDMy4MoQwgzjvAUVPg8yQeNhSiVsVH/CmwK2TttI5b+XnhieHO/MdxKmrqFKqSq2CqIkpAE6NkHyFWG7WglbCdfXPKG6aDCehL4es1XafYcwEeuuZrG2UySfuQXPI7kZ5WeJ5Xsk+JwL5EnXfqltvzJWPovDnZhlE0Y6J+BZ3MW3NHvzEzFvhjlJxABIDeRPOjPqnla3+zt9fvtI2Q9VIdPz9FlOO/p7K/bihkJiXmNpMyKd91mBvX2i8u1sAXsyQGQx4KLVVnjCZPa4kv9e4iImUQ4a3ccloWri4HZDZrtTGlA5sGUV8eziynDkB6p+FZ8F6jPFJ8CE+jwXfeXSeps8LJ0o5DiVNBdB5ZFOyl/YHKNQTfdmP8ycPvh0wKeuOhHFoD9cd9WrDRCyk05rIJid+pK7u+OKqkn3RmICon+taVyWkZtW4BqS0ieT3I6VBzbeYh5O2FkyV4oNUR5TMNrwXfU5XAb2RRPyRZ3ERZFTJvrDmxh0MiG58iAVVqAB7uwbSYf/XWqZ9JcKCqQLlbH08JSWsrM9HnnxGIth8hu7Ycqt4I6tWLWxIYl0zRggcBgPCOZvCjYHWjwvbR8hWL+ZMABQ8GCgPxxXvq/q3J3QPDR0ZNub4L473pfaK4TkanuOaWACAJYdnbPR9MjfA4unL9w8P9PvfKhKqA70Ii9rHWLX5Vq1aw 66VGeMqF GWMv7IkwTA5m2XdE+O9ympwxUbf7utVY6dbuiSkfVuRxpOKUPRsP8A0LrnQ9bII3HxQnx67xGYwRuYUGghHbz56V60nz1iLlt1AemulpLyHNlVuNgX3Bc+IrL8AvcMm2c8Xge89QKvIEYFStAo51YqUW5T4UzTELVUdeL2OM5wS+49XBymU3Mmvh8d1OwgqnEXTfxRjZDbtRUv/+3iiVvQ5AC8fmAhGAMziUPeiCHjnQPnbD2BXRDcJxzjQ== 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 have the EF_ALPHA_32BIT flag set. Just in case someone somewhere has binaries that try 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 v1: https://lkml.kernel.org/r/87jzb2tdb7.fsf_-_@email.froward.int.ebiederm.org Reviewed-by: Richard Henderson Reviewed-by: Arnd Bergmann Reviewed-by: John Paul Adrian Glaubitz Tested-by: John Paul Adrian Glaubitz Signed-off-by: "Eric W. Biederman" --- Kees can you pick this one up? 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;