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 01A8CEED61E for ; Thu, 12 Sep 2024 16:28:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D8D36B008C; Thu, 12 Sep 2024 12:28:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8889A6B0093; Thu, 12 Sep 2024 12:28:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 779BC6B0095; Thu, 12 Sep 2024 12:28:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 578E26B008C for ; Thu, 12 Sep 2024 12:28:18 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C1C431C5953 for ; Thu, 12 Sep 2024 16:28:17 +0000 (UTC) X-FDA: 82556618634.24.D51D0DA Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 29FCC180002 for ; Thu, 12 Sep 2024 16:28:15 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1726158390; 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=zhEFSa683jqIhfYPJZtLM72bn0Gdi7yo7uQSp8ueRH8=; b=F1jfHUZAGesX1XW50AmEBEStlDoNWGS6g7bkdKmdrmyS4RGIz1ZD35MiJyICvfWjRcNWwx fB0UDbyPBLdcL0lFCJ2S7h7Haim864TVD4BrnfDW3hGtkOVW7IiZz7FlBveGQCl9TtHHxp 5Rzxf4zSR/ByJSwL9BXcSk+o+8kTepQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1726158390; a=rsa-sha256; cv=none; b=BDglSLMDnz6EIrDIkwuE/afuisjZbW5CsDQrZOYx6USaDx3Yi4CGUtTcmnObI5T4uiDYOM FpH7uxqZv+ORwtlawoRcq97DbeGIXXsZQIdQoD4RLtYvIv+r2mr917HPviWSl+xAprYhK4 hM5ViH4oiohGZDkHlgn/dLaePDq8fNY= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 64FC15C47C4; Thu, 12 Sep 2024 16:28:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10AAEC4CEC4; Thu, 12 Sep 2024 16:28:11 +0000 (UTC) Date: Thu, 12 Sep 2024 17:28:09 +0100 From: Catalin Marinas To: Mark Brown Cc: Alexander Viro , Christian Brauner , Jan Kara , Eric Biederman , Kees Cook , Will Deacon , Jonathan Corbet , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yury Khrustalev , Wilco Dijkstra , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org Subject: Re: [PATCH RFC 1/2] binfmt_elf: Wire up AT_HWCAP3 at AT_HWCAP4 Message-ID: References: <20240906-arm64-elf-hwcap3-v1-0-8df1a5e63508@kernel.org> <20240906-arm64-elf-hwcap3-v1-1-8df1a5e63508@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240906-arm64-elf-hwcap3-v1-1-8df1a5e63508@kernel.org> X-Stat-Signature: obdrogd586syowg85im35x4ob5a4gyjq X-Rspamd-Queue-Id: 29FCC180002 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1726158495-970517 X-HE-Meta: U2FsdGVkX18liLjGqCSF6pDTz6DAGH/QTZscTTJvnzVUA82zmZNS0A2bcwBI4WzaphxKP8qbdTJTyEpzxeZPn9/vvmh/EVvbN/mfw1HIE+uRFbqwBJIklYQan//yhx/F5i4iN247RvJVoFo47Jqca/AB4MGUk2cA4w+GsU9E34zWOuO/sTh5F5nFXDdOFqQQGK334U5Pu+8SOlv7CrrkYc2qf97lqR59NAavDbJ3fbJdcGetugap0xb31SuC5iQoD9zYikmB8BncOnMElRM4DuK86MGmXtYyrNaBHcDrutnt/BlWuKaUjM8pktchdsIrCV0qJIFMlZuiUf3Gc1fHeXKwYtV9kKVPDqyb1gX7tHqxx65qQGhZYrFt6obb1U2wf6eVDbgDjB72l/SHvwv5zwwBIk/oFyd9B/hxY5mNcmBre9wZVH2NdeO+q/xKgafwScafdWcxsjycnX9EslPiCYPj9G+aiTaOIETcy/k3lGYrhmJCNV6/t24+fjRNfujNrMj672vkOjLY1pVysPmqXfSQMpUKrK21yZZhRYlBnn1pqf6DJtqJJoU2ew9OUJIBxt6LzjK2zXA6qG+Wpv2/0LsGKCBG71VjHb2MuxPyhv9d+JeBDaw82givCi2ShEc9/yHFUiXIOVkeHEI+vR5Bf50ttjfZHOp7cEvWEo26uoP+WqpLH0IQAN/WXugTJmaXjxJtoxMOGi/usAErLFKCnjNcNqgLD6r+MJLnvZYs9x9qf/MnEOeDs2ImEoWWGp0s2xRfnV7ZRQGaYriGjKJWpoecW8bsXeQ/Q2YdIjEtRCTCCPIhWoDkDg+mzQZbuN6xQc+W6ToDh2FZrLLSP8nfs0UQwH0waDZaLgcnwZPwEG4JJ5YSrpy2nc8Ro03vfe3tKvXbNLFmaWot5pfSAK3kEuoLTwFt917To5gylUCQQFSf/LTYxPjKZfJ6wEnXOEY9WIX/MTiCZXlyORW49e2 OT4e3fVZ vK/xjhnTrCX7vd4wvXKw7ocKJ2sxTlOIKcA98NtUrYF6R5qnHo+NaXoomzPfrzG3UXyM6tPceWJMTStJWhHQmCiTaeHH2jvduQizze59mskvaI5yeQEqun03Vo1spo07ryc+mo1qXvvJNgyKELB5YBMGqu5P3QI1ftYQsjNScVzequZ/BGJU68aWTDNRZYpGIbFUk/8xFOLP+zWaYaTibBfjvbhGdoJnQt9eweeX0um9nR4RYeZ9H0ZagIgUVkgyba28vy26a+PXHeMOkbO5wenIlf2VmaLNNceJvvBFnUtAPdhpTPhkf4ecakxxbnzwh/K7ot6CQ+sambDhKpAf3kZR0K5XipEAZXFe/+YOYczDq2ldq8db5G2WGC+jiJspb1CCSWLyV1CXwfcE= 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: On Fri, Sep 06, 2024 at 12:05:24AM +0100, Mark Brown wrote: > diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c > index 19fa49cd9907..32e45e65de8f 100644 > --- a/fs/binfmt_elf.c > +++ b/fs/binfmt_elf.c > @@ -257,6 +257,12 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec, > NEW_AUX_ENT(AT_RANDOM, (elf_addr_t)(unsigned long)u_rand_bytes); > #ifdef ELF_HWCAP2 > NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2); > +#endif > +#ifdef ELF_HWCAP3 > + NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP3); > +#endif > +#ifdef ELF_HWCAP4 > + NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP4); s/HWCAP3/HWCAP4/ for the last line. > #endif > NEW_AUX_ENT(AT_EXECFN, bprm->exec); > if (k_platform) { > diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c > index 28a3439f163a..9365f48598a1 100644 > --- a/fs/binfmt_elf_fdpic.c > +++ b/fs/binfmt_elf_fdpic.c > @@ -620,6 +620,12 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, > NEW_AUX_ENT(AT_HWCAP, ELF_HWCAP); > #ifdef ELF_HWCAP2 > NEW_AUX_ENT(AT_HWCAP2, ELF_HWCAP2); > +#endif > +#ifdef ELF_HWCAP3 > + NEW_AUX_ENT(AT_HWCAP3, ELF_HWCAP3); > +#endif > +#ifdef ELF_HWCAP3 > + NEW_AUX_ENT(AT_HWCAP4, ELF_HWCAP4); Same here with the ifdef. > #endif > NEW_AUX_ENT(AT_PAGESZ, PAGE_SIZE); > NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC); > diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c > index 8f0af4f62631..0a219e26692a 100644 > --- a/fs/compat_binfmt_elf.c > +++ b/fs/compat_binfmt_elf.c > @@ -80,6 +80,21 @@ > #define ELF_HWCAP2 COMPAT_ELF_HWCAP2 > #endif > > +#ifdef COMPAT_ELF_HWCAP3 > +#undef ELF_HWCAP3 > +#define ELF_HWCAP3 COMPAT_ELF_HWCAP3 > +#endif > + > +#ifdef COMPAT_ELF_HWCAP3 > +#undef ELF_HWCAP3 > +#define ELF_HWCAP3 COMPAT_ELF_HWCAP3 > +#endif Duplicate hunk. -- Catalin