From nobody Tue Dec 16 16:38:53 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CDF61FAC48 for ; Mon, 21 Apr 2025 18:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745261640; cv=none; b=BR+39Ti9GOdyKVEUlvbY9ZTLzE9whSRgoVYSc+K8WOOqW2B381uNCOW5lzMBod9ElAxstPwGX0zFE6QslyT/VEItHResLcSkQJRVn0OhJs5SurHTmENfUfAbSplN6cugunrUShFmEjaFTFA2GzMSTWZ1fnqRzPtzq0vpjJ8/J/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745261640; c=relaxed/simple; bh=4f1230J9mhkITZY+w1m8RSOf+1e4vpyXxVg/Z7zZa9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=acIU3oS7IAJXcuBCvkO8rgJ+2xGgJOuA29NfWySq75wNkBvmO71FkGrVnuSf5924epdS/HSraWOsgGTD5D3vKkD+gr/4ugtbjcWEVIvKuhjR74u0VKDLEE7pK2pr4AC6K9cgK/BOEPLc8erR62JU3oVoZaMVZcY7Kk0M/SQ7kok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XXdIdP+y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XXdIdP+y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72F71C4CEEC; Mon, 21 Apr 2025 18:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745261639; bh=4f1230J9mhkITZY+w1m8RSOf+1e4vpyXxVg/Z7zZa9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XXdIdP+yH8VOUv/H+9IHswdXjPbYDg3DlbaCO1ovD8ArmmoHiQyt60fFYPRE2qG33 cUDePFzm64SZ5sqU8ncCcC0NxgYE3CE8DfHcTBPGMUno+hpBX8vfZ1ZaOk4EsPx6ji ge5FHah11rgJK8wRmlx++j+g5EmDp5wVCmKaJn0ZA8cHElum/rNTx0Efd2bbbm40/I 6BrJexb0vKKRq9L5SgNsK7BBLKGs2TglU1smqwoxqzTMLWBStKnsiHJ/6y6V/bDupC hCpqUlndI50cjJxZAlbInbl7Cg2sL/MQ2avIFH6pLN81P6pTWRNVlP+AshDKZOXSbM GIl/dPNy42IHQ== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Arnd Bergmann , Borislav Petkov , Juergen Gross , "H . Peter Anvin" , Kees Cook , Linus Torvalds , Mike Rapoport , Paul Menzel , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , David Woodhouse Subject: [PATCH 25/29] x86/boot/e820: Simplify append_e820_table() and remove restriction on single-entry tables Date: Mon, 21 Apr 2025 20:52:05 +0200 Message-ID: <20250421185210.3372306-26-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250421185210.3372306-1-mingo@kernel.org> References: <20250421185210.3372306-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" So append_e820_table() begins with this weird condition that checks 'nr_ent= ries': static int __init append_e820_table(struct boot_e820_entry *entries, u3= 2 nr_entries) { /* Only one memory region (or negative)? Ignore it */ if (nr_entries < 2) return -1; Firstly, 'nr_entries' has been an u32 since 2017 and cannot be negative. Secondly, there's nothing inherently wrong with single-entry E820 maps, especially in virtualized environments. So remove this restriction and remove the __append_e820_table() indirection. Also: - fix/update comments - remove obsolete comments This shrinks the generated code a bit as well: text data bss dec hex filename 7549 44072 0 51621 c9a5 e820.o.before 7533 44072 0 51605 c995 e820.o.after Signed-off-by: Ingo Molnar Cc: Andy Shevchenko Cc: Arnd Bergmann Cc: David Woodhouse Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Mike Rapoport (Microsoft) --- arch/x86/kernel/e820.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index ec5628a844dc..27bc45a65807 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -483,17 +483,22 @@ __init int e820__update_table(struct e820_table *tabl= e) return 0; } =20 -__init static int __append_e820_table(struct boot_e820_entry *entries, u32= nr_entries) +/* + * Copy the BIOS E820 map into the kernel's e820_table. + * + * Sanity-check it while we're at it.. + */ +__init static int append_e820_table(struct boot_e820_entry *entries, u32 n= r_entries) { struct boot_e820_entry *entry =3D entries; =20 while (nr_entries) { u64 start =3D entry->addr; - u64 size =3D entry->size; - u64 end =3D start + size - 1; - u32 type =3D entry->type; + u64 size =3D entry->size; + u64 end =3D start + size-1; + u32 type =3D entry->type; =20 - /* Ignore the entry on 64-bit overflow: */ + /* Ignore the remaining entries on 64-bit overflow: */ if (start > end && likely(size)) return -1; =20 @@ -505,24 +510,6 @@ __init static int __append_e820_table(struct boot_e820= _entry *entries, u32 nr_en return 0; } =20 -/* - * Copy the BIOS E820 map into a safe place. - * - * Sanity-check it while we're at it.. - * - * If we're lucky and live on a modern system, the setup code - * will have given us a memory map that we can use to properly - * set up memory. If we aren't, we'll fake a memory map. - */ -__init static int append_e820_table(struct boot_e820_entry *entries, u32 n= r_entries) -{ - /* Only one memory region (or negative)? Ignore it */ - if (nr_entries < 2) - return -1; - - return __append_e820_table(entries, nr_entries); -} - __init static u64 __e820__range_update(struct e820_table *table, u64 start, u64 size, enum e= 820_type old_type, enum e820_type new_type) { @@ -796,7 +783,7 @@ __init void e820__memory_setup_extended(u64 phys_addr, = u32 data_len) entries =3D sdata->len / sizeof(*extmap); extmap =3D (struct boot_e820_entry *)(sdata->data); =20 - __append_e820_table(extmap, entries); + append_e820_table(extmap, entries); e820__update_table(e820_table); =20 memcpy(e820_table_kexec, e820_table, sizeof(*e820_table_kexec)); --=20 2.45.2