From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 F25D0370AC0 for ; Fri, 24 Jul 2026 03:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784862211; cv=none; b=mKdr9GC5Tl23oa9J+NwpL+h96KldXhF597aPzRv07dC7YkZd+4YrAzUSLyvCo3VDqigyS7i5HiztDVnOOOhRzQh9QR9x/bGkcHBl9TmqeZLSIutB74eMfsxEk3ehr3NEnMiSMz++HqaB79abtFIwhKapMQMQByRK6nTtQXWZLRU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784862211; c=relaxed/simple; bh=o9+KJ3IY4LWiFLmck5cvFP1VGp+2zGVD2yi8zok/LY8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FsTKGtxIRmPUz44RI1XHPEfguqJTrLYYd8fc3Z4Vi0yi7Jr462qBQ2cs/2DLOcgz/WoPrQCeEPoXvp0opaDvn8Fu/Ki6MDBoiYQ1ChmPA8iBLYq+rk8ShoYrBglmoI/Im8MM/F/UwpJ5R3KKrs5S8PP/Xbeylg1uI+ch1qcI7bk= 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=bTf4ALck; arc=none smtp.client-ip=209.85.128.169 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="bTf4ALck" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-81ecf499af9so11550217b3.1 for ; Thu, 23 Jul 2026 20:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784862209; x=1785467009; 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:content-type; bh=uR7kgs000q7qimFucipfbArZHrQ2X+5+dqumsq29gHw=; b=bTf4ALck1ttV+hIuKUDfGTDQ+7QQfSvqYci4WEK5drcKqaZQikvM6001yzlA1s6U/B y53+iuJxxbg1dK+KRF8fYGZ89zkQ3MqCYZzoYjEhd60dkTMi76eo2FOTmv/iilRwRYQ5 4+nE9hTianLNMxGPZXF+jmA+U2vvwRAG/yFJ/M+8uonBdzvqeM4CAbm2+miSFf+FIsM7 82Ae1TX0GPX48G15cP/iPDa6yd0Av42R1XpPer5UFCktHPGu4jpBUjwh+4+6Wx2UjfaO c2WX4q+O3U6pCaV4cCHEIa1Qg0a8ZGzdDEHWlGt6eFUXlThDdgFRaF0UdqvN9y0BHgOc wX5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784862209; x=1785467009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=uR7kgs000q7qimFucipfbArZHrQ2X+5+dqumsq29gHw=; b=XxMidoLGL4Rz0mm1SAYh9CaiTKikpFMS1kDuk5iYiCOX6ji/2x3EQzKdrdmSDSRcTQ m/+MVt7b9D/E0GkOHmPAGP4RVqAi2HGE8HMciXSI3Jupp9bWUHutxIX9hQDJhirmZuvy uqWPmJ+l7hyhh1OVLvEJHcwSaYdhyFdyutTyptUVEACDFoyLKTKIwxCWtsmRYDJK++QT +Q2+mxjtAC6POYXtDDTAJZLW/UHgfO1SZem5THhMgmwdxdzy/uA0W/dLhCDUDhJqr4pN ieXbtwuiBZPPntCYzZdpLe0fEoQhJQDJ3NcFxRRjIDAWOAaZgW4hVkKmCkbdulsW3QbE WPcg== X-Gm-Message-State: AOJu0YwPqxejPsH1+1RCELvwIvxt1ywAaRk71q7IWD6ShYCtEbp2+r+w 279R3Q4OxUE+tEBNSWLMV6UZBfR1+RzhEIRpjqaj4adw41e95msrBaJOehsX X-Gm-Gg: AR+sD12M6I5gxfJFvv+rwnvPZ0A37skMzKXpOLkIf1JO8S4OKjs0dZ6D5CcpWiHr7fp DWvWhgTZ9TTQaZVAgbNyZxDTqEP/tGqvXlCQmUCpUaBAWqEjFptUuvMEyuiLm7/6PBRLWQALBsv fJkIsn08F1fAfv3GcG9Rt23AKukPeuCcMwc5gXhAtLjt9Seo+y3IuU6aHIu+t257x2hy4rcbdly ziv3XR4HiohMjAhhKmqJ14TPWn+xD+4aDRZvBmOFtki5ErM4vt8tk5i9DrvY6MWuFCUnQ+jio3f 4zRewkyYtWdgsHwdwaFQnLD4hmkN9qw/8S73Z4yyb54SJGOo3kTAGVp5krdC4CpBeq3ZznasU9Q wzpwvRBVILPtJ0EmpRJEr+HYmHOQTxjfQI1rItDD3UJTokMQVi1G+J3gp+Rg= X-Received: by 2002:a05:690c:305:b0:80c:3848:bdf4 with SMTP id 00721157ae682-81f4c2cb47bmr18926147b3.41.1784862208949; Thu, 23 Jul 2026 20:03:28 -0700 (PDT) Received: from citadel.lan ([2600:6c4a:4df0:2c10::1dba]) by smtp.gmail.com with ESMTPSA id 00721157ae682-81f33c397c9sm37379477b3.14.2026.07.23.20.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 20:03:28 -0700 (PDT) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Thomas Gleixner , Borislav Petkov , Ard Biesheuvel , Juergen Gross , Tom Lendacky , Brian Gerst Subject: [PATCH 2/5] x86/boot/64: Clear BSS as early as possible Date: Thu, 23 Jul 2026 23:02:53 -0400 Message-ID: <20260724030256.232690-3-brgerst@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260724030256.232690-1-brgerst@gmail.com> References: <20260724030256.232690-1-brgerst@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently, the BSS section is not cleared until x86_64_start_kernel(). Using unitialized BSS data before that point leads to difficult to debug problems. Fix this by moving clear_bss() to as early as possible. Signed-off-by: Brian Gerst --- arch/x86/include/asm/setup.h | 2 -- arch/x86/kernel/head64.c | 12 ------------ arch/x86/kernel/head_64.S | 20 ++++++++++++++++++++ arch/x86/xen/enlighten_pv.c | 2 -- arch/x86/xen/xen-head.S | 5 ++++- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 914eb32581c7..5534f4aaf73b 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -126,8 +126,6 @@ void *extend_brk(size_t size, size_t align); extern void probe_roms(void); -void clear_bss(void); - #ifdef __i386__ asmlinkage void __init __noreturn i386_start_kernel(void); diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index fd28b53dbac5..9f19635c6390 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -172,16 +172,6 @@ void __init do_early_exception(struct pt_regs *regs, int trapnr) early_fixup_exception(regs, trapnr); } -/* Don't add a printk in there. printk relies on the PDA which is not initialized - yet. */ -void __init clear_bss(void) -{ - memset(__bss_start, 0, - (unsigned long) __bss_stop - (unsigned long) __bss_start); - memset(__brk_base, 0, - (unsigned long) __brk_limit - (unsigned long) __brk_base); -} - static unsigned long get_cmd_line_ptr(void) { unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr; @@ -246,8 +236,6 @@ asmlinkage __visible void __init __noreturn x86_64_start_kernel(char * real_mode vmemmap_base = __VMEMMAP_BASE_L5; } - clear_bss(); - /* * This needs to happen *before* kasan_early_init() because latter maps stuff * into that page. diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 7ed5520dd52e..15ef5ea52b9a 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -37,6 +37,8 @@ .code64 SYM_CODE_START_NOALIGN(startup_64) UNWIND_HINT_END_OF_STACK + cld + /* * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0, * and someone has loaded an identity mapped page table @@ -61,6 +63,8 @@ SYM_CODE_START_NOALIGN(startup_64) /* Set up the stack for verify_cpu() */ leaq __top_init_kernel_stack(%rip), %rsp + call clear_bss + /* * Set up GSBASE. * Note that on SMP the boot CPU uses the init data section until @@ -140,6 +144,22 @@ SYM_CODE_START_NOALIGN(startup_64) jmp *.Lcommon_startup_64(%rip) SYM_CODE_END(startup_64) +SYM_FUNC_START(clear_bss) + xorl %eax, %eax + + leaq __bss_start(%rip), %rdi + leaq __bss_stop(%rip), %rcx + subq %rdi, %rcx + rep stosb + + leaq __brk_base(%rip), %rdi + leaq __brk_limit(%rip), %rcx + subq %rdi, %rcx + rep stosb + + RET +SYM_FUNC_END(clear_bss) + __INITRODATA SYM_DATA_LOCAL(.Lcommon_startup_64, .quad common_startup_64) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 2c64b388f616..6aa13d19c0a4 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1334,8 +1334,6 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si) if (!si) return; - clear_bss(); - xen_start_info = si; __text_gen_insn(&early_xen_iret_patch, diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 5dad6c51cdc3..9b56659246fe 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -31,6 +31,9 @@ SYM_CODE_START(startup_xen) leaq __top_init_kernel_stack(%rip), %rsp + movq %rsi, %r15 + call clear_bss + /* * Set up GSBASE. * Note that, on SMP, the boot cpu uses init data section until @@ -41,7 +44,7 @@ SYM_CODE_START(startup_xen) xorl %edx, %edx wrmsr - mov %rsi, %rdi + mov %r15, %rdi call xen_start_kernel SYM_CODE_END(startup_xen) __FINIT -- 2.55.0