From: Andrew Cooper <andrew.cooper3@citrix.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>, <x86@kernel.org>,
"Jan Kiszka" <jan.kiszka@siemens.com>,
James Morris <jmorris@namei.org>,
"David Howells" <dhowells@redhat.com>,
Matthew Garrett <mjg59@google.com>,
Josh Boyer <jwboyer@redhat.com>,
Zhenzhong Duan <zhenzhong.duan@oracle.com>,
Steve Wahl <steve.wahl@hpe.com>,
Mike Travis <mike.travis@hpe.com>,
Dimitri Sivanich <dimitri.sivanich@hpe.com>,
Arnd Bergmann <arnd@arndb.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Giovanni Gherdovich <ggherdovich@suse.cz>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>,
Kees Cook <keescook@chromium.org>,
Martin Molnar <martin.molnar.programming@gmail.com>,
Pingfan Liu <kernelfans@gmail.com>,
<jailhouse-dev@googlegroups.com>
Subject: [PATCH] x86/smpboot: Remove 486-isms from the modern AP boot path
Date: Wed, 25 Mar 2020 10:14:31 +0000 [thread overview]
Message-ID: <20200325101431.12341-1-andrew.cooper3@citrix.com> (raw)
Linux has an implementation of the Universal Start-up Algorithm (MP spec,
Appendix B.4, Application Processor Startup), which includes unconditionally
writing to the Bios Data Area and CMOS registers.
The warm reset vector is only necessary in the non-integrated Local APIC case.
UV and Jailhouse already have an opt-out for this behaviour, but blindly using
the BDA and CMOS on a UEFI or other reduced hardware system isn't clever.
Drop the warm_reset flag from struct x86_legacy_features, and tie the warm
vector modifications to the integrated-ness of the Local APIC. This has the
advantage of compiling the warm reset logic out entirely for 64bit builds.
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: Borislav Petkov <bp@alien8.de>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: x86@kernel.org
CC: Jan Kiszka <jan.kiszka@siemens.com>
CC: James Morris <jmorris@namei.org>
CC: David Howells <dhowells@redhat.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Matthew Garrett <mjg59@google.com>
CC: Josh Boyer <jwboyer@redhat.com>
CC: Zhenzhong Duan <zhenzhong.duan@oracle.com>
CC: Steve Wahl <steve.wahl@hpe.com>
CC: Mike Travis <mike.travis@hpe.com>
CC: Dimitri Sivanich <dimitri.sivanich@hpe.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: "Peter Zijlstra (Intel)" <peterz@infradead.org>
CC: Giovanni Gherdovich <ggherdovich@suse.cz>
CC: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
CC: Len Brown <len.brown@intel.com>
CC: Kees Cook <keescook@chromium.org>
CC: Martin Molnar <martin.molnar.programming@gmail.com>
CC: Pingfan Liu <kernelfans@gmail.com>
CC: linux-kernel@vger.kernel.org
CC: jailhouse-dev@googlegroups.com
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
Thomas: I finally found the reference we were discussing in Portland. Sorry
this patch took so long.
I don't have any non-integrated APIC hardware to test with. Can anyone help
me out?
---
arch/x86/include/asm/x86_init.h | 1 -
arch/x86/kernel/apic/x2apic_uv_x.c | 1 -
arch/x86/kernel/jailhouse.c | 1 -
arch/x86/kernel/platform-quirks.c | 1 -
arch/x86/kernel/smpboot.c | 21 ++++++++++++---------
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 96d9cd208610..006a5d7fd7eb 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -229,7 +229,6 @@ enum x86_legacy_i8042_state {
struct x86_legacy_features {
enum x86_legacy_i8042_state i8042;
int rtc;
- int warm_reset;
int no_vga;
int reserve_bios_regions;
struct x86_legacy_devices devices;
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index ad53b2abc859..5afcfd193592 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -343,7 +343,6 @@ static int __init uv_acpi_madt_oem_check(char *_oem_id, char *_oem_table_id)
} else if (!strcmp(oem_table_id, "UVH")) {
/* Only UV1 systems: */
uv_system_type = UV_NON_UNIQUE_APIC;
- x86_platform.legacy.warm_reset = 0;
__this_cpu_write(x2apic_extra_bits, pnodeid << uvh_apicid.s.pnode_shift);
uv_set_apicid_hibit();
uv_apic = 1;
diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index 6eb8b50ea07e..d628fe92d6af 100644
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -210,7 +210,6 @@ static void __init jailhouse_init_platform(void)
x86_platform.calibrate_tsc = jailhouse_get_tsc;
x86_platform.get_wallclock = jailhouse_get_wallclock;
x86_platform.legacy.rtc = 0;
- x86_platform.legacy.warm_reset = 0;
x86_platform.legacy.i8042 = X86_LEGACY_I8042_PLATFORM_ABSENT;
legacy_pic = &null_legacy_pic;
diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c
index b348a672f71d..d922c5e0c678 100644
--- a/arch/x86/kernel/platform-quirks.c
+++ b/arch/x86/kernel/platform-quirks.c
@@ -9,7 +9,6 @@ void __init x86_early_init_platform_quirks(void)
{
x86_platform.legacy.i8042 = X86_LEGACY_I8042_EXPECTED_PRESENT;
x86_platform.legacy.rtc = 1;
- x86_platform.legacy.warm_reset = 1;
x86_platform.legacy.reserve_bios_regions = 0;
x86_platform.legacy.devices.pnpbios = 1;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index d85e91a8aa8c..e2ebb0be2ee3 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1049,18 +1049,21 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
* the targeted processor.
*/
- if (x86_platform.legacy.warm_reset) {
+ /*
+ * APs are typically started in one of two ways:
+ *
+ * - On 486-era hardware with a non-integrated Local APIC, a single
+ * INIT IPI is sent. When the AP comes out of reset, the BIOS
+ * follows the warm reset vector to start_ip.
+ * - On everything with an integrated Local APIC, the start_ip is
+ * provided in the Startup IPI message, sent as part of an
+ * INIT-SIPI-SIPI sequence.
+ */
+ if (!APIC_INTEGRATED(boot_cpu_apic_version)) {
pr_debug("Setting warm reset code and vector.\n");
smpboot_setup_warm_reset_vector(start_ip);
- /*
- * Be paranoid about clearing APIC errors.
- */
- if (APIC_INTEGRATED(boot_cpu_apic_version)) {
- apic_write(APIC_ESR, 0);
- apic_read(APIC_ESR);
- }
}
/*
@@ -1118,7 +1121,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
}
}
- if (x86_platform.legacy.warm_reset) {
+ if (!APIC_INTEGRATED(boot_cpu_apic_version)) {
/*
* Cleanup possible dangling ends...
*/
--
2.11.0
next reply other threads:[~2020-03-25 10:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 10:14 Andrew Cooper [this message]
2020-03-25 10:17 ` [PATCH] x86/smpboot: Remove 486-isms from the modern AP boot path hpa
2020-03-25 14:37 ` Thomas Gleixner
2020-03-31 23:35 ` Maciej W. Rozycki
2020-04-01 10:23 ` David Laight
2020-04-01 13:26 ` Maciej W. Rozycki
2020-04-01 22:30 ` Andrew Cooper
2020-04-01 23:32 ` Maciej W. Rozycki
2020-03-31 17:58 ` [PATCH v2] " Andrew Cooper
2020-03-31 22:23 ` Brian Gerst
2020-03-31 22:44 ` Andrew Cooper
2020-03-31 22:53 ` Brian Gerst
2020-04-01 9:22 ` Andrew Cooper
2020-04-01 11:39 ` Brian Gerst
2020-04-01 12:14 ` Andrew Cooper
2020-04-01 14:38 ` Brian Gerst
2020-04-01 14:47 ` Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200325101431.12341-1-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=dhowells@redhat.com \
--cc=dimitri.sivanich@hpe.com \
--cc=ggherdovich@suse.cz \
--cc=hpa@zytor.com \
--cc=jailhouse-dev@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=jmorris@namei.org \
--cc=jwboyer@redhat.com \
--cc=keescook@chromium.org \
--cc=kernelfans@gmail.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.molnar.programming@gmail.com \
--cc=mike.travis@hpe.com \
--cc=mingo@redhat.com \
--cc=mjg59@google.com \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=steve.wahl@hpe.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=zhenzhong.duan@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).