From patchwork Thu Mar 6 18:51:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 14005197 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 067BDC282D1 for ; Thu, 6 Mar 2025 18:53:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20B6D280014; Thu, 6 Mar 2025 13:53:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E241280011; Thu, 6 Mar 2025 13:53:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 086E5280014; Thu, 6 Mar 2025 13:53:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DD2D8280011 for ; Thu, 6 Mar 2025 13:53:32 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E8C941CE1E4 for ; Thu, 6 Mar 2025 18:53:32 +0000 (UTC) X-FDA: 83192024664.11.1C10899 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf29.hostedemail.com (Postfix) with ESMTP id 5D09112000A for ; Thu, 6 Mar 2025 18:53:31 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ACHI6rfL; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741287211; 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:dkim-signature; bh=EqEJoM4rgtKrOS/V5SDQTOhmiMYuUlj1yWrv5iY9ngQ=; b=ikgy6A0fzmDkDqpUoGHOil/63C5LolafFUIrMw3dcDsMsvJXZ7lEz7UY0YoEn8oovMsDuB lBPUb0yxLcEZsApwPPbck/O9+GpdTnTF2i2wyZDkbLshSWaRGyIF+hU7/ar89lQLVNARrM wyRX+nrsrtCjAW/Vv/VLaWtjGZ5PL5A= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ACHI6rfL; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741287211; a=rsa-sha256; cv=none; b=bza0Iiyu9rdqaKCewGkakLQ5UnCDnv7Hj/jmtYs8rlfjBH099cjdmhjfOIYpT+hogkNN3j EbdP2IFEwqt5OCSbrgYd82svLg9u4ayXOVi4UL4+5IZjyWdVs8WjncaUJhssZjGjvWa3S+ WhU2jNJMeBScf59iywvo+eiz81skrgY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 02A25A44F0F; Thu, 6 Mar 2025 18:48:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2766C4CEE4; Thu, 6 Mar 2025 18:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741287210; bh=Af9gKlZIDExjo3NK0sfX49tiYlvs18loCfa3z4qCS4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ACHI6rfL1CccB57sU6MHDnuoRg3jMkyFyeeJlXxk8uRHYT/lbOYh1q5kA3v8+SoBx /rcC9SXjhDCUt02EMaLZCrUKfOk4h0oLxAT+jnDZad4CATtsjvmD8EjF6oqwbdQeEY lec4vL01J8O4/qZP9ogTuxjIICQ/nPBl4pvJ44MoLU18PCfW1pW/JGbUMlIRkJlmQt 6fBGVqdQnog5dPeP0hV9MmrP+bGVIxIvFvQUgN6hZKnvRwCNYzS1uButYr6dHJ9Qv2 LukeOxx9dFnYJScdzXYrIbXP+iFHUqdhlT2i8EDd+xbfsULozwofW4yz7qQY5SvlsQ dE7dgY38/JZiw== From: Mike Rapoport To: Andrew Morton Cc: Alexander Gordeev , Andreas Larsson , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Dave Hansen , "David S. Miller" , Dinh Nguyen , Geert Uytterhoeven , Gerald Schaefer , Guo Ren , Heiko Carstens , Helge Deller , Huacai Chen , Ingo Molnar , Jiaxun Yang , Johannes Berg , John Paul Adrian Glaubitz , Madhavan Srinivasan , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Stafford Horne , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Vineet Gupta , Will Deacon , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH 08/13] xtensa: split out printing of virtual memory layout to a function Date: Thu, 6 Mar 2025 20:51:18 +0200 Message-ID: <20250306185124.3147510-9-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250306185124.3147510-1-rppt@kernel.org> References: <20250306185124.3147510-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: inky118jmd9uadro1dxe6s15uqt5zz6k X-Rspamd-Queue-Id: 5D09112000A X-Rspamd-Server: rspam07 X-HE-Tag: 1741287211-785539 X-HE-Meta: U2FsdGVkX18WRgcaY33wy8lFnkNU7b5K81IGKDfcCo7vb9IYeTGDaXlBneZM18O/9dsnAoji21LIEMEOO6MRkpCY2kbj720r8cw6jjhc/1xiEMid+phLdgAz+S6cCQ8yCPhk+e/YDGsof0CuIhUQS08ZW/o8J47DEA3cVYZRp/zb/NJwh9XVezCDFkGwffAdSH0p3vTuzXeiI9JeHo9Y+uaaLSGh6DjRi6lqo2JvlumJRrdxZW8qdlCThBeUhS/z28jhr6tQE10tl73fl/I727zO6fxwuA3z5w091IQ6hGmdtYXsJA89qZZ+RSUp8DXY6CWSMRw6eLvwvmq1XBfyHvXnCU8b7h/aH6YPgu8n4jrE5cviYv3OPRYbt3aspGpzQQckG+TKZZNCSxSoC9/+L6sTEdgm8KY8Lgc04t4j/MoeEvRO6znkmmMghiw+TtkimTRvW48BdPALOGyfjyCxOHKyP8YMCPC2eQw/++SewzMlS0amWnyU4Mxdy54FALggR5yVlWjyhUwvSBRHLoe2ERtO+tLy1MDTRZHRI+kS9Gg7zHFJHpW5WzacFQtiQV3t58uC+fEAqwI/gMY3o4LG3ciYSdUUKtjIY20cCpKkR2wH9TvVyVQ/9wIx8HFHFh8gPknh0XNQO39tKQdVAS/YqExXZinzNOJianQ+BT1dmebB9YfTP2e8k+blXna81ykl2PxnpVVilmV25M7azNwRWPAC3q8wycQfSIJyVw/lj0DvQztMTQe8ixNC1gpVQMmPB8SAKJ4esxi5DZX3NeLf4YGOjuhHKttoBF8M4ECYz2EtDOU5dSdQOlgxgntb0HN15gsO3hmtD9Z15Lyw9OYKYpBhDjxT2HZ7CwTJRIGKHec1T40ZV6ta72utrabxu99qUaXfREoXvIvxPh9+oGxQTgkiV0CEXjtXfuPwVcEWQornTzroMpvsuXGStsSHtm9NynKTX7r1e296PT+xiJa ygYlqpZi Kpe13pyTXZ50Na825DCzeuVRmOHmjsz6jGNmBYfJgs5e4XVDm3KaxPSaolM1pybmuyuOvxQrxWRuv845AH5+boSsFNn70mj2nWbBKReQVL7+4zusFhNspf1Cr8neDhjq9j5MXuLQPx+2dQRXxLLGbAa+TAcXlU2YyZZTkFcuaObcp4GGJJpFpcbmeQBqaA106SnLCX7Hq+VXgQafQWRlobRva6e2Rkhsht5uG4Ih/hxi4SiQ= 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: From: "Mike Rapoport (Microsoft)" This will help with pulling out memblock_free_all() to the generic code and reducing code duplication in arch::mem_init(). Signed-off-by: Mike Rapoport (Microsoft) --- arch/xtensa/mm/init.c | 97 ++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index b2587a1a7c46..01577d33e602 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c @@ -66,6 +66,55 @@ void __init bootmem_init(void) memblock_dump_all(); } +static void __init print_vm_layout(void) +{ + pr_info("virtual kernel memory layout:\n" +#ifdef CONFIG_KASAN + " kasan : 0x%08lx - 0x%08lx (%5lu MB)\n" +#endif +#ifdef CONFIG_MMU + " vmalloc : 0x%08lx - 0x%08lx (%5lu MB)\n" +#endif +#ifdef CONFIG_HIGHMEM + " pkmap : 0x%08lx - 0x%08lx (%5lu kB)\n" + " fixmap : 0x%08lx - 0x%08lx (%5lu kB)\n" +#endif + " lowmem : 0x%08lx - 0x%08lx (%5lu MB)\n" + " .text : 0x%08lx - 0x%08lx (%5lu kB)\n" + " .rodata : 0x%08lx - 0x%08lx (%5lu kB)\n" + " .data : 0x%08lx - 0x%08lx (%5lu kB)\n" + " .init : 0x%08lx - 0x%08lx (%5lu kB)\n" + " .bss : 0x%08lx - 0x%08lx (%5lu kB)\n", +#ifdef CONFIG_KASAN + KASAN_SHADOW_START, KASAN_SHADOW_START + KASAN_SHADOW_SIZE, + KASAN_SHADOW_SIZE >> 20, +#endif +#ifdef CONFIG_MMU + VMALLOC_START, VMALLOC_END, + (VMALLOC_END - VMALLOC_START) >> 20, +#ifdef CONFIG_HIGHMEM + PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE, + (LAST_PKMAP*PAGE_SIZE) >> 10, + FIXADDR_START, FIXADDR_END, + (FIXADDR_END - FIXADDR_START) >> 10, +#endif + PAGE_OFFSET, PAGE_OFFSET + + (max_low_pfn - min_low_pfn) * PAGE_SIZE, +#else + min_low_pfn * PAGE_SIZE, max_low_pfn * PAGE_SIZE, +#endif + ((max_low_pfn - min_low_pfn) * PAGE_SIZE) >> 20, + (unsigned long)_text, (unsigned long)_etext, + (unsigned long)(_etext - _text) >> 10, + (unsigned long)__start_rodata, (unsigned long)__end_rodata, + (unsigned long)(__end_rodata - __start_rodata) >> 10, + (unsigned long)_sdata, (unsigned long)_edata, + (unsigned long)(_edata - _sdata) >> 10, + (unsigned long)__init_begin, (unsigned long)__init_end, + (unsigned long)(__init_end - __init_begin) >> 10, + (unsigned long)__bss_start, (unsigned long)__bss_stop, + (unsigned long)(__bss_stop - __bss_start) >> 10); +} void __init zones_init(void) { @@ -77,6 +126,7 @@ void __init zones_init(void) #endif }; free_area_init(max_zone_pfn); + print_vm_layout(); } static void __init free_highpages(void) @@ -118,53 +168,6 @@ void __init mem_init(void) high_memory = (void *)__va(max_low_pfn << PAGE_SHIFT); memblock_free_all(); - - pr_info("virtual kernel memory layout:\n" -#ifdef CONFIG_KASAN - " kasan : 0x%08lx - 0x%08lx (%5lu MB)\n" -#endif -#ifdef CONFIG_MMU - " vmalloc : 0x%08lx - 0x%08lx (%5lu MB)\n" -#endif -#ifdef CONFIG_HIGHMEM - " pkmap : 0x%08lx - 0x%08lx (%5lu kB)\n" - " fixmap : 0x%08lx - 0x%08lx (%5lu kB)\n" -#endif - " lowmem : 0x%08lx - 0x%08lx (%5lu MB)\n" - " .text : 0x%08lx - 0x%08lx (%5lu kB)\n" - " .rodata : 0x%08lx - 0x%08lx (%5lu kB)\n" - " .data : 0x%08lx - 0x%08lx (%5lu kB)\n" - " .init : 0x%08lx - 0x%08lx (%5lu kB)\n" - " .bss : 0x%08lx - 0x%08lx (%5lu kB)\n", -#ifdef CONFIG_KASAN - KASAN_SHADOW_START, KASAN_SHADOW_START + KASAN_SHADOW_SIZE, - KASAN_SHADOW_SIZE >> 20, -#endif -#ifdef CONFIG_MMU - VMALLOC_START, VMALLOC_END, - (VMALLOC_END - VMALLOC_START) >> 20, -#ifdef CONFIG_HIGHMEM - PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE, - (LAST_PKMAP*PAGE_SIZE) >> 10, - FIXADDR_START, FIXADDR_END, - (FIXADDR_END - FIXADDR_START) >> 10, -#endif - PAGE_OFFSET, PAGE_OFFSET + - (max_low_pfn - min_low_pfn) * PAGE_SIZE, -#else - min_low_pfn * PAGE_SIZE, max_low_pfn * PAGE_SIZE, -#endif - ((max_low_pfn - min_low_pfn) * PAGE_SIZE) >> 20, - (unsigned long)_text, (unsigned long)_etext, - (unsigned long)(_etext - _text) >> 10, - (unsigned long)__start_rodata, (unsigned long)__end_rodata, - (unsigned long)(__end_rodata - __start_rodata) >> 10, - (unsigned long)_sdata, (unsigned long)_edata, - (unsigned long)(_edata - _sdata) >> 10, - (unsigned long)__init_begin, (unsigned long)__init_end, - (unsigned long)(__init_end - __init_begin) >> 10, - (unsigned long)__bss_start, (unsigned long)__bss_stop, - (unsigned long)(__bss_stop - __bss_start) >> 10); } static void __init parse_memmap_one(char *p)