From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (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 6B01A377EA2 for ; Fri, 24 Jul 2026 03:03:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784862213; cv=none; b=W69qH8h0YlwBg3n0DoSP37AMVhzVcJzE7k2zMJvyGompZiB3toEY4Q5B+yzG3tNuS2HbZsihOpK71lB0J5WNhmee9S7pJ90rJspAqDxXkkk+8SLMQGWjMDSEk1axs9LxKDqbRpGYHk9zRFzAvAJYavwXj2noBenzFMLRKhFbLwk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784862213; c=relaxed/simple; bh=TGRp+2CqscCYAPn3tF8GqHew6N1j0t5jlV/76q9HVd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nDgdxuDfASpJADFPjYSd4+cZMdqrYwz3d+JZvzBQU3l8KoICaCQUrFfqieYrcdiUgYpdY9f+pKJo7lNn4w0PwdRvh67RNctHuVHBIORKLUz2upbfnXIKk3jU8K/QyxfI7F8ZrMzQxZpxmCePwN1RBcMmCW4+BHkDkDGUxdvJZIc= 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=XlZOOuJm; arc=none smtp.client-ip=209.85.128.170 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="XlZOOuJm" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-7ff05e5d009so9964237b3.1 for ; Thu, 23 Jul 2026 20:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784862211; x=1785467011; 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=Fohv3zQW8en/CdgCeYM+plUC/PZuMWYlz5y9Y9oqxSU=; b=XlZOOuJmIf2Bo2nfuLEpK9hg+iOvRx4+e1B10Sj4cBaUbcOmsAhHqkNzhVb3SrdNd1 DSeVlBIGyNZg8mwq7stkopvMCahVICvKUJKLNwz1yIEw4JKc8jAz4Qw4p1AxX5nVnmut R3usuT3P0FJ0az89AFvTjvifa4O9h4jcRnhnQERwq2s9C9t39U1Ww3hRpQXNw5jGlopv EyQO++U8PlaLrWLQYE3YfigKoS6SNesQkUXkd8HTGs3nHXYWr3ZfRa/DEVGNyiLW8red /ipC6NCSmofmGC1jQFGBCa2q3/jRR8SjFCJV2/udUoCzINekqWpBnHO+7PVrWHFxps9E nV8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784862211; x=1785467011; 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=Fohv3zQW8en/CdgCeYM+plUC/PZuMWYlz5y9Y9oqxSU=; b=RknBlaJmhxAnW2V2GUVndFyor5Yfb5CaqxFxQPX83g8XzccZuLXleWzVUDN8Rnq0QQ bK7yTh4vh36JaGz3uL2X3jPJJb+oxFMYOF1cS/GqCBOfrb84ptGOMrjnzpZhKCxbyPNp rkMQYXlqOr6TcDGo73yJpm3+JoonotKiTMoJlrPn9K5NhHXrjkHcPbEXwGQEXCyEZam4 fhxaw8hszz8YKOFCwKBV6pdw1ydsy+VL5YCkqzLpJlZSLfFoq7JlZKhvk7RR3y9Zsz6j 1C/ESuyF27p0Vl2nMX1R/FQFT/8/ZtXdibLsMFV3v/KK7J6YggU6C+c61wIcnhAxt4Ww u6mw== X-Gm-Message-State: AOJu0YyhN6d0SB2eeOV93Gn3mtOkXeqPqtdy0scyvWrFgzOpYilMfSI9 nuO22kVQyA7nuhcOEZ3vkH6qStnEfk+h63kQxGdPzqLyQQSbkVj0oppvTfFz X-Gm-Gg: AR+sD13D1dHvDCB9UvWPO2eZydxsDBdtOhJa5J6gOL/LFxGSfBgv1MVyg7fzQpwgIEp /T1lwvbD9S48Gjv+lxK3229y+y4XV1nHa9lwlNvs6JmTfacCzLkwWab3ge/a/6oCtrvmgdhsnnU OpjX7N47yt9tVYMdj8dET6723aJWGdDNSLCFMRsFRZrCpJsPMZwsVbpZW2+r3GUKilDPh69Mf/Z VfWo+fH8JkYPqAxVszDCFsb+lyKGvHonj2tjOf8+me9Td4zaMks1yVBCFn1RC9kZRerxxn9h+Sh lxovFAV+bpOoe9yUVxFWsiiDTcqx89iZvSQfFm0ldAW9tRn0SlsprZIY8FFTs4Bwu197C7b1S8k JtJutHG0xaKx5wraBEcBO8gSzpBWLLJRbZ0Rgr6Zu+hCtVXB6HAxAn+H+GS0= X-Received: by 2002:a05:690c:610b:b0:81e:eac8:f325 with SMTP id 00721157ae682-81f4c2da489mr18909517b3.42.1784862211211; Thu, 23 Jul 2026 20:03:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 20:03:30 -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 4/5] x86/boot/64: Remove copy_bootdata() call Date: Thu, 23 Jul 2026 23:02:55 -0400 Message-ID: <20260724030256.232690-5-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 On a normal boot, copy_bootdata() is first called in x86_64_start_kernel(). The second call in x86_64_start_reservations() is effectively a no-op. Xen PV directly initializes boot_params, so it does not need to call copy_bootdata() at all. Remove the unnecessary call to copy_bootdata() from x86_64_start_reservations(). Signed-off-by: Brian Gerst Cc: Juergen Gross --- arch/x86/include/asm/setup.h | 2 +- arch/x86/kernel/head64.c | 8 ++------ arch/x86/xen/enlighten_pv.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index d23f4272d930..18a4d3826af7 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -130,7 +130,7 @@ void __init mk_early_pgtbl_32(void); #else asmlinkage void __init __noreturn x86_64_start_kernel(char *real_mode); -asmlinkage void __init __noreturn x86_64_start_reservations(char *real_mode_data); +asmlinkage void __init __noreturn x86_64_start_reservations(void); #endif /* __i386__ */ #endif /* _SETUP */ diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 9f19635c6390..d895376e9346 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -276,15 +276,11 @@ asmlinkage __visible void __init __noreturn x86_64_start_kernel(char * real_mode /* set init_top_pgt kernel high mapping*/ init_top_pgt[511] = early_top_pgt[511]; - x86_64_start_reservations(real_mode_data); + x86_64_start_reservations(); } -void __init __noreturn x86_64_start_reservations(char *real_mode_data) +void __init __noreturn x86_64_start_reservations(void) { - /* version is always not zero if it is copied */ - if (!boot_params.hdr.version) - copy_bootdata(__va(real_mode_data)); - x86_early_init_platform_quirks(); switch (boot_params.hdr.hardware_subarch) { diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 6aa13d19c0a4..e6e2666da5a1 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -1556,7 +1556,7 @@ asmlinkage __visible void __init xen_start_kernel(struct start_info *si) /* Start the world */ cr4_init_shadow(); /* 32b kernel does this in i386_start_kernel() */ - x86_64_start_reservations((char *)__pa_symbol(&boot_params)); + x86_64_start_reservations(); } static int xen_cpu_up_prepare_pv(unsigned int cpu) -- 2.55.0