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 5721AC4332F for ; Tue, 12 Dec 2023 21:09:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E08ED6B02D3; Tue, 12 Dec 2023 16:09:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DB9EE6B02D5; Tue, 12 Dec 2023 16:09:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5BB66B02D6; Tue, 12 Dec 2023 16:09:25 -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 B17AA6B02D3 for ; Tue, 12 Dec 2023 16:09:25 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8FDA4C0AA6 for ; Tue, 12 Dec 2023 21:09:25 +0000 (UTC) X-FDA: 81559407090.06.F73AA10 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf17.hostedemail.com (Postfix) with ESMTP id B9E504001C for ; Tue, 12 Dec 2023 21:09:23 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=bk0GKmFA; spf=pass (imf17.hostedemail.com: domain of keescook@chromium.org designates 209.85.215.170 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702415363; 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:dkim-signature; bh=s4klJ8l6fLfAZKVWPgko1830CXSL6+WluuhkBtOdryM=; b=JLET1Ngp17Kom8gf5SdDau255tYX6rcqfLiqMkpKV3dLRM0+SsgKJ1dU2cGTZ74drKMpwe oG8dVpOht4vOhaz0X8VmtEsY9+eE0NucwiZGsFem0e8L/0GR34r3+g8QrZxWfzBhi3DA9t 10onKd/4XbZGTQ55dSY5UWpNiVnSbOo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702415363; a=rsa-sha256; cv=none; b=xggw42qoc7mklUU/55U7vzMpRJ9UQ4BnpEruUGfdXkW6FC6E9p8yYuAbX8jZ4SSUw/sqmx bfGJjlDAjas5A5UK8w/Dy8erP4WlGOE1pI2hEZ1zsl1SSoOM4MC0aYk5pzrZc0bgUX9SnQ xkmbS7ZXFd7bYoChJwmyxP+9W9jSetA= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=bk0GKmFA; spf=pass (imf17.hostedemail.com: domain of keescook@chromium.org designates 209.85.215.170 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5c239897895so3242668a12.2 for ; Tue, 12 Dec 2023 13:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1702415362; x=1703020162; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=s4klJ8l6fLfAZKVWPgko1830CXSL6+WluuhkBtOdryM=; b=bk0GKmFAsFF46wHu+QyP2HpQchEoXkNQOFQ28DFbOu2oAvT3RfnEKcbP8xNE0cCOHm /pTPIiH4UOYhJPE4fdDyBBK5XG+2EAAU9fGJfJV2/FwojDeKqruG0jPhTxtbjEqiqwbp /F26LpFsSl26HE378TSAc6NdQH9fcTUuTHf+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702415362; x=1703020162; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=s4klJ8l6fLfAZKVWPgko1830CXSL6+WluuhkBtOdryM=; b=jlwPzmU7X0VMzjhNh6iLvoZRzz24PHkBPi1fp2tYvpmsDg6Led4GpaUfRGchlenwP4 QBeMfQiPd0IryeXhbJcsY/qdzyRlxns549AzYd9daHj5qb65eCZIQ4WrZ2OXmAl+sTVf Zhnj0zKahMqIJU4nw6Oq/5J0VK/+LouXufkNEGtakG/ucfNNjPK2rbZIA6WTRsmbMV4o f2PdusdCHlIywZQ2XNHoKZtsmLrE0yCqNrE4sZQ3ZFAWkHjukGORjDL3/pCHKKnFj1io z4Mj1tDp6LfpIoAoO2LsQ7z2JtIOp9tvTQYcDtaqXznkB9R4cT73C2JuFy7OnVjRzboY EdiA== X-Gm-Message-State: AOJu0YzCGQlQpkWT34sVvN4sJyjWD0gJzF6FkpDXG9fFJNsJIhtSpi8w ThfUk+D7mEHzn54sYm/rfQRMHQ== X-Google-Smtp-Source: AGHT+IHtd7FszDMGirD1ZPy4kL3dQAz8QrpOLMzWyFxONZj+kxreJ+VdZCKjnt0WLVGQPyhmEcczVA== X-Received: by 2002:a17:903:2446:b0:1d0:6ffd:6e6b with SMTP id l6-20020a170903244600b001d06ffd6e6bmr4102435pls.99.1702415362621; Tue, 12 Dec 2023 13:09:22 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id d6-20020a170903230600b001d347a98e7asm114457plh.260.2023.12.12.13.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 13:09:22 -0800 (PST) Date: Tue, 12 Dec 2023 13:09:21 -0800 From: Kees Cook To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Cc: Alexey Dobriyan , Andrew Morton , Florian Weimer , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, x86@kernel.org, Eric Biederman , linux-mm@kvack.org Subject: Re: [PATCH v3] ELF: AT_PAGE_SHIFT_MASK -- supply userspace with available page shifts Message-ID: <202312121307.D6605DCD@keescook> References: <6b399b86-a478-48b0-92a1-25240a8ede54@p183> <87v89dvuxg.fsf@oldenburg.str.redhat.com> <1d679805-8a82-44a4-ba14-49d4f28ff597@p183> <8582f7c9-b49d-4d21-8948-59d580e5317c@p183> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8582f7c9-b49d-4d21-8948-59d580e5317c@p183> X-Stat-Signature: 7j6p36b7u1r9o6mkmryt7npzxk8ns6ha X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B9E504001C X-Rspam-User: X-HE-Tag: 1702415363-995342 X-HE-Meta: U2FsdGVkX1+87X3toym7MIQcIFxvImRiUJ+k/bqF2kVU/OfxdiLdq1CFqflmVkmvQ+VD007VFvQszzNsBOBjAxCIJY6xwMuCjyRmGXkgae9Gd9EXkcUMp7eqmDqD+bkyrSuklleZiT1k3ERMHY3ieWCYE++0ZqJkpQvSnsyRezCT0+9jRst8s7dn/7GvzTMTlVRUejukPiv/N34odOqVc8Kt9gBMBypq6mpk7Zl3pS+l+PcGY8bjbmv2ufByS0GZkkqKOHbpbUZJgMq321facrJdPtapsw/HaDoWvD4v+S3+plC9xjmsVy8IhC+HC3T4yLL3yJaDeCrXBfSoNzjGkx0k5WaeGzr5/iDWie78CpDS+dDr1RGR0R86Wom8VCJNG3Qii0EBKkfZrpFEz+SCQt3gfam2ccd/zAcgtq987ryyKxbiBo/D1n3YnCBdJAfYrWDiTRLYXtUJarAbZemeN+ZikKLgwZYBBDyqbQUi03rRPCJksBXFqb0WXrYif2SZBuki4PZ8oVWzL4+I0pzcoOrETE4e1RC4kj4K+OjOaUlgYGz+YqDjecsQ3BCedP9FnYMuzgXcGWzjr1z9imv6Tnq5vyg9PvIYxTWy4MO/RvBNzFuKHGNgxiFYjkeIYN/yGT+S0A4Jnj4otCOqaZRDsvoW9pV/kudCZAZiQCbg0WSg7XMjvzfrEn7vTg5JkB2YvqjctwrtCJfHLERzubvLVBAH6dDfT1Diw7Rq24Uib1diwVdn0z8jNDdu8VspSScnOPnw9TTybfqJZs1ur2hhM4f0naskmlcBT5BvxRpk/ZWemA2D0TYaAQvpbEduuXuYyb0kDvplC2tWmMgdmspJVjKNOFUv/OqYG4bSNYD+qhErZcBeytpTf1K+r1nyY1k6fq06N60faNJ2o6YV9zfSGiPwio9UO0gqSXBl3F0qgdTUl7NuCRnVY2nzgGvGwzMemzclmynkAHAI16S/yzD iO/mtqe5 t4YN2CIkksIXXu1bFlkZX7y3cZWPboHxXTNZjk649RBuiC4/CN4nxfHp18U8y4FPb7frd3UWcV7xBdvRGbqs7lAyRNGuIoOSIVc1dA1bDV3MXG0Bz0zeY4VzR5A8d7Q+9t3gwpD7H2NeKphVI0nEHJ6n38+5yksPHdq2nsViEvEVu95+LnaEfSUtAZ4JOm5A6vjV6qiUwBivAsy5Mp9lpHHVv4gnAQ9OKRII/ehZRsFVKdDCdk/wt6w7aQ80mvUKto1pXx0BoZ3XgVsjVpAjzjQhX69KDp2kXxbg1f064sORqVKvXEf3s/mUAIlZO8Qj8K6Bjez8hvSkNouDB+XLBlyLRlstebKwboRZJGR9/klA6GGMV2nsSjsFi5J5ESZ0stFgEhcDP25PbAEjYMP8tSKMOzO6v9Yt7guUFWBWGeHa8kfs= 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 Thu, Dec 07, 2023 at 09:44:33PM +0300, Alexey Dobriyan wrote: > Report available page shifts in arch independent manner, so that > userspace developers won't have to parse /proc/cpuinfo hunting > for arch specific strings. > > Main users are supposed to be libhugetlbfs-like libraries which try > to abstract huge mappings across multiple architectures. Regular code > which queries hugepage support before using them benefits too because > it doesn't have to deal with descriptors and parsing sysfs hierarchies > while enjoying the simplicity and speed of getauxval(AT_PAGE_SHIFT_MASK). > > Note! > > This is strictly for userspace, if some page size is shutdown due > to kernel command line option or CPU bug workaround, than it must > not be reported in aux vector! > > x86_64 machine with 1 GiB pages: > > 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 00 10 20 40 00 00 00 00 > > x86_64 machine with 2 MiB pages only: > > 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 00 10 20 00 00 00 00 00 > > AT_PAGESZ always reports one smallest page size which is not interesting. > > Signed-off-by: Alexey Dobriyan > --- > > v3: better comment and changelog > v2: switch to page shifts, rename to ARCH_AT_PAGE_SHIFT_MASK > > arch/x86/include/asm/elf.h | 12 ++++++++++++ > fs/binfmt_elf.c | 3 +++ > include/uapi/linux/auxvec.h | 13 +++++++++++++ > 3 files changed, 28 insertions(+) > > --- a/arch/x86/include/asm/elf.h > +++ b/arch/x86/include/asm/elf.h > @@ -358,6 +358,18 @@ else if (IS_ENABLED(CONFIG_IA32_EMULATION)) \ > > #define COMPAT_ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) > > +#define ARCH_AT_PAGE_SHIFT_MASK \ > + do { \ > + u32 val = 1 << 12; \ > + if (boot_cpu_has(X86_FEATURE_PSE)) { \ > + val |= 1 << 21; \ > + } \ > + if (boot_cpu_has(X86_FEATURE_GBPAGES)) { \ > + val |= 1 << 30; \ > + } \ > + NEW_AUX_ENT(AT_PAGE_SHIFT_MASK, val); \ > + } while (0) > + > #endif /* !CONFIG_X86_32 */ > > #define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso) If I can get an Ack from x86 maintainers for this, I can carry it in my execve tree. Thanks for the updates to the commit log and comments, it reads better now. -Kees > --- 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_MASK > + ARCH_AT_PAGE_SHIFT_MASK; > +#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,19 @@ > #define AT_RSEQ_FEATURE_SIZE 27 /* rseq supported feature size */ > #define AT_RSEQ_ALIGN 28 /* rseq allocation alignment */ > > +/* > + * All page sizes supported by CPU encoded as bitmask. > + * > + * Example: x86_64 system with pse, pdpe1gb /proc/cpuinfo flags > + * reports 4 KiB, 2 MiB and 1 GiB page support. > + * > + * $ LD_SHOW_AUXV=1 $(which true) | grep -e AT_PAGE_SHIFT_MASK > + * AT_PAGE_SHIFT_MASK: 0x40201000 > + * > + * For 2^64 hugepage support please contact your Universe sales representative. > + */ > +#define AT_PAGE_SHIFT_MASK 29 > + > #define AT_EXECFN 31 /* filename of program */ > > #ifndef AT_MINSIGSTKSZ -- Kees Cook