From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 471D023B609 for ; Sun, 14 Sep 2025 04:00:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822412; cv=none; b=a08v0kD6dwBGmZaJE7hlaF4tFht+/t3wvwtMuBc0Glb37wp3BlIIhXSeBpcjbzukuKAE01wSUdqPHGCbfhrMdFDJNds2a7OoXzdx8ZO+ABqVr+S59K5BrFX+8V/EWnQ55JCo4WW+CT5UbgmZj0D9O5g06VIohC+JMKZptkZzTCA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757822412; c=relaxed/simple; bh=/bxzngf5skclGRBscZHcLzo2yjr/LuMuS/DD/Rj8Rbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ycw+MS0m5pD5M9tAGRqThQKuIBPAtuU27VwJT355GUl6gpBIgp1/le7lZal2o9h733ZqsoezxoT7EBuqAGBKmV8HRdi7L3VaLuDSEmORcVCr0+QhAVq9UVw4vItTgk7eec0CbotVkHuoIumYnvobez1gQjg8yHaVS3hzmOdqsBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JUs2AQam; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JUs2AQam" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b07d01fd4fbso242258866b.0 for ; Sat, 13 Sep 2025 21:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757822408; x=1758427208; darn=vger.kernel.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=JUs2AQam6b4nqSOGTAtBSs33sUvHl88lDkWIx7zrB3ZDFeCH8P/tw0XxiBcN6MHJ+9 B0oIVTqotkPUqYV9jllsybZda2m+T/Zk3ZIgT0QPKSipnbCfheTUdMch3NBww6BeK9iS XJhlQARLy6SoVaoL8JqjC6wbtWc7gCyv0bxYOrVZ//awb98b2zeU2j/N29kGDv5v/gTZ VtB93KsUYG0fovDk7p5MWHsmGTOYsmDQrTIEskR97v00NvcSDZG757ioGzXBpn7wj3CF A+EApAe/GCLOZp44RNdCM29TTV+/QhyxFMho3/g8e1KZBC2vF+gP3sI6rea/ZAFp7IyC 4xOQ== 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=sEWoR4dZWBGeb0yk2UztyHDO6nML3pWe0T3CVIC1xyz06uHtX8qE6fNxsNYRibfVHx UQmfHPrAL69M4VnkYaEkZRcma37XNFvbM0LRJAFMwPhndQViWmAMg+Ut8b0eltm1PZil JIYwsQR/XOwhRuTulY/AKKs10BUIK9/5gjDf4qnQyJ6ehgj361oRz1yM7t7Miyf6TLq2 5J+1hwQg1Xefe8/e9DLXxuRxXwPlrUGAY2wBuUAQTyEVbQhu1OTjm4a9CJn29HBkDuJ7 mwhJ5hDoj2v9xX8Q95JhIsCBAcl7r5O6DRo12zGRQSPBDIiEn/9m25L+AdotExfDXV0O z2Ug== X-Forwarded-Encrypted: i=1; AJvYcCXox9GiazXC5pNVeMxGKR2v7F0MUGhgXpp518USvwlXa9sNLkSjdtjRjYfvYTYqrspx0unNc5fTilg=@vger.kernel.org X-Gm-Message-State: AOJu0Yyx+/FyOUYkz9DqSE/tHeKUc1FiIg07/lYkSxz8kpqRjAtQ7Xgp QakKK5MFKeDuUPbBbgnosAeFIxrbbUnGwHelfvtDThW8wEdcYyB//ZE5 X-Gm-Gg: ASbGncvOm/H9E/AmKiPLvPoajRUlGHHq42TgUGGppIa8vKWDC+DxsOCAOHPucJfcc+3 ovjMJftvZmw2shTJ7QpK7PtsblfsNcOOn5OxlGMg7rM+mM2DSYjVmw8B7Ynv3/wsgjqbyA/+tIh HCUX1y5Qzapn6kQFvCOrOMNs70LMQIbO1q1DcTJB6FnMVdJBREWxE6vfi1on+WpKm6xigmVFGS4 wUKiGcKylODKX4d7OHjgKJGIy1dXypC781Jr2+LmMLf+3Dd+f9HQI8/w1kv1U9t3t64htsl7q2n HHHIpCFxk8CXG4ImTTK60v/QfrrbIxrO9eNoyZHdaLc8lwBVZgcok81QbJYjQi3QJv5LLKYZmfH pdeGeFvKjHgaeAbpasbA= 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> Precedence: bulk X-Mailing-List: linux-api@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ...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