From patchwork Mon Dec 4 17:18:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 173467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2911952vqy; Mon, 4 Dec 2023 09:19:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IF15XfwMGj04lgLdOfEQqVbmWq5Kh8BJtIIbp1/y6b2VldKUKPcjIVitPNVOeKBk/n0+XEc X-Received: by 2002:a05:6a21:164f:b0:187:97fc:6c56 with SMTP id no15-20020a056a21164f00b0018797fc6c56mr2231236pzb.49.1701710347763; Mon, 04 Dec 2023 09:19:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701710347; cv=none; d=google.com; s=arc-20160816; b=gs9XiH1Z5ry47Gvq2HgmWayoB5T3W/smd8ExIYnShtKoV7HpMnrX+y/fuBE+ltYiHM v0TBsYaDtWW7tx34wYfo47KOMTX187lUe5ySVkZDH5USmTpHHFpqFNNqXOJrsNN6h75Q 9Aw8h+o40NGVxPBzA0nb4aEzDmzQrcJ7D1u/bUqoH3EtmE2otiXl+y3CiyxxJ08mBL5F d3LBL+BRAB52SIrVzPy35KCNTUOIP1lbjUijeVF+2ZpV7UFB3Qlii/kAKCv52R/dNuiH EmkFWwd40wj1+6sAYJAW4F9EP7nic4g8+Sp74DXrdcPVd9aYQ/BOqSS0TQA0G7cv3mEO wGcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=Zq81Lz5INITag9UbS+znegk7+9XIHocUg1TbRaMZkAk=; fh=g1Pa6cBFiDI1tvljT4f83m+Qg2zodJqyPjQM4m/+VgA=; b=lgfpZAMsd8j6llCacq3QhQKGKG6Lqxu4L3/B5+FVOYpb6SrLP9keDpSxon3nSkKnR0 sRYu28gI0HSJTejrGdu/RWyW2C9utRJ5h9q4Vj/40AiXjEqYQ7+EEUVgsPGzXefCcZj9 TXeMfJGT/VtXIk96lUyNql2eleEQ2Ek5ltTSlT6RMLv2Uewx6NKBddPU8Vdjm9NQnLZE VEQO/swfIQSeQiQ8aEA9k4tSfQ236K6rLsmYwpQsZGKzGYQnoeRiB5A2o71AP/EYgY68 mRccPRjUIZV3uGhuUSWS27HZo66EDlPvTNcltZXlr9Cejqn+8fl1B2b5oJpXSx8RxQeN OvTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m02aiGjI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u16-20020a63ef10000000b005c65ac797acsi4511383pgh.360.2023.12.04.09.19.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 09:19:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m02aiGjI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 574A68058461; Mon, 4 Dec 2023 09:18:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229561AbjLDRSr (ORCPT + 99 others); Mon, 4 Dec 2023 12:18:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbjLDRSr (ORCPT ); Mon, 4 Dec 2023 12:18:47 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A518C0; Mon, 4 Dec 2023 09:18:52 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9fa2714e828so632886466b.1; Mon, 04 Dec 2023 09:18:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701710331; x=1702315131; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=Zq81Lz5INITag9UbS+znegk7+9XIHocUg1TbRaMZkAk=; b=m02aiGjIVLNYmw2pj7cd4wMIasYwKr/ygVALB14fZNewUyNAlwJKEgIcLXPM7Y+hy1 Q8M5fom1xHivTzsgN4NcbB4uewTFawQqhUv0LRpVTnGLAunF55p++SwHvs5PIohg92hb Bn4BvSyoH9V10mYWHHk1QLInLsy8tlHc/kOQIqH5zfnaDEGsAtQB/SlEYXF38psNhzYP OzqaYY6qoBLKfDZrnfPVugFzYRJiV7qwM/+1BIF4wGJyBUqs98xespQnwnSp6NnNWpwy kFjya+5mDwabo4LF4dwVG6t7RRQQ6mrWDrzouuHZ7gqlQQNdOuCxn5Z8ZxwlQYYO0gxE hLtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701710331; x=1702315131; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Zq81Lz5INITag9UbS+znegk7+9XIHocUg1TbRaMZkAk=; b=FTbR1GDLTO9jZufvSTDJgx3x5ApSXuK07VAghDNgZxzlHr8gMFx39Wk8QJyMAOLQil PlAuZ7dtIScoWhr5xdGFrJyzSiInsA+OBhKHFBK/PGnsXVNWRp3eJ2J5SLfwU3xPdi5X H5n1Elx70Fv8krqLF2vA11emCVPNKzEeozTCqzI5FM5se3iUfpb7ZAr2H2+QN3kv3Qj0 McUbhXQht5XMh+6O1qbBtJT6rAS+4iwA+ohCCLAda4nMhSw49kpKwe48eIWFps9PNgtE N3mrBTuH8+yl2dU2/1Y6bsvbkusdLZCpnU2EvOitO5y+u5hl1g12R9kmvhXiWNpqt+Fp wp9w== X-Gm-Message-State: AOJu0Yw/upJhrSuOjSJt1AUtSSuSoyqByTbWxQOchUrL8U8boGC56cHq WGXMp6UTvcjt8Mc7+k8weQ== X-Received: by 2002:a17:906:fa0d:b0:a19:a19b:55d1 with SMTP id lo13-20020a170906fa0d00b00a19a19b55d1mr3094547ejb.97.1701710330893; Mon, 04 Dec 2023 09:18:50 -0800 (PST) Received: from p183 ([46.53.253.246]) by smtp.gmail.com with ESMTPSA id l18-20020a1709065a9200b009fe1d575365sm5481589ejq.55.2023.12.04.09.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 09:18:50 -0800 (PST) Date: Mon, 4 Dec 2023 20:18:48 +0300 From: Alexey Dobriyan To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, x86@kernel.org Subject: [PATCH] ELF: supply userspace with available page shifts (AT_PAGE_SHIFT_LIST) Message-ID: <6b399b86-a478-48b0-92a1-25240a8ede54@p183> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 04 Dec 2023 09:18:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784372629368004766 X-GMAIL-MSGID: 1784372629368004766 Report available page shifts in arch independent manner, so that poor userspace developers won't have to parse /proc/cpuinfo hunting for arch-specific flag strings: unsigned long val = getauxval(AT_PAGE_SHIFT_LIST); while (val && (val & 255) != 30) { val >>= 8; } if (val) { page_size_1gib = true; } else { page_size_1gib = false; } Note! This is strictly for userspace, if some page size is shutdown due to kernel command line option or CPU bug workaround, than is must not be reported in aux vector! x86_64 machine with 1 GiB pages: $ hexdump -C /proc/self/auxv 00000030 06 00 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00000040 1d 00 00 00 00 00 00 00 0c 15 1e 00 00 00 00 00 x86_64 machine with 2MiB pages only: $ hexdump -C /proc/self/auxv 00000030 06 00 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00000040 1d 00 00 00 00 00 00 00 0c 15 00 00 00 00 00 00 AT_PAGESZ is always 4096 which is not much information. Signed-off-by: Alexey Dobriyan --- arch/x86/include/asm/elf.h | 13 +++++++++++++ fs/binfmt_elf.c | 3 +++ include/uapi/linux/auxvec.h | 17 +++++++++++++++++ 3 files changed, 33 insertions(+) --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h @@ -358,6 +358,19 @@ else if (IS_ENABLED(CONFIG_IA32_EMULATION)) \ #define COMPAT_ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) +#define ARCH_AT_PAGE_SHIFT_LIST \ + do { \ + u32 val = 12; \ + int s = 0; \ + if (boot_cpu_has(X86_FEATURE_PSE)) { \ + val |= 21 << (s += 8); \ + } \ + if (boot_cpu_has(X86_FEATURE_GBPAGES)) { \ + val |= 30 << (s += 8); \ + } \ + NEW_AUX_ENT(AT_PAGE_SHIFT_LIST, val); \ + } while (0) + #endif /* !CONFIG_X86_32 */ #define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso) --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -240,6 +240,9 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec, #endif NEW_AUX_ENT(AT_HWCAP, ELF_HWCAP); NEW_AUX_ENT(AT_PAGESZ, ELF_EXEC_PAGESIZE); +#ifdef ARCH_AT_PAGE_SHIFT_LIST + ARCH_AT_PAGE_SHIFT_LIST; +#endif NEW_AUX_ENT(AT_CLKTCK, CLOCKS_PER_SEC); NEW_AUX_ENT(AT_PHDR, phdr_addr); NEW_AUX_ENT(AT_PHENT, sizeof(struct elf_phdr)); --- a/include/uapi/linux/auxvec.h +++ b/include/uapi/linux/auxvec.h @@ -33,6 +33,23 @@ #define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size */ #define AT_RSEQ_ALIGN 28 /* rseq allocation alignment */ +/* + * Page sizes available for mmap(2) encoded as 1 page shift per byte in + * increasing order. + * + * Thus 32-bit systems get 4 shifts, 64-bit systems get 8 shifts tops. + * + * Example: + * x86_64 system with "pdpe1gb" reports 4 KiB, 2 MiB and 1 GiB page support. + * + * $ hexdump -C /proc/self/auxv + * 00000030 06 00 00 00 00 00 00 00 00 10 00 00 00 00 00 00 + * 00000040 1d 00 00 00 00 00 00 00 0c 15 1e 00 00 00 00 00 + * + * For 2^256 hugepage support please contact your Universe sales representative. + */ +#define AT_PAGE_SHIFT_LIST 29 + #define AT_EXECFN 31 /* filename of program */ #ifndef AT_MINSIGSTKSZ