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 157E5D3C916 for ; Sat, 19 Oct 2024 14:16:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C3806B0082; Sat, 19 Oct 2024 10:16:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 273F06B0083; Sat, 19 Oct 2024 10:16:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13CAC6B0085; Sat, 19 Oct 2024 10:16:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EA6906B0082 for ; Sat, 19 Oct 2024 10:16:51 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F0CBB80BD3 for ; Sat, 19 Oct 2024 14:16:39 +0000 (UTC) X-FDA: 82690552602.26.4CA4B68 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by imf08.hostedemail.com (Postfix) with ESMTP id A9F98160007 for ; Sat, 19 Oct 2024 14:16:40 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=weissschuh.net header.s=mail header.b=oiEWqF7s; spf=pass (imf08.hostedemail.com: domain of linux@weissschuh.net designates 159.69.126.157 as permitted sender) smtp.mailfrom=linux@weissschuh.net; dmarc=pass (policy=quarantine) header.from=weissschuh.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729347335; 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=PrfF3CPPbMG/3gAPLgXEngyxKOQs3XlSoLgXECXn8zc=; b=DjeQ1QxbPkSeLl2sqqk4ZDROd7jVo8VTBJi1SxUtPRZDOu5z8oig4ona26L0GGABXfj5vg KtKs/HApykGT1fk01C0XMioHcQ8jZHswVEESzDCiOtBVewizSg/SesFY4VcHN8gbQ1zh0J mHS/0Uns6kTdXXqWiH46758yOxXFRf0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=weissschuh.net header.s=mail header.b=oiEWqF7s; spf=pass (imf08.hostedemail.com: domain of linux@weissschuh.net designates 159.69.126.157 as permitted sender) smtp.mailfrom=linux@weissschuh.net; dmarc=pass (policy=quarantine) header.from=weissschuh.net ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729347335; a=rsa-sha256; cv=none; b=dbh/QwXF5zZ3CqkWq2FuGLpH9WSSAYDebZUbmREVcGN5N+PzQ8QPWZysQwMMvqi8zbdaXt z9cSeu5ISc6R9uHc5HNIIk7eHPQYLbDu0YPqfJysb86dX1vndQLy4jD6patOFntlx5c6gS d9tyzMIy454fSTSVvuvapfDkEj3bBaw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1729347405; bh=qfeFyKWSeWg05vNifWelioEjA0kkQ+RAGToocF3RQXU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=oiEWqF7sTLXrz7do2I45MU3h9GnxoASkakIBLXLfO8QPbyFcjud2WS7a4OHr+O/j6 mSZXAZ+gLrbHF+5i8CqYp+heOCBk0HRmg9xEfocwgikxIkEKz10dFDgcvhPeShqBpA GBeauy9gbC60noyWg48dH5RYqqm+DI5v5PyxTYX4= Date: Sat, 19 Oct 2024 14:16:42 +0000 From: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= To: Ryan Roberts Cc: Andrew Morton , Anshuman Khandual , Ard Biesheuvel , Catalin Marinas , David Hildenbrand , Greg Marsden , Ivan Ivanov , Kalesh Singh , Marc Zyngier , Mark Rutland , Matthias Brugger , Miroslav Benes , Oliver Upton , Will Deacon , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [RFC PATCH v1 44/57] arm64: Align sections to PAGE_SIZE_MAX Message-ID: <69533deb-dc77-49c3-a256-49efee308905@t-8ch.de> References: <20241014105514.3206191-1-ryan.roberts@arm.com> <20241014105912.3207374-1-ryan.roberts@arm.com> <20241014105912.3207374-44-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241014105912.3207374-44-ryan.roberts@arm.com> X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: A9F98160007 X-Stat-Signature: anuxeprt9tm9jifpxhjxtbcf8mkgaxu5 X-HE-Tag: 1729347400-228720 X-HE-Meta: U2FsdGVkX1/gotn43kPIhSVUy5wF63qgoezjgvPEP4znNKq1/X9KucA5BJgsVxJL7KN/IVPjtygcoKdw6LzVitcR7OLcfVydZSHQTKFSXKSgt3WOJ8uc4KR+6/oVKWZwc72gXx+beDw/veHgXYJqK+5U0ulayTaKkWD2yTQlQXd3Pz1t1CKrfN0dfTY1/+QDj54sS3fT39b/m7kHpbccjBFkxfJYdu5NJDhX/SgGXJPSrhyuKxGoc1yCDQsznl63O+UWxGmRIKMwW3yKQY/vwHSDirLbxHYjHzn0QsXTFoVqAitDNBzRUA9kksXlPML3dywKhfYJv1A4hHW7F4lUHg/YpGmXfchyDSNxJIqqQ/z5hRwOB0tWAJK9Mbln747JDWyUaH+lF90IGd7oZo8jx8OEyLvnpb4eEzULT66C32P6OkyBo80CMdz0jIO0/xNTXpOUR8QaKm+oS4mtpkJFdxLidYIs9OlzrAyaXf3wQOmURlOWNDGByQkVTZJXrtbg6nLQO7x49CwaFAR3KgqVFuaNbgwpMzEd0ixH9aNgxny1Z+owTG1qPqTXitfzcfyjbaEbv6IRRfZ1BvUh8BmPGn8xfdwcPRpwx/EKrTx04I5TujHsYykol/EpBPdPH3xeTgNUPc1zmn7kbHs5AB5T3Lag0ZzbPRLo7NV1MNxhNMY78GS5pAxanyHaapWeoVEY70Z45vcs5sJN8o/CcytETLKcMTfDE94G/DgiTYwKrd9kSBPpPVoAskwQggJc+QMEMrkfQqTOqcdOOSDwugPbSzeviLddMRSI9ta5vtt8LI/dCKFRyZeccHDtYXwKC9MbFRRsJSq/YzMYbQr9atrgERMP5DE8BQopZraMJC9u8ZwvXKyisLm3Ejy+HIYeYl7Jd26zKpMzHvYLOSiWC7z2zeMsvfDgyk3ySSEUJhUtNEdmMrQkpc5TYa9s3u9Z7G0b+2qLRhSro9tZeHcs1ye c4GypVKD 5FQudhW5EsTmN+YlL+Bwxz6BsJ8PR2BSz76FUeEKf3MPBYcAVMiFMYmcur5v98NH+oHZf+8DLY/HxKU3Xgw5qQelKXB+Utf+JX+B8zsjjb5NjW3cFhqGztcGqgNFkbUt7J+jv1S2zjjByJqsYvPHV9Zh4jD4x0mXxLkm0YMlUJaVKtYybMMplTi7v2Wqpx8Uo+Oy3gmeNmMCFzZpt1x1yXjUxIw2o6MOUzU0UjMo/D/JA2RiGXR/ISucebvp6gRurQKV0 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 2024-10-14 11:58:51+0100, Ryan Roberts wrote: > Increase alignment of sections in nvhe hyp, vdso and final vmlinux image > from PAGE_SIZE 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. > > For a boot-time page size build, image size is comparable to a 64K page > size compile-time build. In future, it may be desirable to optimize > run-time memory consumption by freeing unused padding pages when the > boot-time selected page size is less than PAGE_SIZE_MAX. > > 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/ > > arch/arm64/include/asm/memory.h | 4 +-- > arch/arm64/kernel/vdso-wrap.S | 4 +-- > arch/arm64/kernel/vdso.c | 7 +++--- > arch/arm64/kernel/vdso/vdso.lds.S | 4 +-- > arch/arm64/kernel/vdso32-wrap.S | 4 +-- > arch/arm64/kernel/vdso32/vdso.lds.S | 4 +-- > arch/arm64/kernel/vmlinux.lds.S | 38 ++++++++++++++--------------- > arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 2 +- > 8 files changed, 34 insertions(+), 33 deletions(-) > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > index 89b6e78400023..1efe98909a2e0 100644 > --- a/arch/arm64/kernel/vdso.c > +++ b/arch/arm64/kernel/vdso.c > @@ -195,7 +195,7 @@ static int __setup_additional_pages(enum vdso_abi abi, > > vdso_text_len = vdso_info[abi].vdso_pages << PAGE_SHIFT; > /* Be sure to map the data page */ > - vdso_mapping_len = vdso_text_len + VVAR_NR_PAGES * PAGE_SIZE; > + vdso_mapping_len = vdso_text_len + VVAR_NR_PAGES * PAGE_SIZE_MAX; > > vdso_base = get_unmapped_area(NULL, 0, vdso_mapping_len, 0, 0); > if (IS_ERR_VALUE(vdso_base)) { > @@ -203,7 +203,8 @@ static int __setup_additional_pages(enum vdso_abi abi, > goto up_fail; > } > > - ret = _install_special_mapping(mm, vdso_base, VVAR_NR_PAGES * PAGE_SIZE, > + ret = _install_special_mapping(mm, vdso_base, > + VVAR_NR_PAGES * PAGE_SIZE_MAX, > VM_READ|VM_MAYREAD|VM_PFNMAP, > vdso_info[abi].dm); > if (IS_ERR(ret)) > @@ -212,7 +213,7 @@ static int __setup_additional_pages(enum vdso_abi abi, > if (system_supports_bti_kernel()) > gp_flags = VM_ARM64_BTI; > > - vdso_base += VVAR_NR_PAGES * PAGE_SIZE; > + vdso_base += VVAR_NR_PAGES * PAGE_SIZE_MAX; > mm->context.vdso = (void *)vdso_base; > ret = _install_special_mapping(mm, vdso_base, vdso_text_len, > VM_READ|VM_EXEC|gp_flags| > diff --git a/arch/arm64/kernel/vdso/vdso.lds.S b/arch/arm64/kernel/vdso/vdso.lds.S > index 45354f2ddf706..f7d1537a689e8 100644 > --- a/arch/arm64/kernel/vdso/vdso.lds.S > +++ b/arch/arm64/kernel/vdso/vdso.lds.S > @@ -18,9 +18,9 @@ OUTPUT_ARCH(aarch64) > > SECTIONS > { > - PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); > + PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE_MAX); > #ifdef CONFIG_TIME_NS > - PROVIDE(_timens_data = _vdso_data + PAGE_SIZE); > + PROVIDE(_timens_data = _vdso_data + PAGE_SIZE_MAX); This looks like it also needs a change to vvar_fault() in vdso.c. The symbols are now always PAGE_SIZE_MAX apart, while vvar_fault() works in page offsets (vmf->pgoff) that are based on the runtime PAGE_SIZE and it expects hardcoded offsets. As test you can use tools/testing/selftests/timens/timens. (I can't test this right now, so it's only a suspicion) > #endif > . = VDSO_LBASE + SIZEOF_HEADERS; > diff --git a/arch/arm64/kernel/vdso32/vdso.lds.S b/arch/arm64/kernel/vdso32/vdso.lds.S > index 8d95d7d35057d..c46d18a69d1ce 100644 > --- a/arch/arm64/kernel/vdso32/vdso.lds.S > +++ b/arch/arm64/kernel/vdso32/vdso.lds.S > @@ -18,9 +18,9 @@ OUTPUT_ARCH(arm) > > SECTIONS > { > - PROVIDE_HIDDEN(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE); > + PROVIDE_HIDDEN(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE_MAX); > #ifdef CONFIG_TIME_NS > - PROVIDE_HIDDEN(_timens_data = _vdso_data + PAGE_SIZE); > + PROVIDE_HIDDEN(_timens_data = _vdso_data + PAGE_SIZE_MAX); > #endif > . = VDSO_LBASE + SIZEOF_HEADERS;