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 3DDEFC282DE for ; Thu, 13 Mar 2025 13:52:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E0A628000E; Thu, 13 Mar 2025 09:52:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46726280008; Thu, 13 Mar 2025 09:52:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C04D28000E; Thu, 13 Mar 2025 09:52:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F0D6C280008 for ; Thu, 13 Mar 2025 09:52:10 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 12A6F1CD579 for ; Thu, 13 Mar 2025 13:52:13 +0000 (UTC) X-FDA: 83216666946.27.047B255 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 64C1618000A for ; Thu, 13 Mar 2025 13:52:11 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HkCN8WEi; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 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=1741873931; 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=ptaAJRZuUbt476QU+Mt6NK6+Sce7hg3Ej72EMlTW2mE5dhAlVopnLND/0QLT6OgurDDcPD Z3OUTNk+5GnhrS8zs5qYodwRWLX71IDxe2DT4JfbyMZ4oX99//Otpk9b8EuEJpgICRnfLI RzDzjgEvzhJ03acm9rucWS9szdT4qvc= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HkCN8WEi; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 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=1741873931; a=rsa-sha256; cv=none; b=N5UUdmIz+r9b5AF5e093HgXzlBklAz30pL9T866aElhIDp3uxoUEqkwtdXMIibyX9m0yQo C9+xonJkSxyclmPpv72hB+X9bUeSNSNb4RwXSUYG+C5q8h8VQzBqEtNWm7XWUnGU7eJyGj NNbKP1x30maOhOa9BZwJbl4l7GOsX84= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AEE665C4862; Thu, 13 Mar 2025 13:49:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47360C4CEEA; Thu, 13 Mar 2025 13:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873930; bh=Af9gKlZIDExjo3NK0sfX49tiYlvs18loCfa3z4qCS4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HkCN8WEiZBDjOoNXkOEhfAhooerV5dkF2AGCJWQINBT3fsaxpVBZFUOQ//qEwjrlr 2bPNOWsGN1jhMAGqtWghdbP/jbKVpjyzoCccZNeP956MHM+FvQnV9vxHUVxRi1f57Z Cy2YUjxboCWMf8Ik4jDKpmCaERo0psIxJMx1djt5KJO5hJIfLq+Tx6yluPloxucc9B 6OYJdeY4IAXQhLphwpYrBpClaEiHNJqeML3xePGY/xtE3X+oYEZbMNo1hpUyjyziIo HNC9zwJ99nOKR2UIM2I44zSMPyeB7SMX8Wiy499daNzgPSdZFBmii2RnjlN8BaRWiJ bOL4XjeNb0D3Q== From: Mike Rapoport To: Andrew Morton Cc: Alexander Gordeev , Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , 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 , Mark Brown , 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 v2 08/13] xtensa: split out printing of virtual memory layout to a function Date: Thu, 13 Mar 2025 15:49:58 +0200 Message-ID: <20250313135003.836600-9-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250313135003.836600-1-rppt@kernel.org> References: <20250313135003.836600-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 8dz49am87x363mm6hnzf48utyj6s5amj X-Rspamd-Queue-Id: 64C1618000A X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741873931-514265 X-HE-Meta: U2FsdGVkX19c3uwU4JDmv4yij7akN4MyOPPFvGWoVEtH+cZ6fPGDavXP5HDIkMYlmLWE4FbfNP45sEn5SfxkM1bKIX97EU3grjl1r17dTGzJWh3F5eTk7Qkonax00gGMUBs5ACHCAfcnYD329WaNF3eRLpDHwUp6NBjaQoFht2MGVINr0GPPyjqXaIUSBsytRtoUVm7ZEHUAjREgNSEltn2pHSZKNxDmQ3p0w5zVBMx858ff1O3Iuw8vTdjOEPD+0Uz/SryBqt0Xh14bqP2FHVJLFW1ZUsRHgukpsMW4Q4dEwB6nzrZnJoDazVBbsqU5jVKZM4TZ2P22+APsfI0GRZtr1BYNxTPfMYG4q9tq63uCy2asvgVoIh0Pi0dQG5xFf1arsH518naIxys5cDvhBWBYRvsAo3kIELd1bXzPbnqw1xq/qsOpycLWc6GC7MGVYNaEEVJgtHFVqAnZAONhiYCUYKz9YFTzCmITMIbsLGX75crMj4w7F8OHynUO2t3ClXyR+HEGjcJM81/SlgNW0TVf9qLQ0C7khbZ0H8xsPMQD5qO7Hzvb0zJlLYcofDn6wNwc9cmNThzGWfKB2kc8EFN2eClnA0JKOtXIyq1hOj1IwcAEtLeHlj708bSpf7posKUMch/uYa79em+cZSdZ5w/dN/yoy6DNSIoBq+R7j8Bfsu7d0hSws99RFEepQcMHk+ldGm4UsArvKiFUEoKQu6btBRQTaUtC9rI87iHYbc3L43Sa/YRGHtyVHiB5eOknr6QhSjExJk4LSXXWyDxRJQ4KkbE23lWET3k+s2yFzio+sUd4e+Beu5lMQgfSJHPZNXtW2r0pAODtVAdEX1hb1P/bAw6p1RsSxSS8NWPkC3hzUBzRVid2pYTKkBu6RmJc8IXFDuL0PYE0KF2J8e7hTLeuJWpW9nXxJ9OS2GOMAmYIWwb9/5pRQJsYfRI0Upp30lWTL5kqWLIU8fn581y ts9G7ejl XCrazAGBrTUfHlnOD9HoAdXUfzvxjaxc9R8CQMMtLMJvLeCXXSqdGMKJH95jN+/4DNVe4C2x6X5OF+zXnasWac3L3NrRMsh8S2HT8TL1Lq1ymJy+wHsLj02YoGuKWZjgmXFUCkvwIfVEpgsVeJarnCDaCOecNWskA4Snf+nH+fytBCPJhT88nyoiYaAD8m2LO7QTyWUP3Ish0nnNtG91/t7PNAZv0ngNtURDnCyTg0MI/TOk= 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) -- 2.47.2