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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56177CAC58F for ; Sun, 14 Sep 2025 04:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sPu72pvE4Wbo60re69UImAF/YSQlNTTbxtv7CBRvcjs=; b=vhHo6KFpTltwf3RuNHJe8ggy+I GBrSlSe5TdqVAY9Wr6Z0CEnoYCJVQ+K54zcxjJkKmiM5nRHW49YVtc2FpdSJExQ7HUPQI7RPBLpri UgS/fpxhAhBX43FHqOFsWTd4qTATe4bALtgTwucESHTrmZ4wlZ3nwqXN7WglnoKADIpXcQcsANDmy lLzQvhJ9UzdQy84AItbCMfS+CBqma5be9rMe2GvFzhhF24x5LMQxN1JEhXjwXCJhIRBlTS5Aafkui LYrBmhq7CldMmyQf7P2FFUhyEc4CShYTjeK8KGub7qlTbrbOm1U+qOkXsQ5RcY9oFZTOoPISx2tli BGaluM6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxduO-0000000HQ84-3Slj; Sun, 14 Sep 2025 04:00:12 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uxduL-0000000HQ4z-2HZD for linux-um@lists.infradead.org; Sun, 14 Sep 2025 04:00:11 +0000 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-afcb7a16441so465917166b.2 for ; Sat, 13 Sep 2025 21:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822408; x=1758427208; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sPu72pvE4Wbo60re69UImAF/YSQlNTTbxtv7CBRvcjs=; b=nOWQEh+3PEQIHLxKQxnVUqchcUlGm/qxCESYmSPC06HT1Jmtxqh2d32XIWZiMWzUV5 4dTlnNjUQ1UOUP5GTTk6L6J7LsCl+AzYGXu1URpKv8QgKbqqjFK+2bFsItIVCQL47aR7 INn1TneuQNgblEDuCFmgR+QtGZHkzBFI6aM/BOBwz17WOICSOz52CZ1xEUj32K3bb1BR TvzJQ2H+NyieXC8mXZUPT86lczGwvucdxSVYrTriT2k/8y779kLXjfipQvqWQNpTwfN0 3PFOiHiMogU3JAnn2aQsEuLhNrdK/JbPLUn/5gJWgwXPXk133YGSGAdESR5Hk32EM6by VuYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757822408; x=1758427208; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sPu72pvE4Wbo60re69UImAF/YSQlNTTbxtv7CBRvcjs=; b=bGxefGP2LuREREVpoTzpbhx1Xbn8DGWfz9KEyFmri2WtFqMln1zAOZdn8FMwpmtZG1 coOSpCkDPdk6qqJ0u7NbCJahQM0NygbIQJV/aP8wnRxdn2lkleKAXSu+uhNFlLZE3+aF 4VUpSg2OO8pk4Rj8xGJWXZMhK5mjZFt3FJKNxp66zyGVzjTZXW8cgP3r+S24qXUtG+D6 NT+FCAY5CcJ2Iy0R6nkjD6kAW/fakoabJ6fjG6lZdtEDFi+sTl2wT9hhlp6Jy+Ul91xT 4uAu8vPnrZL5x5Xj0ImPpqHjB2IMpYKW9sQCn486kzeCmtxV/l8WHpNubxUrcmRbkc+j oxHQ== X-Forwarded-Encrypted: i=1; AJvYcCVaDQ5wbhHq0TNfiVbU0krwIFt5LyHorcEW149pOUAYnNJtb5fWc3+BWoYKGbEvqtLX5CSmpnNoyw==@lists.infradead.org X-Gm-Message-State: AOJu0YzeqXz5Qc990kUM4eEMCVulzuO5zWM8B5+j0Ti/Zk373165L6R3 50YmS6SDOYMgCLJzeBoujVC16VTBNwQNjSBrNEJA85fS/sN97t+Fz8Uq X-Gm-Gg: ASbGnct3MOp1MKos4Gc5H9+BeYsY5LY5Gy91V+zPEGAWBvcsmJffrzlh6nbz+hngHFp +LCsfgdhvzEaMMoqs+9F4RyyFbId7zjz/wIvIM0h+98A4WQHhwLEuoZiX28PAiCCMKA6CUSGkyC +bDdqp5Ukb5WotGKKAJ0D0HFn+yKu422MUrtOmsOpsLuSRYk8R4Ugj5G3jpgIiNXEStNbPUoU9t LyheK37RQ/qcmqsRIjBO+0O0Z8gleKW3+x8SM5rX16YvK4fsVm03iS1CTVgyanrmjwDWJwjNrgD Hb9GtuQzllQHr9QrEr+iBISjgCjXMMCdJf2maPTOapVR+H63uaI4U/oN1k4kxqb1tc0GCaQX/uH C741YTYcyFuWhYYccAQI= X-Google-Smtp-Source: AGHT+IEl+TZwxB50+bcUbtwQ17obwnzKEwTqhOZYOAPQC+b9EZK3iFYtQ6uoMv0unkK0mvoXQKHChg== X-Received: by 2002:a17:907:3e1e:b0:afe:35d:fd5d with SMTP id a640c23a62f3a-b07c3475927mr787189666b.1.1757822407322; Sat, 13 Sep 2025 21:00:07 -0700 (PDT) Received: from localhost ([212.73.77.104]) by smtp.gmail.com with UTF8SMTPSA id a640c23a62f3a-b07b32ef574sm682456966b.73.2025.09.13.21.00.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Sep 2025 21:00:06 -0700 (PDT) From: Askar Safin To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , Christian Brauner , Al Viro , Jan Kara , Christoph Hellwig , Jens Axboe , Andy Shevchenko , Aleksa Sarai , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Julian Stecklina , Gao Xiang , Art Nikpal , Andrew Morton , Eric Curtin , Alexander Graf , Rob Landley , Lennart Poettering , linux-arch@vger.kernel.org, linux-alpha@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, x86@kernel.org, Ingo Molnar , linux-block@vger.kernel.org, initramfs@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-ext4@vger.kernel.org, "Theodore Y . Ts'o" , linux-acpi@vger.kernel.org, Michal Simek , devicetree@vger.kernel.org, Luis Chamberlain , Kees Cook , Thorsten Blum , Heiko Carstens , patches@lists.linux.dev Subject: [PATCH RESEND 54/62] init: arm, x86: deal with some references to initrd Date: Sun, 14 Sep 2025 07:00:01 +0300 Message-ID: <20250914040002.3779907-1-safinaskar@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com> References: <20250913003842.41944-1-safinaskar@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250913_210009_641683_9B034604 X-CRM114-Status: GOOD ( 20.52 ) X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" Errors-To: linux-um-bounces+linux-um=archiver.kernel.org@lists.infradead.org ...in comments and printk Signed-off-by: Askar Safin --- arch/arm/mm/init.c | 2 +- arch/x86/kernel/setup.c | 10 +++++----- arch/x86/mm/init.c | 2 +- init/initramfs.c | 18 +++++++++--------- init/main.c | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index ae5921db626e..04ba9b385e24 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -445,7 +445,7 @@ void free_initramfs_mem(unsigned long start, unsigned long end) end = round_up(end, PAGE_SIZE); poison_init_mem((void *)start, PAGE_ALIGN(end) - start); - free_reserved_area((void *)start, (void *)end, -1, "initrd"); + free_reserved_area((void *)start, (void *)end, -1, "initramfs"); } #endif diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3b88d156ed39..65670e0f59c0 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -325,19 +325,19 @@ static void __init relocate_initrd(void) u64 relocated_ramdisk = memblock_phys_alloc_range(area_size, PAGE_SIZE, 0, PFN_PHYS(max_pfn_mapped)); if (!relocated_ramdisk) - panic("Cannot find place for new RAMDISK of size %lld\n", + panic("Cannot find place for new INITRAMFS of size %lld\n", ramdisk_size); virt_external_initramfs_start = relocated_ramdisk + PAGE_OFFSET; virt_external_initramfs_end = virt_external_initramfs_start + ramdisk_size; - printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n", + printk(KERN_INFO "Allocated new INITRAMFS: [mem %#010llx-%#010llx]\n", relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1); ret = copy_from_early_mem((void *)virt_external_initramfs_start, ramdisk_image, ramdisk_size); if (ret) - panic("Copy RAMDISK failed\n"); + panic("Copy INITRAMFS failed\n"); - printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to" + printk(KERN_INFO "Move INITRAMFS from [mem %#010llx-%#010llx] to" " [mem %#010llx-%#010llx]\n", ramdisk_image, ramdisk_image + ramdisk_size - 1, relocated_ramdisk, relocated_ramdisk + ramdisk_size - 1); @@ -370,7 +370,7 @@ static void __init reserve_initrd(void) virt_external_initramfs_start = 0; - printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image, + printk(KERN_INFO "INITRAMFS: [mem %#010llx-%#010llx]\n", ramdisk_image, ramdisk_end - 1); if (pfn_range_is_mapped(PFN_DOWN(ramdisk_image), diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index b7c45004f999..51b632f7fd21 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -992,7 +992,7 @@ void __init free_initramfs_mem(unsigned long start, unsigned long end) * - relocate_initrd() * So here We can do PAGE_ALIGN() safely to get partial page to be freed */ - free_init_pages("initrd", start, PAGE_ALIGN(end)); + free_init_pages("initramfs", start, PAGE_ALIGN(end)); } #endif diff --git a/init/initramfs.c b/init/initramfs.c index d52314b17c25..348cfcc4c95e 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -643,7 +643,7 @@ void __init reserve_initramfs_mem(void) return; /* * Round the memory region to page boundaries as per free_initramfs_mem() - * This allows us to detect whether the pages overlapping the initrd + * This allows us to detect whether the pages overlapping the initramfs * are in use, but more importantly, reserves the entire set of pages * as we don't want these pages allocated for other purposes. */ @@ -652,26 +652,26 @@ void __init reserve_initramfs_mem(void) size = round_up(size, PAGE_SIZE); if (!memblock_is_region_memory(start, size)) { - pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region", + pr_err("INITRAMFS: 0x%08llx+0x%08lx is not a memory region", (u64)start, size); goto disable; } if (memblock_is_region_reserved(start, size)) { - pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region\n", + pr_err("INITRAMFS: 0x%08llx+0x%08lx overlaps in-use memory region\n", (u64)start, size); goto disable; } memblock_reserve(start, size); - /* Now convert initrd to virtual addresses */ + /* Now convert initramfs to virtual addresses */ virt_external_initramfs_start = (unsigned long)__va(phys_external_initramfs_start); virt_external_initramfs_end = virt_external_initramfs_start + phys_external_initramfs_size; initramfs_below_start_ok = 1; return; disable: - pr_cont(" - disabling initrd\n"); + pr_cont(" - disabling initramfs\n"); virt_external_initramfs_start = 0; virt_external_initramfs_end = 0; } @@ -686,7 +686,7 @@ void __weak __init free_initramfs_mem(unsigned long start, unsigned long end) #endif free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM, - "initrd"); + "initramfs"); } #ifdef CONFIG_CRASH_RESERVE @@ -696,14 +696,14 @@ static bool __init kexec_free_initramfs(void) unsigned long crashk_end = (unsigned long)__va(crashk_res.end); /* - * If the initrd region is overlapped with crashkernel reserved region, + * If the initramfs region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. */ if (virt_external_initramfs_start >= crashk_end || virt_external_initramfs_end <= crashk_start) return false; /* - * Initialize initrd memory region since the kexec boot does not do. + * Initialize initramfs memory region since the kexec boot does not do. */ memset((void *)virt_external_initramfs_start, 0, virt_external_initramfs_end - virt_external_initramfs_start); if (virt_external_initramfs_start < crashk_start) @@ -740,7 +740,7 @@ static void __init do_populate_rootfs(void *unused, async_cookie_t cookie) security_initramfs_populated(); /* - * If the initrd region is overlapped with crashkernel reserved region, + * If the initramfs region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. */ if (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initramfs()) { diff --git a/init/main.c b/init/main.c index c535e0613df8..4212efb33e77 100644 --- a/init/main.c +++ b/init/main.c @@ -276,7 +276,7 @@ static void * __init get_boot_config_from_initramfs(size_t *_size) data = (char *)virt_external_initramfs_end - BOOTCONFIG_MAGIC_LEN; /* - * Since Grub may align the size of initrd to 4, we must + * Since Grub may align the size of initramfs to 4, we must * check the preceding 3 bytes as well. */ for (i = 0; i < 4; i++) { @@ -293,7 +293,7 @@ static void * __init get_boot_config_from_initramfs(size_t *_size) data = ((void *)hdr) - size; if ((unsigned long)data < virt_external_initramfs_start) { - pr_err("bootconfig size %d is greater than initrd size %ld\n", + pr_err("bootconfig size %d is greater than initramfs size %ld\n", size, virt_external_initramfs_end - virt_external_initramfs_start); return NULL; } @@ -303,7 +303,7 @@ static void * __init get_boot_config_from_initramfs(size_t *_size) return NULL; } - /* Remove bootconfig from initramfs/initrd */ + /* Remove bootconfig from initramfs */ virt_external_initramfs_end = (unsigned long)data; if (_size) *_size = size; @@ -421,7 +421,7 @@ static void __init setup_boot_config(void) /* Cut out the bootconfig data even if we have no bootconfig option */ data = get_boot_config_from_initramfs(&size); - /* If there is no bootconfig in initrd, try embedded one. */ + /* If there is no bootconfig in initramfs, try embedded one. */ if (!data) data = xbc_get_embedded_bootconfig(&size); @@ -478,7 +478,7 @@ static void __init exit_boot_config(void) static void __init setup_boot_config(void) { - /* Remove bootconfig data from initrd */ + /* Remove bootconfig data from initramfs */ get_boot_config_from_initramfs(NULL); } @@ -1049,7 +1049,7 @@ void start_kernel(void) #ifdef CONFIG_BLK_DEV_INITRD if (virt_external_initramfs_start && !initramfs_below_start_ok && page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)) < min_low_pfn) { - pr_crit("initrd overwritten (0x%08lx < 0x%08lx) - disabling it.\n", + pr_crit("initramfs overwritten (0x%08lx < 0x%08lx) - disabling it.\n", page_to_pfn(virt_to_page((void *)virt_external_initramfs_start)), min_low_pfn); virt_external_initramfs_start = 0; -- 2.47.2