From patchwork Mon Oct 14 10:58:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13834670 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 369C8D1A43B for ; Mon, 14 Oct 2024 10:59:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0D6A6B0088; Mon, 14 Oct 2024 06:59:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B970E6B0089; Mon, 14 Oct 2024 06:59:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5D5A6B008A; Mon, 14 Oct 2024 06:59:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8AF136B0088 for ; Mon, 14 Oct 2024 06:59:35 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2B0EF120D1F for ; Mon, 14 Oct 2024 10:59:28 +0000 (UTC) X-FDA: 82671911742.23.D05B948 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf12.hostedemail.com (Postfix) with ESMTP id 4E3A440012 for ; Mon, 14 Oct 2024 10:59:30 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf12.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728903458; a=rsa-sha256; cv=none; b=sJkN/Aq5obejdtif+pRwv/Be0BtzDuhtKCLaOVKaJQNPHXYFxl3SQs1VX0Tao3xX2QfQop YO1NUccpvOGYiv3P9raWB0F5qeQiSnD3TUN6vL2n+F+z0vGeJXm6D8xDz1R0DGmvCyY1Yt kBeJnXMUUxnQRtx0GH41O6ECaLUwa70= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf12.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728903458; 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; bh=O6/Jx7UMSGM5GsZJBCvRZxEmHJTJyTPnGhAVFa7W4Fs=; b=fHa6CcQcO73f81xufrfq2PY3oqwmbGArikLWTx31gII7Dh6cXEdpBuii93inXQTaxbUqK7 ZoPz9VK1jBZqNqe9k1+/F8AsNw2BjB55BcfYzRHQHY0mgjYHjNv+aWpMYhJuVRTdFX83pJ 1ZgJP512Af/nl+fbO0ZZteLy0ndTDtE= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 443921684; Mon, 14 Oct 2024 04:00:02 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9E5CD3F51B; Mon, 14 Oct 2024 03:59:29 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Arnd Bergmann , Catalin Marinas , Christoph Lameter , David Hildenbrand , Dennis Zhou , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Tejun Heo , Will Deacon Cc: Ryan Roberts , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v1 02/57] vmlinux: Align to PAGE_SIZE_MAX Date: Mon, 14 Oct 2024 11:58:09 +0100 Message-ID: <20241014105912.3207374-2-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014105912.3207374-1-ryan.roberts@arm.com> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 4E3A440012 X-Stat-Signature: tbc5uxduqczthkrh6168ybmgtrpbwh8i X-Rspam-User: X-HE-Tag: 1728903570-714041 X-HE-Meta: U2FsdGVkX18HaFFsc+OlNNGf38w29spNKG87c79LiCIjrVCT3pQDfV54rk+oVQ6SkEWjVI4AzQWpHR/HwnFz/1s6YiYq4UvJ8UOJxOgI2ey2xFB2AawSyRq17z2UtXVEjkO7ZHaildLp97MBWxU3K17Luh9s0HniMclnrqhN2THyRUyIl7dUxSreMPPL0YpXCPhZ/fi2fX2RqtH0gQMa6CB+eN9xmTfGyCHdKbB6zLzgMQae5WVbLubAl4EfVY1odLyYE5W0EycziZNCWMsWIdaJyzDkWyxG7hsirzwgjYj2cwqfLhLo/on1z3XFuKTVodK9InPycZAx8KmJQ3K6hpdlJUZysnbdhcv7P3hACQmq1LruR9rDqMtwSlj8U0JLyQytyYwev29RAJ9jF2OeS/B1yfY9sfo3fwZhgkNw7eocwmhpvvXe38MzBfxoIcO5RYXC2sNrTDLVaCF59atO669Z/XXkux936hkohh8EaYB7GkiRoAlpCbOnuU+FwhmAx1LP6D86hA118e/Qt58LzuYpGYOC9mFsdMCFaf81UFvsaB/Ut3Yo1G9dJ8UrA5IA0My+iabbrfq6RZR05LODK2BUEvGd6+8s0wzsYl6pTHI/fNu0FUmw+SR3BDarJyzL4XsRPs+Z7RKCJDTBT6pcE2R2w/Uiwcr3l1YlapEtZkcvEnTI+Ziton0ki8yWwomACtLjAi+KPOV1RVGGtS17BO1wXay5EFiaUQoKBZK/AmA0WbjaWzgYPmoenJ4Ve2wE74ZzbbKOUjLWC5atz3C65iQHdB+uDKnFyy7SyGay8f65hTvfnO5EDcrAL9Eg/lgAtxBvLSU1Si7RJODsHqW0+WHUT93h9y2Qq4tuxGCzleJN3Z1q6ek55Ku5VTjKa32NUbEHINyiJsrJ4RBXVoSNzy0mWq2GXi+M7BMjQgS8+tTaN79iZ1BDAUV/G1G5XiehtAZursu0sd/crvLH/KE SbznX4j2 8a/p4MTOo5XumoTYYGgKPrshHrrp0c6wYJC9jvqQN88xeZKs1ov8AmVBK0T45VglLjuKnaHnnehIe1XFGTqzzxIIG5oVkU6LO/LUM4WMVizIuMgTVzvSukQ5s5SsJHzpnejjL+KgWKluceyclJRD+dLhh73nANiYQ1qJZq077V5EqnlXCEIrKLFxyYqjP+QaORms09OnegsVK5k9a3DdyVCm/yWfPsY/c67U1 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: Increase alignment of structures requiring at least PAGE_SIZE alignment to PAGE_SIZE_MAX. For compile-time PAGE_SIZE, PAGE_SIZE_MAX == PAGE_SIZE so there is no change. For boot-time PAGE_SIZE, PAGE_SIZE_MAX is the largest selectable page size. Signed-off-by: Ryan Roberts --- ***NOTE*** Any confused maintainers may want to read the cover note here for context: https://lore.kernel.org/all/20241014105514.3206191-1-ryan.roberts@arm.com/ include/asm-generic/vmlinux.lds.h | 32 +++++++++++++++---------------- include/linux/linkage.h | 4 ++-- include/linux/percpu-defs.h | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 1ae44793132a8..5727f883001bb 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -13,7 +13,7 @@ * . = START; * __init_begin = .; * HEAD_TEXT_SECTION - * INIT_TEXT_SECTION(PAGE_SIZE) + * INIT_TEXT_SECTION(PAGE_SIZE_MAX) * INIT_DATA_SECTION(...) * PERCPU_SECTION(CACHELINE_SIZE) * __init_end = .; @@ -23,7 +23,7 @@ * _etext = .; * * _sdata = .; - * RO_DATA(PAGE_SIZE) + * RO_DATA(PAGE_SIZE_MAX) * RW_DATA(...) * _edata = .; * @@ -371,10 +371,10 @@ * Data section helpers */ #define NOSAVE_DATA \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ __nosave_begin = .; \ *(.data..nosave) \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ __nosave_end = .; #define PAGE_ALIGNED_DATA(page_align) \ @@ -733,9 +733,9 @@ . = ALIGN(bss_align); \ .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ BSS_FIRST_SECTIONS \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ *(.bss..page_aligned) \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ *(.dynbss) \ *(BSS_MAIN) \ *(COMMON) \ @@ -950,9 +950,9 @@ */ #ifdef CONFIG_AMD_MEM_ENCRYPT #define PERCPU_DECRYPTED_SECTION \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ *(.data..percpu..decrypted) \ - . = ALIGN(PAGE_SIZE); + . = ALIGN(PAGE_SIZE_MAX); #else #define PERCPU_DECRYPTED_SECTION #endif @@ -1030,7 +1030,7 @@ #define PERCPU_INPUT(cacheline) \ __per_cpu_start = .; \ *(.data..percpu..first) \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ *(.data..percpu..page_aligned) \ . = ALIGN(cacheline); \ *(.data..percpu..read_mostly) \ @@ -1075,16 +1075,16 @@ * PERCPU_SECTION - define output section for percpu area, simple version * @cacheline: cacheline size * - * Align to PAGE_SIZE and outputs output section for percpu area. This + * Align to PAGE_SIZE_MAX and outputs output section for percpu area. This * macro doesn't manipulate @vaddr or @phdr and __per_cpu_load and * __per_cpu_start will be identical. * - * This macro is equivalent to ALIGN(PAGE_SIZE); PERCPU_VADDR(@cacheline,,) + * This macro is equivalent to ALIGN(PAGE_SIZE_MAX); PERCPU_VADDR(@cacheline,,) * except that __per_cpu_load is defined as a relative symbol against * .data..percpu which is required for relocatable x86_32 configuration. */ #define PERCPU_SECTION(cacheline) \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \ __per_cpu_load = .; \ PERCPU_INPUT(cacheline) \ @@ -1102,15 +1102,15 @@ * All sections are combined in a single .data section. * The sections following CONSTRUCTORS are arranged so their * typical alignment matches. - * A cacheline is typical/always less than a PAGE_SIZE so + * A cacheline is typical/always less than a PAGE_SIZE_MAX so * the sections that has this restriction (or similar) - * is located before the ones requiring PAGE_SIZE alignment. - * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which + * is located before the ones requiring PAGE_SIZE_MAX alignment. + * NOSAVE_DATA starts and ends with a PAGE_SIZE_MAX alignment which * matches the requirement of PAGE_ALIGNED_DATA. * * use 0 as page_align if page_aligned data is not used */ #define RW_DATA(cacheline, pagealigned, inittask) \ - . = ALIGN(PAGE_SIZE); \ + . = ALIGN(PAGE_SIZE_MAX); \ .data : AT(ADDR(.data) - LOAD_OFFSET) { \ INIT_TASK_DATA(inittask) \ NOSAVE_DATA \ diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 5c8865bb59d91..68aa9775fce51 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -36,8 +36,8 @@ __stringify(name)) #endif -#define __page_aligned_data __section(".data..page_aligned") __aligned(PAGE_SIZE) -#define __page_aligned_bss __section(".bss..page_aligned") __aligned(PAGE_SIZE) +#define __page_aligned_data __section(".data..page_aligned") __aligned(PAGE_SIZE_MAX) +#define __page_aligned_bss __section(".bss..page_aligned") __aligned(PAGE_SIZE_MAX) /* * For assembly routines. diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 8efce7414fad6..89c7f430015ba 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -156,11 +156,11 @@ */ #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \ - __aligned(PAGE_SIZE) + __aligned(PAGE_SIZE_MAX) #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \ - __aligned(PAGE_SIZE) + __aligned(PAGE_SIZE_MAX) /* * Declaration/definition used for per-CPU variables that must be read mostly.