x86/apic/flat64: Add back the early_param("apic", parse_apic)
Dexuan Cui
maintainerPATCH v2 1/1 x86/apic/flat64: Add back the early_param("apic", parse_apic)
parse_apic() allows the user to try a different APIC driver than the default one that's automatically chosen. It works for X86-32, but doesn't work for X86-64 because it was removed in 2009 for X86-64 by commit 7b38725318f4 ("x86: remove subarchitecture support code"), whose changelog doesn't explicitly describe the removal for X86-64.
The patch adds back the functionality for X86-64. The intent is mainly to work around an APIC emulation bug in Hyper-V in the case of kdump:
currently Hyper-V does not honor the disabled state of the local APICs, so all the IOAPIC-based interrupts may not be delivered to the correct virtual CPU, if the logical-mode APIC driver is used (the kdump kernel usually uses the logical-mode APIC driver, since typically only 1 CPU is active). Luckily the kdump issue can be worked around by forcing the kdump kernel to use physical mode, before the fix to Hyper-V becomes widely available.
The current algorithm of choosing an APIC driver is:
1. The global pointer "struct apic *apic" has a default value, i.e "apic_default" on X86-32, and "apic_flat" on X86-64.
2. If the early_param "apic=" is specified, parse_apic() is called and the pointer "apic" is changed if a matching APIC driver is found.
3. default_acpi_madt_oem_check() calls the acpi_madt_oem_check() method of all APIC drivers, which may override the "apic" pointer.
4. default_setup_apic_routing() may override the "apic" pointer, e.g. by calling the probe() method of all APIC drivers. Note: refer to the order of the APIC drivers specified in arch/x86/kernel/apic/Makefile.
The patch is safe because if the apic= early param is not specified, the current algorithm of choosing an APIC driver is unchanged; when the param is specified (e.g. on X86-64, "apic=physical flat"), the kernel still tries to find a "more suitable" APIC driver in the above step 3 and 4: e.g. if the BIOS/firmware requires that apic_x2apic_phys should be used, the above step 4 will override the APIC driver to apic_x2apic_phys, even if an early_param "apic=physical flat" is specified.
On Hyper-V, when a Linux VM has <= 8 virtual CPUs, if we use "apic=physical flat", sending IPIs to multiple vCPUs is still fast because Linux VM uses the para-virtualized IPI hypercalls: see hv_apic_init().
---
Changes in v2:
Updated Documentation/admin-guide/kernel-parameters.txt. [Randy Dunlap] Changed apic_set_verbosity().
Enhanced the changelog.
.../admin-guide/kernel-parameters.txt | 11 +++++--- arch/x86/kernel/apic/apic.c | 11 +++----- arch/x86/kernel/apic/apic_flat_64.c | 27 ++++++++++++++++++- 3 files changed, 38 insertions(+), 11 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +8 -3
@@ -341,10 +341,15 @@ Format: { quiet (default) | verbose | debug } Change the amount of debugging information output when initialising the APIC and IO-APIC components. - For X86-32, this can also be used to specify an APIC - driver name. + This can also be used to specify an APIC driver name. Format: apic=driver_name - Examples: apic=bigsmp + Examples: + On X86-32: apic=bigsmp + On X86-64: "apic=physical flat" + Note: the available driver names depend on the + architecture and the kernel config; the setting may + be overridden by the acpi_madt_oem_check() and probe() + methods of other APIC drivers. apic_extnmi= [APIC,X86] External NMI delivery setting Format: { bsp (default) | all | none }
arch/x86/kernel/apic/apic.c +4 -7
@@ -2854,13 +2854,10 @@ static int __init apic_set_verbosity(char *arg) apic_verbosity =APIC_DEBUG ; else if (strcmp("verbose", arg) == 0) apic_verbosity =APIC_VERBOSE ; -#ifdef CONFIG_X86_64 - else { -pr_warn ("APIC Verbosity level %s not recognised" -" use apic=verbose or apic=debug\n" , arg); -return -EINVAL ; - } -#endif + +/* Ignore unrecognized verbosity level setting. */ + +pr_info ("APIC Verbosity level is %d\n" , apic_verbosity);return 0 ; }
arch/x86/kernel/apic/apic_flat_64.c +26 -1
@@ -23,9 +23,34 @@ static struct apic apic_flat;struct apic *apic__ro_after_init = &apic_flat;EXPORT_SYMBOL_GPL (apic); +static int cmdline_apic__initdata ; +static int __init parse_apic (char *arg) +{ +struct apic **drv; + +if (!arg) +return -EINVAL ; + +for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) { +if (!strcmp ((*drv)->name, arg)) { + apic = *drv; + cmdline_apic =1 ; +return 0 ; + } + } + +/* Parsed again by __setup for debug/verbose */ +return 0 ; +} +early_param ("apic" , parse_apic); + +static int flat_acpi_madt_oem_check (char *oem_id,char *oem_table_id) { -return 1 ; +if (!cmdline_apic) +return 1 ; + +return apic == &apic_flat; }/*
Signature · 1 line
2.19.1