x86: remove paravirt_enabled()
Subsystems (8)
v5 cover x86: remove paravirt_enabled()
This v5 updates the subarch documentation to annotate that X86_SUBARCH_XEN can be use for both Xen dom0 and domU, and adds an optional x86_platform.set_legacy_features() in order to deal with further platform legacy fine tunings when the platform requires further semantics than what is currently available generically, and we've determined we don't need these semantics added in a generic form to x86. In this case this was needed for Xen given X86_SUBARCH_XEN can be used for both dom0 and domU and Xen needs to enable RTC for dom0.
I suspect the hook can possibly later be used for further fine tunings for HVMLite as it will use X86_SUBARCH_PC, so its placed towards the end of x86_early_init_platform_quirks() to enable any platform to take advantage of this.
This also updates the commit logs a bit more to make some clarifications, and lists the impact of vmlinux size as per trusty good 'ol 0-day.
The total size impact on vmlinux using i386-tinyconfig:
TOTAL TEXT init.text x86_early_init_platform_quirks() +136 +125 +125 +96
In total that's only 11 byte overhead, 125 bytes are all .init.text and that's all freed after boot.
Luis R. Rodriguez (14):
x86/boot: enumerate documentation for the x86 hardware_subarch x86/xen: use X86_SUBARCH_XEN for PV guest boots tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly x86/rtc: replace paravirt rtc check with platform legacy quirk x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code x86/init: use a platform legacy quirk for ebda tools/lguest: force disable tboot and apm
apm32: remove paravirt_enabled() use
x86/tboot: remove paravirt_enabled()
x86/cpu/intel: remove not needed paravirt_enabled() for f00f work
around
pnpbios: replace paravirt_enabled() check with legacy device check x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES
x86/init: rename ebda code file
x86/paravirt: remove paravirt_enabled()
arch/x86/Makefile | 3 ++-
arch/x86/include/asm/paravirt.h | 11 --------
arch/x86/include/asm/paravirt_types.h | 6 -----
arch/x86/include/asm/processor.h | 2 --
arch/x86/include/asm/x86_init.h | 50 +++++++++++++++++++++++++++++++++++
arch/x86/include/uapi/asm/bootparam.h | 37 +++++++++++++++++++++++++-
arch/x86/kernel/Makefile | 6 ++++-
arch/x86/kernel/acpi/boot.c | 9 +++++++
arch/x86/kernel/apm_32.c | 2 +-
arch/x86/kernel/cpu/intel.c | 2 +-
arch/x86/kernel/{head.c => ebda.c} | 2 +-
arch/x86/kernel/head32.c | 2 ++
arch/x86/kernel/head64.c | 1 +
arch/x86/kernel/kvm.c | 8 ------
arch/x86/kernel/paravirt.c | 1 -
arch/x86/kernel/platform-quirks.c | 36 +++++++++++++++++++++++++
arch/x86/kernel/rtc.c | 15 ++---------
arch/x86/kernel/tboot.c | 6 -----
arch/x86/lguest/boot.c | 3 ---
arch/x86/xen/enlighten.c | 12 ++++++---
drivers/pnp/pnpbios/core.c | 3 ++-
include/linux/pnp.h | 2 ++
tools/lguest/lguest.c | 10 +++++--
23 files changed, 166 insertions(+), 63 deletions(-)
rename arch/x86/kernel/{head.c => ebda.c} (98%)
create mode 100644 arch/x86/kernel/platform-quirks.cSignature · 1 line
2.7.2
PATCH v5 1/14 x86/boot: enumerate documentation for the x86 hardware_subarch
Although hardware_subarch has been in place since the x86 boot protocol 2.07 it hasn't been used much. Enumerate current possible values to avoid misuses and help with semantics later at boot time should this be used further.
These enums should only ever be used by architecture x86 code, and all that code should be well contained and compartamentalized, clarify that as well.
v2: updates documentation further -- be a bit more pedantic about
annotating care and use of these guys.
v3: Use s/SOC/SoC and also anntoate that both domU and dom0 are
both currently supported through the PV boot path.
--- arch/x86/include/uapi/asm/bootparam.h | 37 ++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
arch/x86/include/uapi/asm/bootparam.h +36 -1
@@ -157,7 +157,42 @@ struct boot_params {__u8 _pad9[276 ];/* 0xeec */ } __attribute__((packed)); -enum { +/** +* enum x86_hardware_subarch - x86 hardware subarchitecture +* +* The x86 hardware_subarch and hardware_subarch_data were added as of the x86 +* boot protocol 2.07 to help distinguish and support custom x86 boot +* sequences. This enum represents accepted values for the x86 +* hardware_subarch. Custom x86 boot sequences (not X86_SUBARCH_PC) do not +* have or simply *cannot* make use of natural stubs like BIOS or EFI, the +* hardware_subarch can be used on the Linux entry path to revector to a +* subarchitecture stub when needed. This subarchitecture stub can be used to +* set up Linux boot parameters or for special care to account for nonstandard +* handling of page tables. +* +* These enums should only ever be used by x86 code, and the code that uses +* it should be well contained and compartamentalized. +* +* KVM and Xen HVM do not have a subarch as these are expected to follow +* standard x86 boot entries. If there is a genuine need for "hypervisor" type +* that should be considered separately in the future. Future guest types +* should seriously consider working with standard x86 boot stubs such as +* the BIOS or EFI boot stubs. +* +* @X86_SUBARCH_PC: Should be used if the hardware is enumerable using standard +* PC mechanisms (PCI, ACPI) and doesn't need a special boot flow. +* @X86_SUBARCH_LGUEST: Used for x86 hypervisor demo, lguest +* @X86_SUBARCH_XEN: Used for Xen guest types which follow the PV boot path, +* which start at asm startup_xen() entry point and later jump to the C +* xen_start_kernel() entry point. Both domU and dom0 type of guests are +* currently supportd through this PV boot path. +* @X86_SUBARCH_INTEL_MID: Used for Intel MID (Mobile Internet Device) platform +* systems which do not have the PCI legacy interfaces. +* @X86_SUBARCH_CE4100: Used for Intel CE media processor (CE4100) SoC for +* for settop boxes and media devices, the use of a subarch for CE4100 +* is more of a hack... +*/ +enum x86_hardware_subarch {X86_SUBARCH_PC =0 ,X86_SUBARCH_LGUEST ,X86_SUBARCH_XEN ,
Signature · 1 line
2.7.2
Re: [PATCH v5 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch
Quoted 25 lines · Luis R. Rodriguez
Although
hardware_subarchhas been in place since the x86 boot protocol 2.07 it hasn't been used much. Enumerate current possible values to avoid misuses and help with semantics later at boot time should this be used further.These enums should only ever be used by architecture x86 code, and all that code should be well contained and compartamentalized, clarify that as well.
v2: updates documentation further -- be a bit more pedantic about
annotating care and use of these guys.
v3: Use s/SOC/SoC and also anntoate that both domU and dom0 are
both currently supported through the PV boot path.Cc Andy Shevchenko <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>--- arch/x86/include/uapi/asm/bootparam.h | 37 ++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)arch/x86/include/uapi/asm/bootparam.h +0
-0
arch/x86/include/uapi/asm/bootparam.h struct boot_params { · line 161
Quoted 6 lines
arch/x86/include/uapi/asm/bootparam.h +2
-1@@ -157,7 +157,42 @@ struct boot_params {__u8 _pad9[276 ];/* 0xeec */ } __attribute__((packed)); -enum { +/** +* enum x86_hardware_subarch - x86 hardware subarchitecture
Could you add some prominent warning here, like:
arch/x86/include/uapi/asm/bootparam.h struct boot_params { · line 164
Quoted 3 lines
arch/x86/include/uapi/asm/bootparam.h +3
-0+* WARNING: the 'x86 subarch flag' is only used for legacy hacks, for platform +* features that are not easily enumerated or discoverable. You should +* not ever use this for new features.
Thanks,
Ingo
Re: [PATCH v5 01/14] x86/boot: enumerate documentation for the x86 hardware_subarch
Quoted 8 lines · Ingo Molnar
Quoted 8 lines
arch/x86/include/uapi/asm/bootparam.h +0
-0@@ -157,7 +157,42 @@ struct boot_params {__u8 _pad9[276 ];/* 0xeec */ } __attribute__((packed));
Quoted 9 lines
arch/x86/include/uapi/asm/bootparam.h struct boot_params { · line 161
Quoted 3 lines
arch/x86/include/uapi/asm/bootparam.h +2
-1-enum { +/** +* enum x86_hardware_subarch - x86 hardware subarchitecture Could you add some prominent warning here, like:
Quoted 3 lines
arch/x86/include/uapi/asm/bootparam.h +3
-0+* WARNING: the 'x86 subarch flag' is only used for legacy hacks, for platform +* features that are not easily enumerated or discoverable. You should +* not ever use this for new features.
With pleasure, added.
Luis
PATCH v5 2/14 x86/xen: use X86_SUBARCH_XEN for PV guest boots
In reply to Luis R. RodriguezThe use of subarch should have no current effect on Xen PV guests, as such this should have no current functional effects.
--- arch/x86/xen/enlighten.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/xen/enlighten.c +1 -0
@@ -1661,6 +1661,7 @@ asmlinkage __visible void __init xen_start_kernel(void) boot_params.hdr.ramdisk_image = initrd_start; boot_params.hdr.ramdisk_size = xen_start_info->mod_len; boot_params.hdr.cmd_line_ptr =__pa (xen_start_info->cmd_line); + boot_params.hdr.hardware_subarch =X86_SUBARCH_XEN ;if (!xen_initial_domain ()) {add_preferred_console ("xenboot" ,0 ,NULL );
Signature · 1 line
2.7.2
PATCH v5 2/14 x86/xen: use X86_SUBARCH_XEN for PV guest boots
In reply to Luis R. RodriguezThe use of subarch should have no current effect on Xen PV guests, as such this should have no current functional effects.
--- arch/x86/xen/enlighten.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/xen/enlighten.c +1 -0
@@ -1661,6 +1661,7 @@ asmlinkage __visible void __init xen_start_kernel(void) boot_params.hdr.ramdisk_image = initrd_start; boot_params.hdr.ramdisk_size = xen_start_info->mod_len; boot_params.hdr.cmd_line_ptr =__pa (xen_start_info->cmd_line); + boot_params.hdr.hardware_subarch =X86_SUBARCH_XEN ;if (!xen_initial_domain ()) {add_preferred_console ("xenboot" ,0 ,NULL );
Signature · 1 line
2.7.2
PATCH v5 3/14 tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly
In reply to Luis R. RodriguezBe explicit and make use of X86_SUBARCH_LGUEST directly.
--- tools/lguest/lguest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lguest/lguest.c +2 -2
@@ -3351,8 +3351,8 @@ int main(int argc, char *argv[])/* Boot protocol version: 2.07 supports the fields for lguest. */ boot->hdr.version =0x207 ; -/* The hardware_subarch value of "1" tells the Guest it's an lguest. */ - boot->hdr.hardware_subarch =1 ; +/* X86_SUBARCH_LGUEST tells the Guest it's an lguest. */ + boot->hdr.hardware_subarch =X86_SUBARCH_LGUEST ;/* Tell the entry path not to try to reload segment registers. */ boot->hdr.loadflags |=KEEP_SEGMENTS ;
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 4/14 x86/rtc: replace paravirt rtc check with platform legacy quirk
In reply to Luis R. RodriguezWe have 4 types of x86 platforms that disable RTC:
* Intel MID
* Lguest - uses paravirt
* Xen dom-U - uses paravirt
* x86 on legacy systems annotated with an ACPI legacy flag
We can consolidate all of these into a platform specific legacy quirk set early in boot through i386_start_kernel() and through x86_64_start_reservations(). This deals with the RTC quirks which we can rely on through the hardware subarch, the ACPI check can be dealt with separately.
For Xen things are bit more complex given that the @X86_SUBARCH_XEN x86_hardware_subarch is shared on for Xen which uses the PV path for both domU and dom0. Since the semantics for differentiating between the two are Xen specific we provide a platform helper to help override default legacy features -- x86_platform.set_legacy_features(). Use of this helper is highly discouraged, its only purpose should be to account for the lack of semantics available within your given x86_hardware_subarch.
As per 0-day, this bumps the vmlinux size using i386-tinyconfig as follows:
TOTAL TEXT init.text x86_early_init_platform_quirks() +70 +62 +62 +43
Only 8 bytes overhead total, as the main increase in size is all removed via __init.
v2: split the subarch check from the ACPI check, clarify
on the ACPI change commit log why ordering works
v3: add x86_platform.set_legacy_features() to account for dom0,
add also size impact on vmlinux as per 0-day report
--- arch/x86/Makefile | 1 + arch/x86/include/asm/paravirt.h | 6 ------ arch/x86/include/asm/paravirt_types.h | 5 ----- arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/x86_init.h | 21 +++++++++++++++++++++ arch/x86/kernel/Makefile | 6 +++++- arch/x86/kernel/head32.c | 2 ++ arch/x86/kernel/head64.c | 1 + arch/x86/kernel/platform-quirks.c | 21 +++++++++++++++++++++ arch/x86/kernel/rtc.c | 7 ++----- arch/x86/lguest/boot.c | 1 - arch/x86/xen/enlighten.c | 10 +++++++--- 12 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 arch/x86/kernel/platform-quirks.c
arch/x86/Makefile +1 -0
@@ -209,6 +209,7 @@ endif head-y := arch/x86/kernel/head_$(BITS).o head-y += arch/x86/kernel/head$(BITS).o head-y += arch/x86/kernel/head.o +head-y += arch/x86/kernel/platform-quirks.o libs-y += arch/x86/lib/
arch/x86/include/asm/paravirt.h +0 -6
@@ -20,12 +20,6 @@ static inline int paravirt_enabled(void)return pv_info.paravirt_enabled; } -static inline int paravirt_has_feature (unsigned int feature) -{ -WARN_ON_ONCE (!pv_info.paravirt_enabled); -return (pv_info.features & feature); -} -static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread) {
arch/x86/include/asm/paravirt_types.h +0 -5
@@ -70,14 +70,9 @@ struct pv_info {#endif int paravirt_enabled; -unsigned int features;/* valid only if paravirt_enabled is set */ const char *name; }; -#define paravirt_has (x) paravirt_has_feature(PV_SUPPORTED_##x) -/* Supported features */ -#define PV_SUPPORTED_RTC (1<<0) -struct pv_init_ops {/* * Patch may replace one of the defined code sequences with
arch/x86/include/asm/processor.h +0 -1
@@ -474,7 +474,6 @@ static inline unsigned long current_top_of_stack(void)#else #define __cpuid native_cpuid#define paravirt_enabled () 0 -#define paravirt_has (x) 0static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread)
arch/x86/include/asm/x86_init.h +21 -0
@@ -142,6 +142,15 @@ struct x86_cpuinit_ops {struct timespec ;/** +* struct x86_legacy_features - legacy x86 features +* +* @rtc: this device has a CMOS real-time clock present +*/ +struct x86_legacy_features { +int rtc; +}; + +/** * struct x86_platform_ops - platform specific runtime functions * @calibrate_tsc: calibrate TSC * @get_wallclock: get time from HW clock like RTC etc.
@@ -152,6 +161,14 @@ struct timespec;* @save_sched_clock_state: save state for sched_clock() on suspend * @restore_sched_clock_state: restore state for sched_clock() on resume * @apic_post_init: adjust apic if neeeded +* @legacy: legacy features +* @set_legacy_features: override legacy features. Use of this callback +* is highly discouraged. You should only need +* this if your hardware platform requires further +* custom fine tuning far beyong what may be +* possible in x86_early_init_platform_quirks() by +* only using the current x86_hardware_subarch +* semantics. */ struct x86_platform_ops {unsigned long (*calibrate_tsc)(void );
@@ -165,6 +182,8 @@ struct x86_platform_ops {void (*save_sched_clock_state)(void );void (*restore_sched_clock_state)(void );void (*apic_post_init)(void ); +struct x86_legacy_features legacy; +void (*set_legacy_features)(void ); };struct pci_dev ;
@@ -186,6 +205,8 @@ extern struct x86_cpuinit_ops x86_cpuinit;extern struct x86_platform_ops x86_platform;extern struct x86_msi_ops x86_msi;extern struct x86_io_apic_ops x86_io_apic_ops; + +extern void x86_early_init_platform_quirks (void );extern void x86_init_noop (void );extern void x86_init_uint_noop (unsigned int unused);
arch/x86/kernel/Makefile +5 -1
@@ -2,7 +2,11 @@ # Makefile for the linux kernel. # -extra-y := head_$(BITS).o head$(BITS).o head.o vmlinux.lds +extra-y := head_$(BITS).o +extra-y += head$(BITS).o +extra-y += head.o +extra-y += platform-quirks.o +extra-y += vmlinux.lds CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
arch/x86/kernel/head32.c +2 -0
@@ -34,6 +34,8 @@ asmlinkage __visible void __init i386_start_kernel(void)cr4_init_shadow ();sanitize_boot_params (&boot_params); +x86_early_init_platform_quirks (); +/* Call the subarch specific early setup function */ switch (boot_params.hdr.hardware_subarch) {case X86_SUBARCH_INTEL_MID :
arch/x86/kernel/head64.c +1 -0
@@ -182,6 +182,7 @@ void __init x86_64_start_reservations(char *real_mode_data)if (!boot_params.hdr.version)copy_bootdata (__va (real_mode_data)); +x86_early_init_platform_quirks ();reserve_ebda_region ();switch (boot_params.hdr.hardware_subarch) {
arch/x86/kernel/platform-quirks.c new file +21 -0
@@ -0,0 +1,21 @@ +#include <linux/kernel.h> +#include <linux/init.h> + +#include <asm/setup.h> +#include <asm/bios_ebda.h> + +void __init x86_early_init_platform_quirks (void ) +{ + x86_platform.legacy.rtc =1 ; + +switch (boot_params.hdr.hardware_subarch) { +case X86_SUBARCH_XEN : +case X86_SUBARCH_LGUEST : +case X86_SUBARCH_INTEL_MID : + x86_platform.legacy.rtc =0 ; +break ; + } + +if (x86_platform.set_legacy_features) + x86_platform.set_legacy_features (); +}
arch/x86/kernel/rtc.c +2 -5
@@ -14,6 +14,7 @@#include <asm/time.h> #include <asm/intel-mid.h> #include <asm/rtc.h> +#include <asm/setup.h> #ifdef CONFIG_X86_32 /*
@@ -188,10 +189,6 @@ static __init int add_rtc_cmos(void)if (of_have_populated_dt ())return 0 ; -/* Intel MID platforms don't have ioport rtc */ -if (intel_mid_identify_cpu ()) -return -ENODEV ; -#ifdef CONFIG_ACPI if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) {/* This warning can likely go away again in a year or two. */
@@ -200,7 +197,7 @@ static __init int add_rtc_cmos(void) }#endif -if (paravirt_enabled () && !paravirt_has (RTC )) +if (!x86_platform.legacy.rtc)return -ENODEV ;platform_device_register (&rtc_device);
arch/x86/lguest/boot.c +0 -1
@@ -1414,7 +1414,6 @@ __init void lguest_init(void) pv_info.kernel_rpl =1 ;/* Everyone except Xen runs with this set. */ pv_info.shared_kernel_pmd =1 ; - pv_info.features =0 ;/* * We set up all the lguest overrides for sensitive operations. These
arch/x86/xen/enlighten.c +7 -3
@@ -1192,7 +1192,6 @@ static const struct pv_info xen_info __initconst = {#ifdef CONFIG_X86_64 .extra_user_64bit_cs = FLAT_USER_CS64, #endif - .features = 0, .name = "Xen", };
@@ -1505,6 +1504,11 @@ static void __init xen_pvh_early_guest_init(void) }#endif /* CONFIG_XEN_PVH */ +static void xen_dom0_set_legacy_features (void ) +{ + x86_platform.legacy.rtc =1 ; +} +/* First C function to be called on Xen boot */ asmlinkage __visible void __init xen_start_kernel(void) {
@@ -1525,8 +1529,6 @@ asmlinkage __visible void __init xen_start_kernel(void)/* Install Xen paravirt ops */ pv_info = xen_info; -if (xen_initial_domain ()) - pv_info.features |=PV_SUPPORTED_RTC ; pv_init_ops = xen_init_ops;if (!xen_pvh_domain ()) { pv_cpu_ops = xen_cpu_ops;
@@ -1679,6 +1681,8 @@ asmlinkage __visible void __init xen_start_kernel(void) .u.firmware_info.type = XEN_FW_KBD_SHIFT_FLAGS, }; + x86_platform.set_legacy_features = + xen_dom0_set_legacy_features;xen_init_vga (info, xen_start_info->console.dom0.info_size); xen_start_info->console.domU.mfn =0 ; xen_start_info->console.domU.evtchn =0 ;
Signature · 1 line
2.7.2
Juergen Gross
maintainerRe: [Xen-devel] [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk
Quoted 22 lines · Luis R. Rodriguez
We have 4 types of x86 platforms that disable RTC:
* Intel MID
* Lguest - uses paravirt
* Xen dom-U - uses paravirt
* x86 on legacy systems annotated with an ACPI legacy flagWe can consolidate all of these into a platform specific legacy quirk set early in boot through
i386_start_kernel()and throughx86_64_start_reservations(). This deals with the RTC quirks which we can rely on through the hardware subarch, the ACPI check can be dealt with separately.For Xen things are bit more complex given that the @X86_SUBARCH_XEN
x86_hardware_subarchis shared on for Xen which uses the PV path for both domU and dom0. Since the semantics for differentiating between the two are Xen specific we provide a platform helper to help override default legacy features --x86_platform.set_legacy_features(). Use of this helper is highly discouraged, its only purpose should be to account for the lack of semantics available within your givenx86_hardware_subarch.
Quoted 8 lines
As per 0-day, this bumps the vmlinux size using i386-tinyconfig as follows:
TOTAL TEXT init.text x86_early_init_platform_quirks() +70 +62 +62 +43Only 8 bytes overhead total, as the main increase in size is all removed via
__init.
I think this could be even less (see comment below).
Quoted 5 lines
v2: split the subarch check from the ACPI check, clarify
on the ACPI change commit log why ordering works
v3: addx86_platform.set_legacy_features()to account for dom0,
add also size impact on vmlinux as per 0-day report
You missed the v5 changes here.
Quoted 258 lines
Suggested-by Ingo Molnar <[email protected]>Signed-off-by Luis R. Rodriguez <[email protected]>--- arch/x86/Makefile | 1 + arch/x86/include/asm/paravirt.h | 6 ------ arch/x86/include/asm/paravirt_types.h | 5 ----- arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/x86_init.h | 21 +++++++++++++++++++++ arch/x86/kernel/Makefile | 6 +++++- arch/x86/kernel/head32.c | 2 ++ arch/x86/kernel/head64.c | 1 + arch/x86/kernel/platform-quirks.c | 21 +++++++++++++++++++++ arch/x86/kernel/rtc.c | 7 ++----- arch/x86/lguest/boot.c | 1 - arch/x86/xen/enlighten.c | 10 +++++++--- 12 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 arch/x86/kernel/platform-quirks.carch/x86/Makefile +1
-0@@ -209,6 +209,7 @@ endif head-y := arch/x86/kernel/head_$(BITS).o head-y += arch/x86/kernel/head$(BITS).o head-y += arch/x86/kernel/head.o +head-y += arch/x86/kernel/platform-quirks.o libs-y += arch/x86/lib/arch/x86/include/asm/paravirt.h +0
-6@@ -20,12 +20,6 @@ static inline int paravirt_enabled(void)return pv_info.paravirt_enabled; } -static inline int paravirt_has_feature (unsigned int feature) -{ -WARN_ON_ONCE (!pv_info.paravirt_enabled); -return (pv_info.features & feature); -} -static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread) {arch/x86/include/asm/paravirt_types.h +0
-5@@ -70,14 +70,9 @@ struct pv_info {#endif int paravirt_enabled; -unsigned int features;/* valid only if paravirt_enabled is set */ const char *name; }; -#define paravirt_has (x) paravirt_has_feature(PV_SUPPORTED_##x) -/* Supported features */ -#define PV_SUPPORTED_RTC (1<<0) -struct pv_init_ops {/* * Patch may replace one of the defined code sequences with arch/x86/include/asm/processor.h +0
-1@@ -474,7 +474,6 @@ static inline unsigned long current_top_of_stack(void)#else #define __cpuid native_cpuid#define paravirt_enabled () 0 -#define paravirt_has (x) 0static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread)arch/x86/include/asm/x86_init.h +21
-0@@ -142,6 +142,15 @@ struct x86_cpuinit_ops {struct timespec ;/** +* struct x86_legacy_features - legacy x86 features +* +* @rtc: this device has a CMOS real-time clock present +*/ +struct x86_legacy_features { +int rtc; +}; + +/** * struct x86_platform_ops - platform specific runtime functions * @calibrate_tsc: calibrate TSC * @get_wallclock: get time from HW clock like RTC etc. @@ -152,6 +161,14 @@ struct timespec;* @save_sched_clock_state: save state for sched_clock() on suspend * @restore_sched_clock_state: restore state for sched_clock() on resume * @apic_post_init: adjust apic if neeeded +* @legacy: legacy features +* @set_legacy_features: override legacy features. Use of this callback +* is highly discouraged. You should only need +* this if your hardware platform requires further +* custom fine tuning far beyong what may be +* possible in x86_early_init_platform_quirks() by +* only using the current x86_hardware_subarch +* semantics. */ struct x86_platform_ops {unsigned long (*calibrate_tsc)(void );@@ -165,6 +182,8 @@ struct x86_platform_ops {void (*save_sched_clock_state)(void );void (*restore_sched_clock_state)(void );void (*apic_post_init)(void ); +struct x86_legacy_features legacy; +void (*set_legacy_features)(void ); };struct pci_dev ;@@ -186,6 +205,8 @@ extern struct x86_cpuinit_ops x86_cpuinit;extern struct x86_platform_ops x86_platform;extern struct x86_msi_ops x86_msi;extern struct x86_io_apic_ops x86_io_apic_ops; + +extern void x86_early_init_platform_quirks (void );extern void x86_init_noop (void );extern void x86_init_uint_noop (unsigned int unused);arch/x86/kernel/Makefile +5
-1@@ -2,7 +2,11 @@ # Makefile for the linux kernel. # -extra-y := head_$(BITS).o head$(BITS).o head.o vmlinux.lds +extra-y := head_$(BITS).o +extra-y += head$(BITS).o +extra-y += head.o +extra-y += platform-quirks.o +extra-y += vmlinux.lds CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)arch/x86/kernel/head32.c +2
-0@@ -34,6 +34,8 @@ asmlinkage __visible void __init i386_start_kernel(void)cr4_init_shadow ();sanitize_boot_params (&boot_params); +x86_early_init_platform_quirks (); +/* Call the subarch specific early setup function */ switch (boot_params.hdr.hardware_subarch) {case X86_SUBARCH_INTEL_MID :arch/x86/kernel/head64.c +1
-0@@ -182,6 +182,7 @@ void __init x86_64_start_reservations(char *real_mode_data)if (!boot_params.hdr.version)copy_bootdata (__va (real_mode_data)); +x86_early_init_platform_quirks ();reserve_ebda_region ();switch (boot_params.hdr.hardware_subarch) {arch/x86/kernel/platform-quirks.c new file +21
-0@@ -0,0 +1,21 @@ +#include <linux/kernel.h> +#include <linux/init.h> + +#include <asm/setup.h> +#include <asm/bios_ebda.h> + +void __init x86_early_init_platform_quirks (void ) +{ + x86_platform.legacy.rtc =1 ; + +switch (boot_params.hdr.hardware_subarch) { +case X86_SUBARCH_XEN : +case X86_SUBARCH_LGUEST : +case X86_SUBARCH_INTEL_MID : + x86_platform.legacy.rtc =0 ; +break ; + } + +if (x86_platform.set_legacy_features) + x86_platform.set_legacy_features (); +}arch/x86/kernel/rtc.c +2
-5@@ -14,6 +14,7 @@#include <asm/time.h> #include <asm/intel-mid.h> #include <asm/rtc.h> +#include <asm/setup.h> #ifdef CONFIG_X86_32 /* @@ -188,10 +189,6 @@ static __init int add_rtc_cmos(void)if (of_have_populated_dt ())return 0 ; -/* Intel MID platforms don't have ioport rtc */ -if (intel_mid_identify_cpu ()) -return -ENODEV ; -#ifdef CONFIG_ACPI if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) {/* This warning can likely go away again in a year or two. */ @@ -200,7 +197,7 @@ static __init int add_rtc_cmos(void) }#endif -if (paravirt_enabled () && !paravirt_has (RTC )) +if (!x86_platform.legacy.rtc)return -ENODEV ;platform_device_register (&rtc_device);arch/x86/lguest/boot.c +0
-1@@ -1414,7 +1414,6 @@ __init void lguest_init(void) pv_info.kernel_rpl =1 ;/* Everyone except Xen runs with this set. */ pv_info.shared_kernel_pmd =1 ; - pv_info.features =0 ;/* * We set up all the lguest overrides for sensitive operations. These arch/x86/xen/enlighten.c +0
-1@@ -1192,7 +1192,6 @@ static const struct pv_info xen_info __initconst = {#ifdef CONFIG_X86_64 .extra_user_64bit_cs = FLAT_USER_CS64, #endif - .features = 0, .name = "Xen", };
arch/x86/xen/enlighten.c static void __init xen_pvh_early_guest_init(void) · line 1507
Quoted 4 lines
arch/x86/xen/enlighten.c +1
-0@@ -1505,6 +1504,11 @@ static void __init xen_pvh_early_guest_init(void) }#endif /* CONFIG_XEN_PVH */ +static void xen_dom0_set_legacy_features (void )
Can't you make this __init ?
Quoted 18 lines
arch/x86/xen/enlighten.c +4
-2+{ + x86_platform.legacy.rtc =1 ; +} +/* First C function to be called on Xen boot */ asmlinkage __visible void __init xen_start_kernel(void) {@@ -1525,8 +1529,6 @@ asmlinkage __visible void __init xen_start_kernel(void)/* Install Xen paravirt ops */ pv_info = xen_info; -if (xen_initial_domain ()) - pv_info.features |=PV_SUPPORTED_RTC ; pv_init_ops = xen_init_ops;if (!xen_pvh_domain ()) { pv_cpu_ops = xen_cpu_ops;
arch/x86/xen/enlighten.c asmlinkage __visible void __init xen_start_kernel(void) · line 1688
Quoted 8 lines
arch/x86/xen/enlighten.c +2
-0@@ -1679,6 +1681,8 @@ asmlinkage __visible void __init xen_start_kernel(void) .u.firmware_info.type = XEN_FW_KBD_SHIFT_FLAGS, }; + x86_platform.set_legacy_features = + xen_dom0_set_legacy_features;xen_init_vga (info, xen_start_info->console.dom0.info_size); xen_start_info->console.domU.mfn =0 ; xen_start_info->console.domU.evtchn =0 ;
Juergen
Re: [Xen-devel] [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk
Quoted 26 lines · Juergen Gross
Quoted 25 lines · Luis R. Rodriguez
We have 4 types of x86 platforms that disable RTC:
* Intel MID
* Lguest - uses paravirt
* Xen dom-U - uses paravirt
* x86 on legacy systems annotated with an ACPI legacy flagWe can consolidate all of these into a platform specific legacy quirk set early in boot through
i386_start_kernel()and throughx86_64_start_reservations(). This deals with the RTC quirks which we can rely on through the hardware subarch, the ACPI check can be dealt with separately.For Xen things are bit more complex given that the @X86_SUBARCH_XEN
x86_hardware_subarchis shared on for Xen which uses the PV path for both domU and dom0. Since the semantics for differentiating between the two are Xen specific we provide a platform helper to help override default legacy features --x86_platform.set_legacy_features(). Use of this helper is highly discouraged, its only purpose should be to account for the lack of semantics available within your givenx86_hardware_subarch.As per 0-day, this bumps the vmlinux size using i386-tinyconfig as follows:
Quoted 7 lines
Quoted 5 lines
TOTAL TEXT init.text x86_early_init_platform_quirks() +70 +62 +62 +43Only 8 bytes overhead total, as the main increase in size is all removed via
__init.I think this could be even less (see comment below).
Indeed.
Quoted 8 lines
Quoted 6 lines
v2: split the subarch check from the ACPI check, clarify
on the ACPI change commit log why ordering works
v3: addx86_platform.set_legacy_features()to account for dom0,
add also size impact on vmlinux as per 0-day reportYou missed the v5 changes here.
Sorry this was a mismatch, the v3 notes are the v5 notes, the discrepancy between this and the subject was that the patches have changed over time to be split out on their own and so iterations have been meshed / split, etc.. I'll just update the accounting to match the subject next.
In next replies it would really help if you trim your review on patches by removing context of the e-mail for hunks / file without feedback, and only keep the file name / hunk for which you are commenting on.
For instance:
Quoted 12 lines
Quoted 12 lines
arch/x86/xen/enlighten.c +0
-1@@ -1192,7 +1192,6 @@ static const struct pv_info xen_info __initconst = {#ifdef CONFIG_X86_64 .extra_user_64bit_cs = FLAT_USER_CS64, #endif - .features = 0, .name = "Xen", };
Quoted 7 lines
arch/x86/xen/enlighten.c static void __init xen_pvh_early_guest_init(void) · line 1507
Quoted 5 lines
arch/x86/xen/enlighten.c +1
-0@@ -1505,6 +1504,11 @@ static void __init xen_pvh_early_guest_init(void) }#endif /* CONFIG_XEN_PVH */ +static void xen_dom0_set_legacy_features (void )Can't you make this
__init?
Indeed, will change.
Luis
Re: [Xen-devel] [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk
Quoted 8 lines · Luis R. Rodriguez
Quoted 7 lines · Juergen Gross
Quoted 5 lines · Luis R. Rodriguez
TOTAL TEXT init.text x86_early_init_platform_quirks() +70 +62 +62 +43Only 8 bytes overhead total, as the main increase in size is all removed via
__init.
Quoted 7 lines
Quoted 5 lines
I think this could be even less
Quoted 1 line
+static void
xen_dom0_set_legacy_features(void)Can't you make this
__init?Indeed, will change.
0-day tests indicates no size gains, that might be a build cache issue not sure. Either way, will fold the __init change into a v6.
Luis
Boris Ostrovsky
reviewerRe: [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk
In reply to Luis R. RodriguezOn 04/08/2016 07:40 PM, Luis R. Rodriguez wrote:
arch/x86/include/asm/x86_init.h +18 -0
@@ -142,6 +142,15 @@ struct x86_cpuinit_ops {struct timespec ;/** +* struct x86_legacy_features - legacy x86 features +* +* @rtc: this device has a CMOS real-time clock present +*/ +struct x86_legacy_features { +int rtc; +}; + +/** * struct x86_platform_ops - platform specific runtime functions * @calibrate_tsc: calibrate TSC * @get_wallclock: get time from HW clock like RTC etc.
@@ -152,6 +161,14 @@ struct timespec;* @save_sched_clock_state: save state for sched_clock() on suspend * @restore_sched_clock_state: restore state for sched_clock() on resume * @apic_post_init: adjust apic if neeeded +* @legacy: legacy features +* @set_legacy_features: override legacy features. Use of this callback +* is highly discouraged. You should only need +* this if your hardware platform requires further +* custom fine tuning far beyong what may be +* possible in x86_early_init_platform_quirks() by +* only using the current x86_hardware_subarch +* semantics. */ struct x86_platform_ops {unsigned long (*calibrate_tsc)(void );
@@ -165,6 +182,8 @@ struct x86_platform_ops {void (*save_sched_clock_state)(void );void (*restore_sched_clock_state)(void );void (*apic_post_init)(void ); +struct x86_legacy_features legacy;
I don't think this belongs here --- we are in the ops structure.
-boris
Quoted 6 lines
(quoted diff) +1
-0+ void (*set_legacy_features)(void); }; struct pci_dev;
Review extern struct x86_cpuinit_ops x86_cpuinit; · line 212
Quoted 8 lines
(quoted diff) +2
-0@@ -186,6 +205,8 @@ extern struct x86_cpuinit_ops x86_cpuinit; extern struct x86_platform_ops x86_platform; extern struct x86_msi_ops x86_msi; extern struct x86_io_apic_ops x86_io_apic_ops; + +extern void x86_early_init_platform_quirks(void); extern void x86_init_noop(void); extern void x86_init_uint_noop(unsigned int unused);
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
Re: [PATCH v5 04/14] x86/rtc: replace paravirt rtc check with platform legacy quirk
Quoted 43 lines · Boris Ostrovsky
On 04/08/2016 07:40 PM, Luis R. Rodriguez wrote:
arch/x86/include/asm/x86_init.h +18
-0@@ -142,6 +142,15 @@ struct x86_cpuinit_ops {struct timespec ;/** +* struct x86_legacy_features - legacy x86 features +* +* @rtc: this device has a CMOS real-time clock present +*/ +struct x86_legacy_features { +int rtc; +}; + +/** * struct x86_platform_ops - platform specific runtime functions * @calibrate_tsc: calibrate TSC * @get_wallclock: get time from HW clock like RTC etc. @@ -152,6 +161,14 @@ struct timespec;* @save_sched_clock_state: save state for sched_clock() on suspend * @restore_sched_clock_state: restore state for sched_clock() on resume * @apic_post_init: adjust apic if neeeded +* @legacy: legacy features +* @set_legacy_features: override legacy features. Use of this callback +* is highly discouraged. You should only need +* this if your hardware platform requires further +* custom fine tuning far beyong what may be +* possible in x86_early_init_platform_quirks() by +* only using the current x86_hardware_subarch +* semantics. */ struct x86_platform_ops {unsigned long (*calibrate_tsc)(void );@@ -165,6 +182,8 @@ struct x86_platform_ops {void (*save_sched_clock_state)(void );void (*restore_sched_clock_state)(void );void (*apic_post_init)(void ); +struct x86_legacy_features legacy;
Quoted 1 line
I don't think this belongs here --- we are in the ops structure.
Bike shed thing -- I went with what Ingo suggested [0], which was to embed things under x86_platform, and that happens to be this struct.
So unless I hear otherwise from the maintainer I'm sticking with it.
http://lkml.kernel.org/r/[email protected]
Luis
PATCH v5 4/14 x86/rtc: replace paravirt rtc check with platform legacy quirk
In reply to Luis R. RodriguezWe have 4 types of x86 platforms that disable RTC:
* Intel MID
* Lguest - uses paravirt
* Xen dom-U - uses paravirt
* x86 on legacy systems annotated with an ACPI legacy flag
We can consolidate all of these into a platform specific legacy quirk set early in boot through i386_start_kernel() and through x86_64_start_reservations(). This deals with the RTC quirks which we can rely on through the hardware subarch, the ACPI check can be dealt with separately.
For Xen things are bit more complex given that the @X86_SUBARCH_XEN x86_hardware_subarch is shared on for Xen which uses the PV path for both domU and dom0. Since the semantics for differentiating between the two are Xen specific we provide a platform helper to help override default legacy features -- x86_platform.set_legacy_features(). Use of this helper is highly discouraged, its only purpose should be to account for the lack of semantics available within your given x86_hardware_subarch.
As per 0-day, this bumps the vmlinux size using i386-tinyconfig as follows:
TOTAL TEXT init.text x86_early_init_platform_quirks() +70 +62 +62 +43
Only 8 bytes overhead total, as the main increase in size is all removed via __init.
v2: split the subarch check from the ACPI check, clarify
on the ACPI change commit log why ordering works
v3: add x86_platform.set_legacy_features() to account for dom0,
add also size impact on vmlinux as per 0-day report
--- arch/x86/Makefile | 1 + arch/x86/include/asm/paravirt.h | 6 ------ arch/x86/include/asm/paravirt_types.h | 5 ----- arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/x86_init.h | 21 +++++++++++++++++++++ arch/x86/kernel/Makefile | 6 +++++- arch/x86/kernel/head32.c | 2 ++ arch/x86/kernel/head64.c | 1 + arch/x86/kernel/platform-quirks.c | 21 +++++++++++++++++++++ arch/x86/kernel/rtc.c | 7 ++----- arch/x86/lguest/boot.c | 1 - arch/x86/xen/enlighten.c | 10 +++++++--- 12 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 arch/x86/kernel/platform-quirks.c
arch/x86/Makefile +1 -0
@@ -209,6 +209,7 @@ endif head-y := arch/x86/kernel/head_$(BITS).o head-y += arch/x86/kernel/head$(BITS).o head-y += arch/x86/kernel/head.o +head-y += arch/x86/kernel/platform-quirks.o libs-y += arch/x86/lib/
arch/x86/include/asm/paravirt.h +0 -6
@@ -20,12 +20,6 @@ static inline int paravirt_enabled(void)return pv_info.paravirt_enabled; } -static inline int paravirt_has_feature (unsigned int feature) -{ -WARN_ON_ONCE (!pv_info.paravirt_enabled); -return (pv_info.features & feature); -} -static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread) {
arch/x86/include/asm/paravirt_types.h +0 -5
@@ -70,14 +70,9 @@ struct pv_info {#endif int paravirt_enabled; -unsigned int features;/* valid only if paravirt_enabled is set */ const char *name; }; -#define paravirt_has (x) paravirt_has_feature(PV_SUPPORTED_##x) -/* Supported features */ -#define PV_SUPPORTED_RTC (1<<0) -struct pv_init_ops {/* * Patch may replace one of the defined code sequences with
arch/x86/include/asm/processor.h +0 -1
@@ -474,7 +474,6 @@ static inline unsigned long current_top_of_stack(void)#else #define __cpuid native_cpuid#define paravirt_enabled () 0 -#define paravirt_has (x) 0static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread)
arch/x86/include/asm/x86_init.h +21 -0
@@ -142,6 +142,15 @@ struct x86_cpuinit_ops {struct timespec ;/** +* struct x86_legacy_features - legacy x86 features +* +* @rtc: this device has a CMOS real-time clock present +*/ +struct x86_legacy_features { +int rtc; +}; + +/** * struct x86_platform_ops - platform specific runtime functions * @calibrate_tsc: calibrate TSC * @get_wallclock: get time from HW clock like RTC etc.
@@ -152,6 +161,14 @@ struct timespec;* @save_sched_clock_state: save state for sched_clock() on suspend * @restore_sched_clock_state: restore state for sched_clock() on resume * @apic_post_init: adjust apic if neeeded +* @legacy: legacy features +* @set_legacy_features: override legacy features. Use of this callback +* is highly discouraged. You should only need +* this if your hardware platform requires further +* custom fine tuning far beyong what may be +* possible in x86_early_init_platform_quirks() by +* only using the current x86_hardware_subarch +* semantics. */ struct x86_platform_ops {unsigned long (*calibrate_tsc)(void );
@@ -165,6 +182,8 @@ struct x86_platform_ops {void (*save_sched_clock_state)(void );void (*restore_sched_clock_state)(void );void (*apic_post_init)(void ); +struct x86_legacy_features legacy; +void (*set_legacy_features)(void ); };struct pci_dev ;
@@ -186,6 +205,8 @@ extern struct x86_cpuinit_ops x86_cpuinit;extern struct x86_platform_ops x86_platform;extern struct x86_msi_ops x86_msi;extern struct x86_io_apic_ops x86_io_apic_ops; + +extern void x86_early_init_platform_quirks (void );extern void x86_init_noop (void );extern void x86_init_uint_noop (unsigned int unused);
arch/x86/kernel/Makefile +5 -1
@@ -2,7 +2,11 @@ # Makefile for the linux kernel. # -extra-y := head_$(BITS).o head$(BITS).o head.o vmlinux.lds +extra-y := head_$(BITS).o +extra-y += head$(BITS).o +extra-y += head.o +extra-y += platform-quirks.o +extra-y += vmlinux.lds CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
arch/x86/kernel/head32.c +2 -0
@@ -34,6 +34,8 @@ asmlinkage __visible void __init i386_start_kernel(void)cr4_init_shadow ();sanitize_boot_params (&boot_params); +x86_early_init_platform_quirks (); +/* Call the subarch specific early setup function */ switch (boot_params.hdr.hardware_subarch) {case X86_SUBARCH_INTEL_MID :
arch/x86/kernel/head64.c +1 -0
@@ -182,6 +182,7 @@ void __init x86_64_start_reservations(char *real_mode_data)if (!boot_params.hdr.version)copy_bootdata (__va (real_mode_data)); +x86_early_init_platform_quirks ();reserve_ebda_region ();switch (boot_params.hdr.hardware_subarch) {
arch/x86/kernel/platform-quirks.c new file +21 -0
@@ -0,0 +1,21 @@ +#include <linux/kernel.h> +#include <linux/init.h> + +#include <asm/setup.h> +#include <asm/bios_ebda.h> + +void __init x86_early_init_platform_quirks (void ) +{ + x86_platform.legacy.rtc =1 ; + +switch (boot_params.hdr.hardware_subarch) { +case X86_SUBARCH_XEN : +case X86_SUBARCH_LGUEST : +case X86_SUBARCH_INTEL_MID : + x86_platform.legacy.rtc =0 ; +break ; + } + +if (x86_platform.set_legacy_features) + x86_platform.set_legacy_features (); +}
arch/x86/kernel/rtc.c +2 -5
@@ -14,6 +14,7 @@#include <asm/time.h> #include <asm/intel-mid.h> #include <asm/rtc.h> +#include <asm/setup.h> #ifdef CONFIG_X86_32 /*
@@ -188,10 +189,6 @@ static __init int add_rtc_cmos(void)if (of_have_populated_dt ())return 0 ; -/* Intel MID platforms don't have ioport rtc */ -if (intel_mid_identify_cpu ()) -return -ENODEV ; -#ifdef CONFIG_ACPI if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) {/* This warning can likely go away again in a year or two. */
@@ -200,7 +197,7 @@ static __init int add_rtc_cmos(void) }#endif -if (paravirt_enabled () && !paravirt_has (RTC )) +if (!x86_platform.legacy.rtc)return -ENODEV ;platform_device_register (&rtc_device);
arch/x86/lguest/boot.c +0 -1
@@ -1414,7 +1414,6 @@ __init void lguest_init(void) pv_info.kernel_rpl =1 ;/* Everyone except Xen runs with this set. */ pv_info.shared_kernel_pmd =1 ; - pv_info.features =0 ;/* * We set up all the lguest overrides for sensitive operations. These
arch/x86/xen/enlighten.c +7 -3
@@ -1192,7 +1192,6 @@ static const struct pv_info xen_info __initconst = {#ifdef CONFIG_X86_64 .extra_user_64bit_cs = FLAT_USER_CS64, #endif - .features = 0, .name = "Xen", };
@@ -1505,6 +1504,11 @@ static void __init xen_pvh_early_guest_init(void) }#endif /* CONFIG_XEN_PVH */ +static void xen_dom0_set_legacy_features (void ) +{ + x86_platform.legacy.rtc =1 ; +} +/* First C function to be called on Xen boot */ asmlinkage __visible void __init xen_start_kernel(void) {
@@ -1525,8 +1529,6 @@ asmlinkage __visible void __init xen_start_kernel(void)/* Install Xen paravirt ops */ pv_info = xen_info; -if (xen_initial_domain ()) - pv_info.features |=PV_SUPPORTED_RTC ; pv_init_ops = xen_init_ops;if (!xen_pvh_domain ()) { pv_cpu_ops = xen_cpu_ops;
@@ -1679,6 +1681,8 @@ asmlinkage __visible void __init xen_start_kernel(void) .u.firmware_info.type = XEN_FW_KBD_SHIFT_FLAGS, }; + x86_platform.set_legacy_features = + xen_dom0_set_legacy_features;xen_init_vga (info, xen_start_info->console.dom0.info_size); xen_start_info->console.domU.mfn =0 ; xen_start_info->console.domU.evtchn =0 ;
Signature · 1 line
2.7.2
PATCH v5 5/14 x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code
In reply to Luis R. RodriguezThis moves the ACPI specific check into the ACPI boot code, it also takes advantage of the x86_platform.legacy.rtc which is checked for already on the RTC initialization code. This lets us remove the nasty #ifdefery and consolidate the checks to use only one toggle to disable the RTC init code.
The works as RTC is initialized by device_initcall(add_rtc_cmos), this will run late in boot on start_kernel() during rest_init(), acpi_parse_fadt() gets called earlier during setup_arch().
--- arch/x86/kernel/acpi/boot.c | 4 ++++ arch/x86/kernel/rtc.c | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-)
arch/x86/kernel/acpi/boot.c +4 -0
@@ -913,6 +913,10 @@ late_initcall(hpet_insert_resource);static int __init acpi_parse_fadt (struct acpi_table_header *table) { +if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) { +pr_debug ("ACPI: not registering RTC platform device\n" ); + x86_platform.legacy.rtc =0 ; + }#ifdef CONFIG_X86_PM_TIMER /* detect the location of the ACPI PM Timer */
arch/x86/kernel/rtc.c +0 -8
@@ -189,14 +189,6 @@ static __init int add_rtc_cmos(void)if (of_have_populated_dt ())return 0 ; -#ifdef CONFIG_ACPI -if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) { -/* This warning can likely go away again in a year or two. */ -pr_info ("ACPI: not registering RTC platform device\n" ); -return -ENODEV ; - } -#endif -if (!x86_platform.legacy.rtc)return -ENODEV ;
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 5/14 x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code
In reply to Luis R. RodriguezThis moves the ACPI specific check into the ACPI boot code, it also takes advantage of the x86_platform.legacy.rtc which is checked for already on the RTC initialization code. This lets us remove the nasty #ifdefery and consolidate the checks to use only one toggle to disable the RTC init code.
The works as RTC is initialized by device_initcall(add_rtc_cmos), this will run late in boot on start_kernel() during rest_init(), acpi_parse_fadt() gets called earlier during setup_arch().
--- arch/x86/kernel/acpi/boot.c | 4 ++++ arch/x86/kernel/rtc.c | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-)
arch/x86/kernel/acpi/boot.c +4 -0
@@ -913,6 +913,10 @@ late_initcall(hpet_insert_resource);static int __init acpi_parse_fadt (struct acpi_table_header *table) { +if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) { +pr_debug ("ACPI: not registering RTC platform device\n" ); + x86_platform.legacy.rtc =0 ; + }#ifdef CONFIG_X86_PM_TIMER /* detect the location of the ACPI PM Timer */
arch/x86/kernel/rtc.c +0 -8
@@ -189,14 +189,6 @@ static __init int add_rtc_cmos(void)if (of_have_populated_dt ())return 0 ; -#ifdef CONFIG_ACPI -if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) { -/* This warning can likely go away again in a year or two. */ -pr_info ("ACPI: not registering RTC platform device\n" ); -return -ENODEV ; - } -#endif -if (!x86_platform.legacy.rtc)return -ENODEV ;
Signature · 1 line
2.7.2
PATCH v5 6/14 x86/init: use a platform legacy quirk for ebda
In reply to Luis R. RodriguezThis replaces the paravirt_enabled() check with a
proper x86 legacy platform quirk.
As per 0-day, this bumps the vmlinux size using i386-tinyconfig as follows:
TOTAL TEXT init.text x86_early_init_platform_quirks() +39 +35 +35 +25
That's a 4 byte total overhead, the rest is all cleared out upon init as its all __init text.
v2: document 0-day vmlinux size impact
--- arch/x86/include/asm/x86_init.h | 3 +++ arch/x86/kernel/head.c | 2 +- arch/x86/kernel/platform-quirks.c | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-)
arch/x86/include/asm/x86_init.h +3 -0
@@ -145,9 +145,12 @@ struct timespec;* struct x86_legacy_features - legacy x86 features * * @rtc: this device has a CMOS real-time clock present +* @ebda_search: it's safe to search for the EBDA signature in the hardware's +* low RAM */ struct x86_legacy_features {int rtc; +int ebda_search; };/**
arch/x86/kernel/head.c +1 -1
@@ -38,7 +38,7 @@ void __init reserve_ebda_region(void)* that the paravirt case can handle memory setup * correctly, without our help. */ -if (paravirt_enabled ()) +if (!x86_platform.legacy.ebda_search)return ;/* end of low (conventional) memory */
arch/x86/kernel/platform-quirks.c +4 -0
@@ -7,8 +7,12 @@void __init x86_early_init_platform_quirks (void ) { x86_platform.legacy.rtc =1 ; + x86_platform.legacy.ebda_search =0 ;switch (boot_params.hdr.hardware_subarch) { +case X86_SUBARCH_PC : + x86_platform.legacy.ebda_search =1 ; +break ;case X86_SUBARCH_XEN :case X86_SUBARCH_LGUEST :case X86_SUBARCH_INTEL_MID :
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 7/14 tools/lguest: force disable tboot and apm
In reply to Luis R. RodriguezThe paravirt_enabled() check is going away, the area tossed to the kernel on lguest is not zerored out, so ensure lguest force disables tboot and apm just in case the kernel file being read might have this set for whatever reason.
--- tools/lguest/lguest.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/lguest/lguest.c +6 -0
@@ -3357,6 +3357,12 @@ int main(int argc, char *argv[])/* Tell the entry path not to try to reload segment registers. */ boot->hdr.loadflags |=KEEP_SEGMENTS ; +/* We don't support tboot */ + boot->tboot_addr =0 ; + +/* Ensure this is 0 to prevent apm from loading */ + boot->apm_bios_info.version =0 ; +/* We tell the kernel to initialize the Guest. */ tell_kernel (start);
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 7/14 tools/lguest: force disable tboot and apm
In reply to Luis R. RodriguezThe paravirt_enabled() check is going away, the area tossed to the kernel on lguest is not zerored out, so ensure lguest force disables tboot and apm just in case the kernel file being read might have this set for whatever reason.
--- tools/lguest/lguest.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/lguest/lguest.c +6 -0
@@ -3357,6 +3357,12 @@ int main(int argc, char *argv[])/* Tell the entry path not to try to reload segment registers. */ boot->hdr.loadflags |=KEEP_SEGMENTS ; +/* We don't support tboot */ + boot->tboot_addr =0 ; + +/* Ensure this is 0 to prevent apm from loading */ + boot->apm_bios_info.version =0 ; +/* We tell the kernel to initialize the Guest. */ tell_kernel (start);
Signature · 1 line
2.7.2
Re: [PATCH v5 07/14] tools/lguest: force disable tboot and apm
Quoted 9 lines · Luis R. Rodriguez
The
paravirt_enabled()check is going away, the area tossed to the kernel on lguest is not zerored out, so ensure lguest force disables tboot and apm just in case the kernel file being read might have this set for whatever reason.Signed-off-by Luis R. Rodriguez <[email protected]>--- tools/lguest/lguest.c | 6 ++++++ 1 file changed, 6 insertions(+)
Yeah, so the v4 patch was acked by Rusty:
... but you didn't add his ack to the v5 patch :-(
Please don't do this! Also please double check all past replies to make sure no acks got lost. I noticed this one, but there might be more.
Thanks,
Ingo
Re: [PATCH v5 07/14] tools/lguest: force disable tboot and apm
Quoted 13 lines · Ingo Molnar
Quoted 9 lines · Luis R. Rodriguez
The
paravirt_enabled()check is going away, the area tossed to the kernel on lguest is not zerored out, so ensure lguest force disables tboot and apm just in case the kernel file being read might have this set for whatever reason.Signed-off-by Luis R. Rodriguez <[email protected]>--- tools/lguest/lguest.c | 6 ++++++ 1 file changed, 6 insertions(+)
Quoted 5 lines
Yeah, so the v4 patch was acked by Rusty:
Acked-by Rusty Russell <[email protected]>... but you didn't add his ack to the v5 patch :-(
Sorry about that. Added.
Quoted 2 lines
Please don't do this! Also please double check all past replies to make sure no acks got lost. I noticed this one, but there might be more.
I thought I had only left out the Acks for patches I later modified significantly. Sorry. Will revise.
Luis
PATCH v5 8/14 apm32: remove paravirt_enabled() use
In reply to Luis R. RodriguezThere is already a check for apm_info.bios == 0, the apm_info.bios is set from the boot_params.apm_bios_info. Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the apm_bios.info. The
Xen folks are sure force disable to 0 is not needed because apm_info lives in .bss, we recently forced disabled this on lguest, and on the Xen side just to be sure Boris zeroed out the .bss for PV guests through commit 04b6b4a56884327c1648 ("xen/x86: Zero out .bss for PV guests"). With this care taken into consideration the paravirt_enabled() check is simply not needed anymore.
--- arch/x86/kernel/apm_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apm_32.c +1 -1
@@ -2267,7 +2267,7 @@ static int __init apm_init(void)dmi_check_system (apm_dmi_table); -if (apm_info.bios.version ==0 ||paravirt_enabled () ||machine_is_olpc ()) { +if (apm_info.bios.version ==0 ||machine_is_olpc ()) {printk (KERN_INFO "apm: BIOS not found.\n" );return -ENODEV ; }
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 9/14 x86/tboot: remove paravirt_enabled()
In reply to Luis R. RodriguezThere is already a check for boot_params.tboot_addr prior to paravirt_enabled(). Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the boot_params.tboot_addr. The Xen folks are sure a force disable to 0 is not needed, we recently forced disabled this on lguest. With this in place this check is no longer needed.
Xen folks are sure force disable to 0 is not needed because apm_info lives in .bss, we recently forced disabled this on lguest, and on the Xen side just to be sure Boris zeroed out the .bss for PV guests through commit 04b6b4a56884327c1648 ("xen/x86: Zero out .bss for PV guests"). With this care taken into consideration the paravirt_enabled() check is simply not needed anymore.
--- arch/x86/kernel/tboot.c | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/kernel/tboot.c +0 -6
@@ -74,12 +74,6 @@ void __init tboot_probe(void)return ; } -/* only a natively booted kernel should be using TXT */ -if (paravirt_enabled ()) { -pr_warning ("non-0 tboot_addr but pv_ops is enabled\n" ); -return ; - } -/* Map and check for tboot UUID. */ set_fixmap (FIX_TBOOT_BASE , boot_params.tboot_addr); tboot = (struct tboot *)fix_to_virt (FIX_TBOOT_BASE );
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 9/14 x86/tboot: remove paravirt_enabled()
In reply to Luis R. RodriguezThere is already a check for boot_params.tboot_addr prior to paravirt_enabled(). Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the boot_params.tboot_addr. The Xen folks are sure a force disable to 0 is not needed, we recently forced disabled this on lguest. With this in place this check is no longer needed.
Xen folks are sure force disable to 0 is not needed because apm_info lives in .bss, we recently forced disabled this on lguest, and on the Xen side just to be sure Boris zeroed out the .bss for PV guests through commit 04b6b4a56884327c1648 ("xen/x86: Zero out .bss for PV guests"). With this care taken into consideration the paravirt_enabled() check is simply not needed anymore.
--- arch/x86/kernel/tboot.c | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/kernel/tboot.c +0 -6
@@ -74,12 +74,6 @@ void __init tboot_probe(void)return ; } -/* only a natively booted kernel should be using TXT */ -if (paravirt_enabled ()) { -pr_warning ("non-0 tboot_addr but pv_ops is enabled\n" ); -return ; - } -/* Map and check for tboot UUID. */ set_fixmap (FIX_TBOOT_BASE , boot_params.tboot_addr); tboot = (struct tboot *)fix_to_virt (FIX_TBOOT_BASE );
Signature · 1 line
2.7.2
PATCH v5 10/14 x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around
In reply to Luis R. RodriguezThe X86_BUG_F00F work around is responsible for fixing up the error generated on attempted F00F exploitation from an OOPS to a SIGILL. There is no reason why this code should not be allowed to run on PV guest on a F00F-affected CPU -- it would simply never trigger. The pv_enabled() check was there only to avoid printing the f00f workaround, so removing the check is purely a cosmetic change.
--- arch/x86/kernel/cpu/intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/intel.c +1 -1
@@ -233,7 +233,7 @@ static void intel_workarounds(struct cpuinfo_x86 *c)* The Quark is also family 5, but does not have the same bug. */ clear_cpu_bug (c,X86_BUG_F00F ); -if (!paravirt_enabled () && c->x86 ==5 && c->x86_model <9 ) { +if (c->x86 ==5 && c->x86_model <9 ) {static int f00f_workaround_enabled;set_cpu_bug (c,X86_BUG_F00F );
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 10/14 x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around
In reply to Luis R. RodriguezThe X86_BUG_F00F work around is responsible for fixing up the error generated on attempted F00F exploitation from an OOPS to a SIGILL. There is no reason why this code should not be allowed to run on PV guest on a F00F-affected CPU -- it would simply never trigger. The pv_enabled() check was there only to avoid printing the f00f workaround, so removing the check is purely a cosmetic change.
--- arch/x86/kernel/cpu/intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/intel.c +1 -1
@@ -233,7 +233,7 @@ static void intel_workarounds(struct cpuinfo_x86 *c)* The Quark is also family 5, but does not have the same bug. */ clear_cpu_bug (c,X86_BUG_F00F ); -if (!paravirt_enabled () && c->x86 ==5 && c->x86_model <9 ) { +if (c->x86 ==5 && c->x86_model <9 ) {static int f00f_workaround_enabled;set_cpu_bug (c,X86_BUG_F00F );
Signature · 1 line
2.7.2
PATCH v5 11/14 pnpbios: replace paravirt_enabled() check with legacy device check
In reply to Luis R. RodriguezSince we are removing paravirt_enabled() replace it with a logical equivalent. Even though PNPBIOS is x86 specific we add an arch-specific type call, which can be implemented by any architecture to show how other legacy attribute devices can later be also checked for with other ACPI legacy attribute flags.
This implicates the first ACPI 5.2.9.3 IA-PC Boot Architecture ACPI_FADT_LEGACY_DEVICES flag device, and shows how to add more.
The reason pnpbios gets a defined structure and as such uses a different approach than the RTC legacy quirk is that ACPI has a respective RTC flag, while pnpbios does not. We fold the pnpbios quirk under ACPI_FADT_LEGACY_DEVICES ACPI flag use case, and use a struct of possible devices to enable future extensions of this.
As per 0-day, this bumps the vmlinux size using i386-tinyconfig as follows:
TOTAL TEXT init.text x86_early_init_platform_quirks() +32 +28 +28 +28
That's 4 byte overhead total, the rest is cleared out on init as its all __init text.
v2: split out subarch handlng on switch to make it easier
later to add other subarchs. The 'fall-through' switch handling can be confusing and we'll remove it later when we add handling for X86_SUBARCH_CE4100.
v3: document vmlinux size impact as per 0-day, and also
explain why pnpbios is treated differently than the RTC legacy feature.
--- arch/x86/include/asm/x86_init.h | 26 ++++++++++++++++++++++++++ arch/x86/kernel/platform-quirks.c | 11 +++++++++++ drivers/pnp/pnpbios/core.c | 3 ++- include/linux/pnp.h | 2 ++ 4 files changed, 41 insertions(+), 1 deletion(-)
arch/x86/include/asm/x86_init.h +26 -0
@@ -142,15 +142,41 @@ struct x86_cpuinit_ops {struct timespec ;/** +* struct x86_legacy_devices - legacy x86 devices +* +* @pnpbios: this platform can have a PNPBIOS. If this is disabled the platform +* is known to never have a PNPBIOS. +* +* These are devices known to require LPC or ISA bus. The definition of legacy +* devices adheres to the ACPI 5.2.9.3 IA-PC Boot Architecture flag +* ACPI_FADT_LEGACY_DEVICES. These devices consist of user visible devices on +* the LPC or ISA bus. User visible devices are devices that have end-user +* accessible connectors (for example, LPT parallel port). Legacy devices on +* the LPC bus consist for example of serial and parallel ports, PS/2 keyboard +* / mouse, and the floppy disk controller. A system that lacks all known +* legacy devices can assume all devices can be detected exclusively via +* standard device enumeration mechanisms including the ACPI namespace. +* +* A system which has does not have ACPI_FADT_LEGACY_DEVICES enabled must not +* have any of the legacy devices enumerated below present. +*/ +struct x86_legacy_devices { +int pnpbios; +}; + +/** * struct x86_legacy_features - legacy x86 features * * @rtc: this device has a CMOS real-time clock present * @ebda_search: it's safe to search for the EBDA signature in the hardware's * low RAM +* @devices: legacy x86 devices, refer to struct x86_legacy_devices +* documentation for further details. */ struct x86_legacy_features {int rtc;int ebda_search; +struct x86_legacy_devices devices; };/**
arch/x86/kernel/platform-quirks.c +11 -0
@@ -8,6 +8,7 @@ void __init x86_early_init_platform_quirks(void) { x86_platform.legacy.rtc =1 ; x86_platform.legacy.ebda_search =0 ; + x86_platform.legacy.devices.pnpbios =1 ;switch (boot_params.hdr.hardware_subarch) {case X86_SUBARCH_PC :
@@ -15,6 +16,9 @@ void __init x86_early_init_platform_quirks(void)break ;case X86_SUBARCH_XEN :case X86_SUBARCH_LGUEST : + x86_platform.legacy.devices.pnpbios =0 ; + x86_platform.legacy.rtc =0 ; +break ;case X86_SUBARCH_INTEL_MID : x86_platform.legacy.rtc =0 ;break ;
@@ -23,3 +27,10 @@ void __init x86_early_init_platform_quirks(void)if (x86_platform.set_legacy_features) x86_platform.set_legacy_features (); } + +#if defined(CONFIG_PNPBIOS ) +bool __init arch_pnpbios_disabled (void ) +{ +return x86_platform.legacy.devices.pnpbios ==0 ; +} +#endif
drivers/pnp/pnpbios/core.c +2 -1
@@ -521,10 +521,11 @@ static int __init pnpbios_init(void)int ret;if (pnpbios_disabled ||dmi_check_system (pnpbios_dmi_table) || -paravirt_enabled ()) { +arch_pnpbios_disabled ()) {printk (KERN_INFO "PnPBIOS: Disabled\n" );return -ENODEV ; } +#ifdef CONFIG_PNPACPI if (!acpi_disabled && !pnpacpi_disabled) { pnpbios_disabled =1 ;
include/linux/pnp.h +2 -0
@@ -337,9 +337,11 @@ extern struct mutex pnp_res_mutex;#ifdef CONFIG_PNPBIOS extern struct pnp_protocol pnpbios_protocol; +extern bool arch_pnpbios_disabled (void );#define pnp_device_is_pnpbios (dev) ((dev)->protocol == (&pnpbios_protocol))#else #define pnp_device_is_pnpbios (dev) 0 +#define arch_pnpbios_disabled () false#endif #ifdef CONFIG_PNPACPI
Signature · 7 lines
2.7.2 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel
PATCH v5 12/14 x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES
In reply to Luis R. RodriguezACPI 5.2.9.3 IA-PC Boot Architecture flag ACPI_FADT_LEGACY_DEVICES can be used to determine if a system has legacy devices LPC or ISA devices. The x86 platform already has a struct which lists known associated legacy devices, we start off careful only by disabling root devices we should not regress with. The struct and device list can be expanded with time to cover more root legacy components.
--- arch/x86/kernel/acpi/boot.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/acpi/boot.c +5 -0
@@ -913,6 +913,11 @@ late_initcall(hpet_insert_resource);static int __init acpi_parse_fadt (struct acpi_table_header *table) { +if (!(acpi_gbl_FADT.boot_flags &ACPI_FADT_LEGACY_DEVICES )) { +pr_debug ("ACPI: no legacy devices present\n" ); + x86_platform.legacy.devices.pnpbios =0 ; + } +if (acpi_gbl_FADT.boot_flags &ACPI_FADT_NO_CMOS_RTC ) {pr_debug ("ACPI: not registering RTC platform device\n" ); x86_platform.legacy.rtc =0 ;
Signature · 1 line
2.7.2
PATCH v5 13/14 x86/init: rename ebda code file
In reply to Luis R. RodriguezThis makes it clearer what this is.
---
arch/x86/Makefile | 2 +-
arch/x86/kernel/Makefile | 2 +-
arch/x86/kernel/{head.c => ebda.c} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/x86/kernel/{head.c => ebda.c} (100%)arch/x86/Makefile +1 -1
@@ -208,7 +208,7 @@ endif head-y := arch/x86/kernel/head_$(BITS).o head-y += arch/x86/kernel/head$(BITS).o -head-y += arch/x86/kernel/head.o +head-y += arch/x86/kernel/ebda.o head-y += arch/x86/kernel/platform-quirks.o libs-y += arch/x86/lib/
arch/x86/kernel/Makefile +1 -1
@@ -4,7 +4,7 @@ extra-y := head_$(BITS).o extra-y += head$(BITS).o -extra-y += head.o +extra-y += ebda.o extra-y += platform-quirks.o extra-y += vmlinux.lds
arch/x86/kernel/ebda.c renamed from arch/x86/kernel/head.c +0 -0
Signature · 1 line
2.7.2
PATCH v5 14/14 x86/paravirt: remove paravirt_enabled()
In reply to Luis R. RodriguezThat that paravirt_enabled() is replaced with proper x86 semantics we can remove it.
--- arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 1 - arch/x86/include/asm/processor.h | 1 - arch/x86/kernel/kvm.c | 8 -------- arch/x86/kernel/paravirt.c | 1 - arch/x86/lguest/boot.c | 2 -- arch/x86/xen/enlighten.c | 1 - 7 files changed, 19 deletions(-)
arch/x86/include/asm/paravirt.h +0 -5
@@ -15,11 +15,6 @@#include <linux/cpumask.h> #include <asm/frame.h> -static inline int paravirt_enabled (void ) -{ -return pv_info.paravirt_enabled; -} -static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread) {
arch/x86/include/asm/paravirt_types.h +0 -1
@@ -69,7 +69,6 @@ struct pv_info {u16 extra_user_64bit_cs;/* __USER_CS if none */ #endif -int paravirt_enabled;const char *name; };
arch/x86/include/asm/processor.h +0 -1
@@ -473,7 +473,6 @@ static inline unsigned long current_top_of_stack(void)#include <asm/paravirt.h> #else #define __cpuid native_cpuid -#define paravirt_enabled () 0static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread)
arch/x86/kernel/kvm.c +0 -8
@@ -285,14 +285,6 @@ static void __init paravirt_ops_setup(void) { pv_info.name ="KVM" ; -/* -* KVM isn't paravirt in the sense of paravirt_enabled. A KVM -* guest kernel works like a bare metal kernel with additional -* features, and paravirt_enabled is about features that are -* missing. -*/ - pv_info.paravirt_enabled =0 ; -if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;
arch/x86/kernel/paravirt.c +0 -1
@@ -294,7 +294,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)struct pv_info pv_info = { .name ="bare hardware" , - .paravirt_enabled =0 , .kernel_rpl =0 , .shared_kernel_pmd =1 ,/* Only used when CONFIG_X86_PAE is set */
arch/x86/lguest/boot.c +0 -2
@@ -1408,8 +1408,6 @@ __init void lguest_init(void) {/* We're under lguest. */ pv_info.name ="lguest" ; -/* Paravirt is enabled. */ - pv_info.paravirt_enabled =1 ;/* We're running at privilege level 1, not 0 as normal. */ pv_info.kernel_rpl =1 ;/* Everyone except Xen runs with this set. */
arch/x86/xen/enlighten.c +0 -1
@@ -1186,7 +1186,6 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, }static const struct pv_info xen_info__initconst = { - .paravirt_enabled =1 , .shared_kernel_pmd =0 , #ifdef CONFIG_X86_64
Signature · 1 line
2.7.2
Re: [Xen-devel] [PATCH v5 14/14] x86/paravirt: remove paravirt_enabled()
Quoted 4 lines · Luis R. Rodriguez
That that
paravirt_enabled()is replaced with proper x86 semantics we can remove it.Signed-off-by Luis R. Rodriguez <[email protected]>
Quoted 9 lines
--- arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 1 - arch/x86/include/asm/processor.h | 1 - arch/x86/kernel/kvm.c | 8 -------- arch/x86/kernel/paravirt.c | 1 - arch/x86/lguest/boot.c | 2 -- arch/x86/xen/enlighten.c | 1 - 7 files changed, 19 deletions(-)
Xen parts:
Juergen
Quoted 98 lines
arch/x86/include/asm/paravirt.h +0
-5@@ -15,11 +15,6 @@#include <linux/cpumask.h> #include <asm/frame.h> -static inline int paravirt_enabled (void ) -{ -return pv_info.paravirt_enabled; -} -static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread) {arch/x86/include/asm/paravirt_types.h +0
-1@@ -69,7 +69,6 @@ struct pv_info {u16 extra_user_64bit_cs;/* __USER_CS if none */ #endif -int paravirt_enabled;const char *name; };arch/x86/include/asm/processor.h +0
-1@@ -473,7 +473,6 @@ static inline unsigned long current_top_of_stack(void)#include <asm/paravirt.h> #else #define __cpuid native_cpuid -#define paravirt_enabled () 0static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread)arch/x86/kernel/kvm.c +0
-8@@ -285,14 +285,6 @@ static void __init paravirt_ops_setup(void) { pv_info.name ="KVM" ; -/* -* KVM isn't paravirt in the sense of paravirt_enabled. A KVM -* guest kernel works like a bare metal kernel with additional -* features, and paravirt_enabled is about features that are -* missing. -*/ - pv_info.paravirt_enabled =0 ; -if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;arch/x86/kernel/paravirt.c +0
-1@@ -294,7 +294,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)struct pv_info pv_info = { .name ="bare hardware" , - .paravirt_enabled =0 , .kernel_rpl =0 , .shared_kernel_pmd =1 ,/* Only used when CONFIG_X86_PAE is set */ arch/x86/lguest/boot.c +0
-2@@ -1408,8 +1408,6 @@ __init void lguest_init(void) {/* We're under lguest. */ pv_info.name ="lguest" ; -/* Paravirt is enabled. */ - pv_info.paravirt_enabled =1 ;/* We're running at privilege level 1, not 0 as normal. */ pv_info.kernel_rpl =1 ;/* Everyone except Xen runs with this set. */ arch/x86/xen/enlighten.c +0
-1@@ -1186,7 +1186,6 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, }static const struct pv_info xen_info__initconst = { - .paravirt_enabled =1 , .shared_kernel_pmd =0 , #ifdef CONFIG_X86_64
PATCH v5 14/14 x86/paravirt: remove paravirt_enabled()
In reply to Luis R. RodriguezThat that paravirt_enabled() is replaced with proper x86 semantics we can remove it.
--- arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 1 - arch/x86/include/asm/processor.h | 1 - arch/x86/kernel/kvm.c | 8 -------- arch/x86/kernel/paravirt.c | 1 - arch/x86/lguest/boot.c | 2 -- arch/x86/xen/enlighten.c | 1 - 7 files changed, 19 deletions(-)
arch/x86/include/asm/paravirt.h +0 -5
@@ -15,11 +15,6 @@#include <linux/cpumask.h> #include <asm/frame.h> -static inline int paravirt_enabled (void ) -{ -return pv_info.paravirt_enabled; -} -static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread) {
arch/x86/include/asm/paravirt_types.h +0 -1
@@ -69,7 +69,6 @@ struct pv_info {u16 extra_user_64bit_cs;/* __USER_CS if none */ #endif -int paravirt_enabled;const char *name; };
arch/x86/include/asm/processor.h +0 -1
@@ -473,7 +473,6 @@ static inline unsigned long current_top_of_stack(void)#include <asm/paravirt.h> #else #define __cpuid native_cpuid -#define paravirt_enabled () 0static inline void load_sp0 (struct tss_struct *tss,struct thread_struct *thread)
arch/x86/kernel/kvm.c +0 -8
@@ -285,14 +285,6 @@ static void __init paravirt_ops_setup(void) { pv_info.name ="KVM" ; -/* -* KVM isn't paravirt in the sense of paravirt_enabled. A KVM -* guest kernel works like a bare metal kernel with additional -* features, and paravirt_enabled is about features that are -* missing. -*/ - pv_info.paravirt_enabled =0 ; -if (kvm_para_has_feature (KVM_FEATURE_NOP_IO_DELAY )) pv_cpu_ops.io_delay = kvm_io_delay;
arch/x86/kernel/paravirt.c +0 -1
@@ -294,7 +294,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)struct pv_info pv_info = { .name ="bare hardware" , - .paravirt_enabled =0 , .kernel_rpl =0 , .shared_kernel_pmd =1 ,/* Only used when CONFIG_X86_PAE is set */
arch/x86/lguest/boot.c +0 -2
@@ -1408,8 +1408,6 @@ __init void lguest_init(void) {/* We're under lguest. */ pv_info.name ="lguest" ; -/* Paravirt is enabled. */ - pv_info.paravirt_enabled =1 ;/* We're running at privilege level 1, not 0 as normal. */ pv_info.kernel_rpl =1 ;/* Everyone except Xen runs with this set. */
arch/x86/xen/enlighten.c +0 -1
@@ -1186,7 +1186,6 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, }static const struct pv_info xen_info__initconst = { - .paravirt_enabled =1 , .shared_kernel_pmd =0 , #ifdef CONFIG_X86_64
Signature · 1 line
2.7.2
BTW also here's a tree if someone needs it:
https://git.kernel.org/cgit/linux/kernel/git/mcgrof/linux-next.git/log/?h=20160408-pv-disabled-v5
Luis