x86/cpu: Some more cpu_has_YYY removal
Subsystems (14)
Borislav Petkov
maintainercover x86/cpu: Some more cpu_has_YYY removal
From: Borislav Petkov <[email protected]>
Here's another set of patches getting rid of cpu_has_YYY macros. Saving the best for last.
I did some build and boot tests but I'll let the 0day robot chew on it too.
Borislav Petkov (10):
x86/cpufeature: Kill cpu_has_arch_perfmon
x86/cpufeature: Kill cpu_has_hypervisor
x86/cpufeature: Kill cpu_has_osxsave
x86/cpufeature: Kill cpu_has_x2apic
x86/cpufeature: Kill cpu_has_gbpages
x86/cpufeature: Kill cpu_has_clflush
x86/cpufeature: Kill cpu_has_xmm2
x86/cpufeature: Kill cpu_has_pat
x86/cpufeature: Kill cpu_has_pge
x86/cpufeature: Kill cpu_has_pse
arch/ia64/include/asm/iommu.h | 1 - arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 ++- arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +- arch/x86/crypto/poly1305_glue.c | 2 +- arch/x86/crypto/serpent_avx2_glue.c | 2 +- arch/x86/crypto/serpent_sse2_glue.c | 2 +- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/include/asm/apic.h | 4 ++-- arch/x86/include/asm/cpufeature.h | 10 ---------- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/include/asm/tlbflush.h | 2 +- arch/x86/include/asm/xor_avx.h | 4 ++-- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/intel.c | 10 +++++----- arch/x86/kernel/cpu/mtrr/cyrix.c | 4 ++-- arch/x86/kernel/cpu/mtrr/generic.c | 4 ++-- arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/tce_64.c | 2 +- arch/x86/kvm/mmu.c | 3 ++- arch/x86/lib/usercopy_32.c | 4 ++-- arch/x86/mm/hugetlbpage.c | 4 ++-- arch/x86/mm/init.c | 8 ++++---- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 4 ++-- arch/x86/mm/ioremap.c | 4 ++-- arch/x86/mm/pageattr.c | 4 ++-- arch/x86/mm/pat.c | 4 ++-- arch/x86/oprofile/nmi_int.c | 4 ++-- arch/x86/oprofile/op_model_ppro.c | 2 +- arch/x86/power/hibernate_32.c | 2 +- arch/x86/xen/enlighten.c | 4 ++-- drivers/gpu/drm/drm_cache.c | 6 +++--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/lguest/x86/core.c | 2 +- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- 39 files changed, 60 insertions(+), 69 deletions(-)
Signature · 1 line
2.7.3
Borislav Petkov
maintainerPATCH 1/10 x86/cpufeature: Kill cpu_has_arch_perfmon
From: Borislav Petkov <[email protected]>
Use boot_cpu_has() instead.
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/oprofile/nmi_int.c | 4 ++-- arch/x86/oprofile/op_model_ppro.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -131,7 +131,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES) -#define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)
arch/x86/oprofile/nmi_int.c +2 -2
@@ -636,7 +636,7 @@ static int __init ppro_init(char **cpu_type)__u8 cpu_model = boot_cpu_data.x86_model;struct op_x86_model_spec *spec = &op_ppro_spec;/* default */ -if (force_cpu_type == arch_perfmon && cpu_has_arch_perfmon) +if (force_cpu_type == arch_perfmon &&boot_cpu_has (X86_FEATURE_ARCH_PERFMON ))return 0 ;/*
@@ -761,7 +761,7 @@ int __init op_nmi_init(struct oprofile_operations *ops)if (cpu_type)break ; -if (!cpu_has_arch_perfmon) +if (!boot_cpu_has (X86_FEATURE_ARCH_PERFMON ))return -ENODEV ;/* use arch perfmon as fallback */
arch/x86/oprofile/op_model_ppro.c +1 -1
@@ -75,7 +75,7 @@ static void ppro_setup_ctrs(struct op_x86_model_spec const *model,u64 val;int i; -if (cpu_has_arch_perfmon) { +if (boot_cpu_has (X86_FEATURE_ARCH_PERFMON )) {union cpuid10_eax eax; eax.full =cpuid_eax (0xa );
Signature · 1 line
2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_arch_perfmon
x86/cpufeature: Remove cpu_has_arch_perfmon
Commit-ID: 7b5e74e637e4a977c7cf40fd7de332f60b68180e Gitweb: http://git.kernel.org/tip/7b5e74e637e4a977c7cf40fd7de332f60b68180e Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:41:54 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:33:17 +0200
x86/cpufeature: Remove cpu_has_arch_perfmon
Use boot_cpu_has() instead.
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/oprofile/nmi_int.c | 4 ++-- arch/x86/oprofile/op_model_ppro.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -131,7 +131,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES) -#define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)
arch/x86/oprofile/nmi_int.c +2 -2
@@ -636,7 +636,7 @@ static int __init ppro_init(char **cpu_type)__u8 cpu_model = boot_cpu_data.x86_model;struct op_x86_model_spec *spec = &op_ppro_spec;/* default */ -if (force_cpu_type == arch_perfmon && cpu_has_arch_perfmon) +if (force_cpu_type == arch_perfmon &&boot_cpu_has (X86_FEATURE_ARCH_PERFMON ))return 0 ;/*
@@ -761,7 +761,7 @@ int __init op_nmi_init(struct oprofile_operations *ops)if (cpu_type)break ; -if (!cpu_has_arch_perfmon) +if (!boot_cpu_has (X86_FEATURE_ARCH_PERFMON ))return -ENODEV ;/* use arch perfmon as fallback */
arch/x86/oprofile/op_model_ppro.c +1 -1
@@ -75,7 +75,7 @@ static void ppro_setup_ctrs(struct op_x86_model_spec const *model,u64 val;int i; -if (cpu_has_arch_perfmon) { +if (boot_cpu_has (X86_FEATURE_ARCH_PERFMON )) {union cpuid10_eax eax; eax.full =cpuid_eax (0xa );
Borislav Petkov
maintainerPATCH 2/10 x86/cpufeature: Kill cpu_has_hypervisor
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Use boot_cpu_has() instead.
--- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kernel/kvm.c | 2 +- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-)
arch/x86/events/intel/cstate.c +1 -1
@@ -677,7 +677,7 @@ static int __init cstate_pmu_init(void) {int err; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; err =cstate_init ();
arch/x86/events/intel/uncore.c +1 -1
@@ -1383,7 +1383,7 @@ static int __init intel_uncore_init(void)if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return -ENODEV ; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; max_packages =topology_max_packages ();
arch/x86/include/asm/cpufeature.h +0 -1
@@ -136,7 +136,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)#define cpu_has_osxsave boot_cpu_has(X86_FEATURE_OSXSAVE) -#define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR)/* * Do not add any more of those clumsy macros - use static_cpu_has() for * fast paths and boot_cpu_has() otherwise!
arch/x86/kernel/cpu/vmware.c +1 -1
@@ -94,7 +94,7 @@ static void __init vmware_platform_setup(void)*/ static uint32_t __init vmware_platform (void ) { -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {unsigned int eax;unsigned int hyper_vendor_id[3 ];
arch/x86/kernel/kvm.c +1 -1
@@ -522,7 +522,7 @@ static noinline uint32_t __kvm_cpuid_base(void)if (boot_cpu_data.cpuid_level <0 )return 0 ;/* So we don't blow up on old processors */ -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return hypervisor_cpuid_base ("KVMKVMKVM\0\0\0" ,0 );return 0 ;
drivers/staging/unisys/visorbus/visorchipset.c +1 -1
@@ -2425,7 +2425,7 @@ static __init uint32_t visorutil_spar_detect(void) {unsigned int eax, ebx, ecx, edx; -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {/* check the ID */ cpuid (UNISYS_SPAR_LEAF_ID , &eax, &ebx, &ecx, &edx); return (ebx == UNISYS_SPAR_ID_EBX) &&
Signature · 1 line
2.7.3
RE: [PATCH 02/10] x86/cpufeature: Kill cpu_has_hypervisor
Quoted 9 lines
-----Original Message-----
From: Borislav Petkov [mailto:[email protected]]
Sent: Tuesday, March 29, 2016 11:42 AM
To: X86 ML <[email protected]>
Cc: LKML <[email protected]>; [email protected] foundation.org; *S-Par-Maintainer <[email protected]>
Subject: [PATCH 02/10] x86/cpufeature: Killcpu_has_hypervisor
Quoted 5 lines
From: Borislav Petkov <[email protected]>
Use
boot_cpu_has()instead.Signed-off-by Borislav Petkov <[email protected]>
Quoted 96 lines
--- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kernel/kvm.c | 2 +- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-)arch/x86/events/intel/cstate.c +1
-1@@ -677,7 +677,7 @@ static int __init cstate_pmu_init(void) {int err; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; err =cstate_init ();arch/x86/events/intel/uncore.c +1
-1@@ -1383,7 +1383,7 @@ static int __init intel_uncore_init(void)if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return -ENODEV ; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; max_packages =topology_max_packages ();arch/x86/include/asm/cpufeature.h +0
-0@@ -136,7 +136,6 @@ extern const char * const x86_bug_flags[NBUGINTS *32 ];#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsavesboot_cpu_has (X86_FEATURE_XSAVES) #define cpu_has_osxsave
boot_cpu_has(X86_FEATURE_OSXSAVE)arch/x86/include/asm/cpufeature.h +0
-1-#define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR)/* * Do not add any more of those clumsy macros - use static_cpu_has() for * fast paths and boot_cpu_has() otherwise! arch/x86/kernel/cpu/vmware.c +1
-1@@ -94,7 +94,7 @@ static void __init vmware_platform_setup(void)*/ static uint32_t __init vmware_platform (void ) { -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {unsigned int eax;unsigned int hyper_vendor_id[3 ];arch/x86/kernel/kvm.c +1
-1@@ -522,7 +522,7 @@ static noinline uint32_t __kvm_cpuid_base(void)if (boot_cpu_data.cpuid_level <0 )return 0 ;/* So we don't blow up on old processors */ -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return hypervisor_cpuid_base ("KVMKVMKVM\0\0\0" ,0 );return 0 ;drivers/staging/unisys/visorbus/visorchipset.c +1
-2@@ -2425,7 +2425,7 @@ static __init uint32_t visorutil_spar_detect(void) {unsigned int eax, ebx, ecx, edx; -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {/* check the ID */ cpuid (UNISYS_SPAR_LEAF_ID , &eax, &ebx, &ecx, &edx); return (ebx == UNISYS_SPAR_ID_EBX) && --2.7.3
RE: [PATCH 02/10] x86/cpufeature: Kill cpu_has_hypervisor
In reply to Borislav PetkovQuoted 9 lines
-----Original Message-----
From: Borislav Petkov [mailto:[email protected]]
Sent: Tuesday, March 29, 2016 11:42 AM
To: X86 ML <[email protected]>
Cc: LKML <[email protected]>; [email protected] foundation.org; *S-Par-Maintainer <[email protected]>
Subject: [PATCH 02/10] x86/cpufeature: Killcpu_has_hypervisor
Quoted 5 lines
From: Borislav Petkov <[email protected]>
Use
boot_cpu_has()instead.Signed-off-by Borislav Petkov <[email protected]>
Quoted 96 lines
--- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kernel/kvm.c | 2 +- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-)arch/x86/events/intel/cstate.c +1
-1@@ -677,7 +677,7 @@ static int __init cstate_pmu_init(void) {int err; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; err =cstate_init ();arch/x86/events/intel/uncore.c +1
-1@@ -1383,7 +1383,7 @@ static int __init intel_uncore_init(void)if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return -ENODEV ; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; max_packages =topology_max_packages ();arch/x86/include/asm/cpufeature.h +0
-0@@ -136,7 +136,6 @@ extern const char * const x86_bug_flags[NBUGINTS *32 ];#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsavesboot_cpu_has (X86_FEATURE_XSAVES) #define cpu_has_osxsave
boot_cpu_has(X86_FEATURE_OSXSAVE)arch/x86/include/asm/cpufeature.h +0
-1-#define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR)/* * Do not add any more of those clumsy macros - use static_cpu_has() for * fast paths and boot_cpu_has() otherwise! arch/x86/kernel/cpu/vmware.c +1
-1@@ -94,7 +94,7 @@ static void __init vmware_platform_setup(void)*/ static uint32_t __init vmware_platform (void ) { -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {unsigned int eax;unsigned int hyper_vendor_id[3 ];arch/x86/kernel/kvm.c +1
-1@@ -522,7 +522,7 @@ static noinline uint32_t __kvm_cpuid_base(void)if (boot_cpu_data.cpuid_level <0 )return 0 ;/* So we don't blow up on old processors */ -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return hypervisor_cpuid_base ("KVMKVMKVM\0\0\0" ,0 );return 0 ;drivers/staging/unisys/visorbus/visorchipset.c +1
-2@@ -2425,7 +2425,7 @@ static __init uint32_t visorutil_spar_detect(void) {unsigned int eax, ebx, ecx, edx; -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {/* check the ID */ cpuid (UNISYS_SPAR_LEAF_ID , &eax, &ebx, &ecx, &edx); return (ebx == UNISYS_SPAR_ID_EBX) && --2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_hypervisor
In reply to Borislav Petkovx86/cpufeature: Remove cpu_has_hypervisor
Commit-ID: 0c9f3536cc712dfd5ec3127d55cd7b807cc0adb5 Gitweb: http://git.kernel.org/tip/0c9f3536cc712dfd5ec3127d55cd7b807cc0adb5 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:41:55 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:07 +0200
x86/cpufeature: Remove cpu_has_hypervisor
Use boot_cpu_has() instead.
--- arch/x86/events/intel/uncore.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/vmware.c | 2 +- arch/x86/kernel/kvm.c | 2 +- drivers/staging/unisys/visorbus/visorchipset.c | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/events/intel/uncore.c +1 -1
@@ -1383,7 +1383,7 @@ static int __init intel_uncore_init(void)if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return -ENODEV ; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; max_packages =topology_max_packages ();
arch/x86/include/asm/cpufeature.h +0 -1
@@ -136,7 +136,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)#define cpu_has_osxsave boot_cpu_has(X86_FEATURE_OSXSAVE) -#define cpu_has_hypervisor boot_cpu_has(X86_FEATURE_HYPERVISOR)/* * Do not add any more of those clumsy macros - use static_cpu_has() for * fast paths and boot_cpu_has() otherwise!
arch/x86/kernel/cpu/vmware.c +1 -1
@@ -94,7 +94,7 @@ static void __init vmware_platform_setup(void)*/ static uint32_t __init vmware_platform (void ) { -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {unsigned int eax;unsigned int hyper_vendor_id[3 ];
arch/x86/kernel/kvm.c +1 -1
@@ -522,7 +522,7 @@ static noinline uint32_t __kvm_cpuid_base(void)if (boot_cpu_data.cpuid_level <0 )return 0 ;/* So we don't blow up on old processors */ -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return hypervisor_cpuid_base ("KVMKVMKVM\0\0\0" ,0 );return 0 ;
drivers/staging/unisys/visorbus/visorchipset.c +1 -1
@@ -2425,7 +2425,7 @@ static __init uint32_t visorutil_spar_detect(void) {unsigned int eax, ebx, ecx, edx; -if (cpu_has_hypervisor) { +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) {/* check the ID */ cpuid (UNISYS_SPAR_LEAF_ID , &eax, &ebx, &ecx, &edx); return (ebx == UNISYS_SPAR_ID_EBX) &&
tip-bot for Ingo Molnar
merge bot[tip:x86/cpu] x86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has_hypervisor
In reply to Borislav Petkovx86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has_hypervisor
Commit-ID: d7847a7017b2a2759dd5590c0cffdbdf2994918e Gitweb: http://git.kernel.org/tip/d7847a7017b2a2759dd5590c0cffdbdf2994918e Author: Ingo Molnar <[email protected]> AuthorDate: Fri, 1 Apr 2016 09:00:35 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 1 Apr 2016 09:03:27 +0200
x86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has_hypervisor
The 0-day build robot by Fengguang Wu reported a build failure:
arch/x86/events//intel/cstate.c: In function 'cstate_pmu_init':
arch/x86/events//intel/cstate.c:680:6: error: 'cpu_has_hypervisor' undeclared (first use in this function)
... which was caused by a merge mistake I made when applying the following patch:
0c9f3536cc71 ("x86/cpufeature: Remove cpu_has_hypervisor")
apply the missing hunk as well.
--- arch/x86/events/intel/cstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/cstate.c +1 -1
@@ -677,7 +677,7 @@ static int __init cstate_pmu_init(void) {int err; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; err =cstate_init ();
Borislav Petkov
Acked-byRe: [tip:x86/cpu] x86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has_hypervisor
Quoted 40 lines · tip-bot for Ingo Molnar
Commit-ID: d7847a7017b2a2759dd5590c0cffdbdf2994918e Gitweb: http://git.kernel.org/tip/d7847a7017b2a2759dd5590c0cffdbdf2994918e Author: Ingo Molnar <[email protected]> AuthorDate: Fri, 1 Apr 2016 09:00:35 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 1 Apr 2016 09:03:27 +0200x86/cpufeature: Fix build bug caused by merge artifact with the removal of
cpu_has_hypervisorThe 0-day build robot by Fengguang Wu reported a build failure:
arch/x86/events//intel/cstate.c: In function '
cstate_pmu_init':
arch/x86/events//intel/cstate.c:680:6: error: 'cpu_has_hypervisor' undeclared (first use in this function)... which was caused by a merge mistake I made when applying the following patch:
0c9f3536cc71("x86/cpufeature: Removecpu_has_hypervisor")apply the missing hunk as well.
Reported-by kbuild test robot <[email protected]>Cc David Kershner <[email protected]>Cc Borislav Petkov <[email protected]>Cc Linus Torvalds <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Thomas Gleixner <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/events/intel/cstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/events/intel/cstate.c +0
-0
arch/x86/events/intel/cstate.c static int __init cstate_pmu_init(void) · line 683
Quoted 8 lines
arch/x86/events/intel/cstate.c +1
-1@@ -677,7 +677,7 @@ static int __init cstate_pmu_init(void) {int err; -if (cpu_has_hypervisor) +if (boot_cpu_has (X86_FEATURE_HYPERVISOR ))return -ENODEV ; err =cstate_init ();
Signature · 5 lines
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
-- Borislav Petkov
maintainerPATCH 3/10 x86/cpufeature: Kill cpu_has_osxsave
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Use boot_cpu_has() instead.
--- arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 ++- arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +- arch/x86/crypto/serpent_avx2_glue.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/xor_avx.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/crypto/camellia_aesni_avx2_glue.c +2 -1
@@ -562,7 +562,8 @@ static int __init camellia_aesni_init(void) {const char *feature_name; -if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) { +if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || + !boot_cpu_has (X86_FEATURE_OSXSAVE )) {pr_info ("AVX2 or AES-NI instructions are not detected.\n" );return -ENODEV ; }
arch/x86/crypto/camellia_aesni_avx_glue.c +1 -1
@@ -554,7 +554,7 @@ static int __init camellia_aesni_init(void) {const char *feature_name; -if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) { +if (!cpu_has_avx || !cpu_has_aes || !boot_cpu_has (X86_FEATURE_OSXSAVE )) {pr_info ("AVX or AES-NI instructions are not detected.\n" );return -ENODEV ; }
arch/x86/crypto/serpent_avx2_glue.c +1 -1
@@ -538,7 +538,7 @@ static int __init init(void) {const char *feature_name; -if (!cpu_has_avx2 || !cpu_has_osxsave) { +if (!cpu_has_avx2 || !boot_cpu_has (X86_FEATURE_OSXSAVE )) {pr_info ("AVX2 instructions are not detected.\n" );return -ENODEV ; }
arch/x86/include/asm/cpufeature.h +0 -1
@@ -135,7 +135,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) -#define cpu_has_osxsave boot_cpu_has(X86_FEATURE_OSXSAVE)/* * Do not add any more of those clumsy macros - use static_cpu_has() for * fast paths and boot_cpu_has() otherwise!
arch/x86/include/asm/xor_avx.h +2 -2
@@ -167,12 +167,12 @@ static struct xor_block_template xor_block_avx = {#define AVX_XOR_SPEED \ do { \ - if (cpu_has_avx && cpu_has_osxsave) \ + if (cpu_has_avx && boot_cpu_has(X86_FEATURE_OSXSAVE)) \ xor_speed(&xor_block_avx); \ } while (0)#define AVX_SELECT (FASTEST ) \ - (cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST) + (cpu_has_avx && boot_cpu_has(X86_FEATURE_OSXSAVE) ? &xor_block_avx : FASTEST)#else
Signature · 1 line
2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_osxsave
x86/cpufeature: Remove cpu_has_osxsave
Commit-ID: ab4a56fa2c6ce9384ca077b6570c56fe18361f17 Gitweb: http://git.kernel.org/tip/ab4a56fa2c6ce9384ca077b6570c56fe18361f17 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:41:56 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:08 +0200
x86/cpufeature: Remove cpu_has_osxsave
Use boot_cpu_has() instead.
--- arch/x86/crypto/camellia_aesni_avx2_glue.c | 3 ++- arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +- arch/x86/crypto/serpent_avx2_glue.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/xor_avx.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/crypto/camellia_aesni_avx2_glue.c +2 -1
@@ -562,7 +562,8 @@ static int __init camellia_aesni_init(void) {const char *feature_name; -if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) { +if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || + !boot_cpu_has (X86_FEATURE_OSXSAVE )) {pr_info ("AVX2 or AES-NI instructions are not detected.\n" );return -ENODEV ; }
arch/x86/crypto/camellia_aesni_avx_glue.c +1 -1
@@ -554,7 +554,7 @@ static int __init camellia_aesni_init(void) {const char *feature_name; -if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) { +if (!cpu_has_avx || !cpu_has_aes || !boot_cpu_has (X86_FEATURE_OSXSAVE )) {pr_info ("AVX or AES-NI instructions are not detected.\n" );return -ENODEV ; }
arch/x86/crypto/serpent_avx2_glue.c +1 -1
@@ -538,7 +538,7 @@ static int __init init(void) {const char *feature_name; -if (!cpu_has_avx2 || !cpu_has_osxsave) { +if (!cpu_has_avx2 || !boot_cpu_has (X86_FEATURE_OSXSAVE )) {pr_info ("AVX2 instructions are not detected.\n" );return -ENODEV ; }
arch/x86/include/asm/cpufeature.h +0 -1
@@ -135,7 +135,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) -#define cpu_has_osxsave boot_cpu_has(X86_FEATURE_OSXSAVE)/* * Do not add any more of those clumsy macros - use static_cpu_has() for * fast paths and boot_cpu_has() otherwise!
arch/x86/include/asm/xor_avx.h +2 -2
@@ -167,12 +167,12 @@ static struct xor_block_template xor_block_avx = {#define AVX_XOR_SPEED \ do { \ - if (cpu_has_avx && cpu_has_osxsave) \ + if (cpu_has_avx && boot_cpu_has(X86_FEATURE_OSXSAVE)) \ xor_speed(&xor_block_avx); \ } while (0)#define AVX_SELECT (FASTEST ) \ - (cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST) + (cpu_has_avx && boot_cpu_has(X86_FEATURE_OSXSAVE) ? &xor_block_avx : FASTEST)#else
Borislav Petkov
maintainerPATCH 4/10 x86/cpufeature: Kill cpu_has_x2apic
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
Tony, it looks like that cpu_has_x2apic in asm/iommu.h has been forgotten and can go now?
The other usages are all in arch/x86/.
arch/ia64/include/asm/iommu.h | 1 - arch/x86/include/asm/apic.h | 4 ++-- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/apic/apic.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)
arch/ia64/include/asm/iommu.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_IA64_IOMMU_H#define _ASM_IA64_IOMMU_H 1 -#define cpu_has_x2apic 0/* 10 seconds */ #define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10)
arch/x86/include/asm/apic.h +2 -2
@@ -239,10 +239,10 @@ extern void __init check_x2apic(void);extern void x2apic_setup (void );static inline int x2apic_enabled (void ) { -return cpu_has_x2apic &&apic_is_x2apic_enabled (); +return boot_cpu_has (X86_FEATURE_X2APIC ) &&apic_is_x2apic_enabled (); } -#define x2apic_supported () (cpu_has_x2apic) +#define x2apic_supported () (boot_cpu_has(X86_FEATURE_X2APIC))#else /* !CONFIG_X86_X2APIC */ static inline void check_x2apic (void ) { }static inline void x2apic_setup (void ) { }
arch/x86/include/asm/cpufeature.h +0 -1
@@ -132,7 +132,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT) -#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)/*
arch/x86/kernel/apic/apic.c +1 -1
@@ -1561,7 +1561,7 @@ void __init check_x2apic(void)pr_info ("x2apic: enabled by BIOS, switching to x2apic ops\n" ); x2apic_mode =1 ; x2apic_state =X2APIC_ON ; - }else if (!cpu_has_x2apic) { + }else if (!boot_cpu_has (X86_FEATURE_X2APIC )) { x2apic_state =X2APIC_DISABLED ; } }
Signature · 1 line
2.7.3
RE: [PATCH 04/10] x86/cpufeature: Kill cpu_has_x2apic
Quoted 2 lines
Tony, it looks like that
cpu_has_x2apicinasm/iommu.hhas been forgotten and can go now?
Yes - it looks to be a relic of some common code with x86 where ia64 needed To indicate that it didn't have x2apic. Dropping it looks fine.
-Tony
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_x2apic
In reply to Borislav Petkovx86/cpufeature: Remove cpu_has_x2apic
Commit-ID: 62436a4d36c94d202784cd8a997ff8bb4b880237 Gitweb: http://git.kernel.org/tip/62436a4d36c94d202784cd8a997ff8bb4b880237 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:41:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:08 +0200
x86/cpufeature: Remove cpu_has_x2apic
--- arch/ia64/include/asm/iommu.h | 1 - arch/x86/include/asm/apic.h | 4 ++-- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/apic/apic.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)
arch/ia64/include/asm/iommu.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_IA64_IOMMU_H#define _ASM_IA64_IOMMU_H 1 -#define cpu_has_x2apic 0/* 10 seconds */ #define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10)
arch/x86/include/asm/apic.h +2 -2
@@ -239,10 +239,10 @@ extern void __init check_x2apic(void);extern void x2apic_setup (void );static inline int x2apic_enabled (void ) { -return cpu_has_x2apic &&apic_is_x2apic_enabled (); +return boot_cpu_has (X86_FEATURE_X2APIC ) &&apic_is_x2apic_enabled (); } -#define x2apic_supported () (cpu_has_x2apic) +#define x2apic_supported () (boot_cpu_has(X86_FEATURE_X2APIC))#else /* !CONFIG_X86_X2APIC */ static inline void check_x2apic (void ) { }static inline void x2apic_setup (void ) { }
arch/x86/include/asm/cpufeature.h +0 -1
@@ -132,7 +132,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT) -#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)/*
arch/x86/kernel/apic/apic.c +1 -1
@@ -1561,7 +1561,7 @@ void __init check_x2apic(void)pr_info ("x2apic: enabled by BIOS, switching to x2apic ops\n" ); x2apic_mode =1 ; x2apic_state =X2APIC_ON ; - }else if (!cpu_has_x2apic) { + }else if (!boot_cpu_has (X86_FEATURE_X2APIC )) { x2apic_state =X2APIC_DISABLED ; } }
Borislav Petkov
maintainerPATCH 5/10 x86/cpufeature: Kill cpu_has_gbpages
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kvm/mmu.c | 3 ++- arch/x86/mm/hugetlbpage.c | 4 ++-- arch/x86/mm/init.c | 2 +- arch/x86/mm/ioremap.c | 2 +- arch/x86/mm/pageattr.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -130,7 +130,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH) -#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
arch/x86/kvm/mmu.c +2 -1
@@ -3836,7 +3836,8 @@ reset_tdp_shadow_zero_bits_mask(struct kvm_vcpu *vcpu,__reset_rsvds_bits_mask (vcpu, &context->shadow_zero_check, boot_cpu_data.x86_phys_bits, context->shadow_root_level, false, - cpu_has_gbpages, true, true); +boot_cpu_has (X86_FEATURE_GBPAGES ), + true, true); else __reset_rsvds_bits_mask_ept(&context->shadow_zero_check, boot_cpu_data.x86_phys_bits,
arch/x86/mm/hugetlbpage.c +2 -2
@@ -162,7 +162,7 @@ static __init int setup_hugepagesz(char *opt)unsigned long ps =memparse (opt, &opt);if (ps ==PMD_SIZE ) {hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); - }else if (ps ==PUD_SIZE && cpu_has_gbpages) { + }else if (ps ==PUD_SIZE &&boot_cpu_has (X86_FEATURE_GBPAGES )) {hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT ); }else { printk(KERN_ERR "hugepagesz: Unsupported page size %lu M\n",
@@ -177,7 +177,7 @@ __setup("hugepagesz=", setup_hugepagesz);static __init int gigantic_pages_init (void ) {/* With compaction or CMA we can allocate gigantic pages at runtime */ -if (cpu_has_gbpages && !size_to_hstate (1UL <<PUD_SHIFT )) +if (boot_cpu_has (X86_FEATURE_GBPAGES ) && !size_to_hstate (1UL <<PUD_SHIFT ))hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );return 0 ; }
arch/x86/mm/init.c +1 -1
@@ -173,7 +173,7 @@ static void __init probe_page_size_mask(void) __supported_pte_mask &= ~_PAGE_GLOBAL;/* Enable 1 GB linear kernel mappings if available: */ -if (direct_gbpages && cpu_has_gbpages) { +if (direct_gbpages &&boot_cpu_has (X86_FEATURE_GBPAGES )) {printk (KERN_INFO "Using GB pages for direct mapping\n" ); page_size_mask |=1 <<PG_LEVEL_1G ; }else {
arch/x86/mm/ioremap.c +1 -1
@@ -378,7 +378,7 @@ EXPORT_SYMBOL(iounmap);int __init arch_ioremap_pud_supported (void ) {#ifdef CONFIG_X86_64 -return cpu_has_gbpages; +return boot_cpu_has (X86_FEATURE_GBPAGES );#else return 0 ;#endif
arch/x86/mm/pageattr.c +1 -1
@@ -1055,7 +1055,7 @@ static int populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd,/* * Map everything starting from the Gb boundary, possibly with 1G pages */ -while (cpu_has_gbpages && end - start >=PUD_SIZE ) { +while (boot_cpu_has (X86_FEATURE_GBPAGES ) && end - start >=PUD_SIZE ) {set_pud (pud,__pud (cpa->pfn <<PAGE_SHIFT | _PAGE_PSE |massage_pgprot (pud_pgprot)));
Signature · 1 line
2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_gbpages
x86/cpufeature: Remove cpu_has_gbpages
Commit-ID: b8291adc191abec2095f03a130ac91506d345cae Gitweb: http://git.kernel.org/tip/b8291adc191abec2095f03a130ac91506d345cae Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:41:58 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:08 +0200
x86/cpufeature: Remove cpu_has_gbpages
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kvm/mmu.c | 3 ++- arch/x86/mm/hugetlbpage.c | 4 ++-- arch/x86/mm/init.c | 2 +- arch/x86/mm/ioremap.c | 2 +- arch/x86/mm/pageattr.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -130,7 +130,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH) -#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
arch/x86/kvm/mmu.c +2 -1
@@ -3836,7 +3836,8 @@ reset_tdp_shadow_zero_bits_mask(struct kvm_vcpu *vcpu,__reset_rsvds_bits_mask (vcpu, &context->shadow_zero_check, boot_cpu_data.x86_phys_bits, context->shadow_root_level, false, - cpu_has_gbpages, true, true); +boot_cpu_has (X86_FEATURE_GBPAGES ), + true, true); else __reset_rsvds_bits_mask_ept(&context->shadow_zero_check, boot_cpu_data.x86_phys_bits,
arch/x86/mm/hugetlbpage.c +2 -2
@@ -162,7 +162,7 @@ static __init int setup_hugepagesz(char *opt)unsigned long ps =memparse (opt, &opt);if (ps ==PMD_SIZE ) {hugetlb_add_hstate (PMD_SHIFT -PAGE_SHIFT ); - }else if (ps ==PUD_SIZE && cpu_has_gbpages) { + }else if (ps ==PUD_SIZE &&boot_cpu_has (X86_FEATURE_GBPAGES )) {hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT ); }else { printk(KERN_ERR "hugepagesz: Unsupported page size %lu M\n",
@@ -177,7 +177,7 @@ __setup("hugepagesz=", setup_hugepagesz);static __init int gigantic_pages_init (void ) {/* With compaction or CMA we can allocate gigantic pages at runtime */ -if (cpu_has_gbpages && !size_to_hstate (1UL <<PUD_SHIFT )) +if (boot_cpu_has (X86_FEATURE_GBPAGES ) && !size_to_hstate (1UL <<PUD_SHIFT ))hugetlb_add_hstate (PUD_SHIFT -PAGE_SHIFT );return 0 ; }
arch/x86/mm/init.c +1 -1
@@ -173,7 +173,7 @@ static void __init probe_page_size_mask(void) __supported_pte_mask &= ~_PAGE_GLOBAL;/* Enable 1 GB linear kernel mappings if available: */ -if (direct_gbpages && cpu_has_gbpages) { +if (direct_gbpages &&boot_cpu_has (X86_FEATURE_GBPAGES )) {printk (KERN_INFO "Using GB pages for direct mapping\n" ); page_size_mask |=1 <<PG_LEVEL_1G ; }else {
arch/x86/mm/ioremap.c +1 -1
@@ -378,7 +378,7 @@ EXPORT_SYMBOL(iounmap);int __init arch_ioremap_pud_supported (void ) {#ifdef CONFIG_X86_64 -return cpu_has_gbpages; +return boot_cpu_has (X86_FEATURE_GBPAGES );#else return 0 ;#endif
arch/x86/mm/pageattr.c +1 -1
@@ -1055,7 +1055,7 @@ static int populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd,/* * Map everything starting from the Gb boundary, possibly with 1G pages */ -while (cpu_has_gbpages && end - start >=PUD_SIZE ) { +while (boot_cpu_has (X86_FEATURE_GBPAGES ) && end - start >=PUD_SIZE ) {set_pud (pud,__pud (cpa->pfn <<PAGE_SHIFT | _PAGE_PSE |massage_pgprot (pud_pgprot)));
Borislav Petkov
maintainerPATCH 6/10 x86/cpufeature: Kill cpu_has_clflush
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Use the fast variant in the DRM code.
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/tce_64.c | 2 +- arch/x86/mm/pageattr.c | 2 +- drivers/gpu/drm/drm_cache.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -129,7 +129,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) -#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
arch/x86/kernel/cpu/intel.c +1 -1
@@ -468,7 +468,7 @@ static void init_intel(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_PEBS ); } -if (c->x86 ==6 && cpu_has_clflush && +if (c->x86 ==6 &&boot_cpu_has (X86_FEATURE_CLFLUSH ) && (c->x86_model ==29 || c->x86_model ==46 || c->x86_model ==47 ))set_cpu_bug (c,X86_BUG_CLFLUSH_MONITOR );
arch/x86/kernel/tce_64.c +1 -1
@@ -40,7 +40,7 @@static inline void flush_tce (void * tceaddr) {/* a single tce can't cross a cache line */ -if (cpu_has_clflush) +if (boot_cpu_has (X86_FEATURE_CLFLUSH ))clflush (tceaddr);else wbinvd ();
arch/x86/mm/pageattr.c +1 -1
@@ -1460,7 +1460,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,* error case we fall back to cpa_flush_all (which uses * WBINVD): */ -if (!ret && cpu_has_clflush) { +if (!ret &&boot_cpu_has (X86_FEATURE_CLFLUSH )) {if (cpa.flags & (CPA_PAGES_ARRAY |CPA_ARRAY )) {cpa_flush_array (addr, numpages, cache, cpa.flags, pages);
drivers/gpu/drm/drm_cache.c +3 -3
@@ -72,7 +72,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) {#if defined(CONFIG_X86 ) -if (cpu_has_clflush) { +if (static_cpu_has (X86_FEATURE_CLFLUSH )) {drm_cache_flush_clflush (pages, num_pages);return ; }
@@ -105,7 +105,7 @@ void drm_clflush_sg(struct sg_table *st) {#if defined(CONFIG_X86 ) -if (cpu_has_clflush) { +if (static_cpu_has (X86_FEATURE_CLFLUSH )) {struct sg_page_iter sg_iter;mb ();
@@ -129,7 +129,7 @@ void drm_clflush_virt_range(void *addr, unsigned long length) {#if defined(CONFIG_X86 ) -if (cpu_has_clflush) { +if (static_cpu_has (X86_FEATURE_CLFLUSH )) {const int size = boot_cpu_data.x86_clflush_size;void *end = addr + length; addr = (void *)(((unsigned long )addr) & -size);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -488,7 +488,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, ret =relocate_entry_cpu (obj, reloc, target_offset); else if (obj->map_and_fenceable) ret =relocate_entry_gtt (obj, reloc, target_offset); - else if (cpu_has_clflush) + else if (static_cpu_has(X86_FEATURE_CLFLUSH)) ret =relocate_entry_clflush (obj, reloc, target_offset); else {WARN_ONCE (1 ,"Impossible case in relocation handling\n" );
Signature · 6 lines
2.7.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_clflush
x86/cpufeature: Remove cpu_has_clflush
Commit-ID: 906bf7fda2c9cf5c1762ec607943ed54b6c5b203 Gitweb: http://git.kernel.org/tip/906bf7fda2c9cf5c1762ec607943ed54b6c5b203 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:41:59 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:09 +0200
x86/cpufeature: Remove cpu_has_clflush
Use the fast variant in the DRM code.
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/tce_64.c | 2 +- arch/x86/mm/pageattr.c | 2 +- drivers/gpu/drm/drm_cache.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -129,7 +129,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) -#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
arch/x86/kernel/cpu/intel.c +1 -1
@@ -468,7 +468,7 @@ static void init_intel(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_PEBS ); } -if (c->x86 ==6 && cpu_has_clflush && +if (c->x86 ==6 &&boot_cpu_has (X86_FEATURE_CLFLUSH ) && (c->x86_model ==29 || c->x86_model ==46 || c->x86_model ==47 ))set_cpu_bug (c,X86_BUG_CLFLUSH_MONITOR );
arch/x86/kernel/tce_64.c +1 -1
@@ -40,7 +40,7 @@static inline void flush_tce (void * tceaddr) {/* a single tce can't cross a cache line */ -if (cpu_has_clflush) +if (boot_cpu_has (X86_FEATURE_CLFLUSH ))clflush (tceaddr);else wbinvd ();
arch/x86/mm/pageattr.c +1 -1
@@ -1460,7 +1460,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,* error case we fall back to cpa_flush_all (which uses * WBINVD): */ -if (!ret && cpu_has_clflush) { +if (!ret &&boot_cpu_has (X86_FEATURE_CLFLUSH )) {if (cpa.flags & (CPA_PAGES_ARRAY |CPA_ARRAY )) {cpa_flush_array (addr, numpages, cache, cpa.flags, pages);
drivers/gpu/drm/drm_cache.c +3 -3
@@ -72,7 +72,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) {#if defined(CONFIG_X86 ) -if (cpu_has_clflush) { +if (static_cpu_has (X86_FEATURE_CLFLUSH )) {drm_cache_flush_clflush (pages, num_pages);return ; }
@@ -105,7 +105,7 @@ void drm_clflush_sg(struct sg_table *st) {#if defined(CONFIG_X86 ) -if (cpu_has_clflush) { +if (static_cpu_has (X86_FEATURE_CLFLUSH )) {struct sg_page_iter sg_iter;mb ();
@@ -129,7 +129,7 @@ void drm_clflush_virt_range(void *addr, unsigned long length) {#if defined(CONFIG_X86 ) -if (cpu_has_clflush) { +if (static_cpu_has (X86_FEATURE_CLFLUSH )) {const int size = boot_cpu_data.x86_clflush_size;void *end = addr + length; addr = (void *)(((unsigned long )addr) & -size);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -488,7 +488,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, ret =relocate_entry_cpu (obj, reloc, target_offset); else if (obj->map_and_fenceable) ret =relocate_entry_gtt (obj, reloc, target_offset); - else if (cpu_has_clflush) + else if (static_cpu_has(X86_FEATURE_CLFLUSH)) ret =relocate_entry_clflush (obj, reloc, target_offset); else {WARN_ONCE (1 ,"Impossible case in relocation handling\n" );
Borislav Petkov
maintainerPATCH 7/10 x86/cpufeature: Kill cpu_has_xmm2
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
--- arch/x86/crypto/poly1305_glue.c | 2 +- arch/x86/crypto/serpent_sse2_glue.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/lib/usercopy_32.c | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-)
arch/x86/crypto/poly1305_glue.c +1 -1
@@ -179,7 +179,7 @@ static struct shash_alg alg = {static int __init poly1305_simd_mod_init (void ) { -if (!cpu_has_xmm2) +if (!boot_cpu_has (X86_FEATURE_XMM2 ))return -ENODEV ;#ifdef CONFIG_AS_AVX2
arch/x86/crypto/serpent_sse2_glue.c +1 -1
@@ -600,7 +600,7 @@ static struct crypto_alg serpent_algs[10] = { {static int __init serpent_sse2_init (void ) { -if (!cpu_has_xmm2) { +if (!boot_cpu_has (X86_FEATURE_XMM2 )) {printk (KERN_INFO "SSE2 instructions are not detected.\n" );return -ENODEV ; }
arch/x86/include/asm/cpufeature.h +0 -1
@@ -125,7 +125,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM) -#define cpu_has_xmm2 boot_cpu_has(X86_FEATURE_XMM2)#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -750,7 +750,7 @@ static void init_amd(struct cpuinfo_x86 *c)if (c->x86 >=0xf )set_cpu_cap (c,X86_FEATURE_K8 ); -if (cpu_has_xmm2) { +if (cpu_has (c,X86_FEATURE_XMM2 )) {/* MFENCE stops RDTSC speculation */ set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); }
arch/x86/kernel/cpu/intel.c +1 -1
@@ -456,7 +456,7 @@ static void init_intel(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_ARCH_PERFMON ); } -if (cpu_has_xmm2) +if (cpu_has (c,X86_FEATURE_XMM2 ))set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC );if (boot_cpu_has (X86_FEATURE_DS )) {
arch/x86/lib/usercopy_32.c +2 -2
@@ -612,7 +612,7 @@ unsigned long __copy_from_user_ll_nocache(void *to, const void __user *from, {stac ();#ifdef CONFIG_X86_INTEL_USERCOPY -if (n >64 && cpu_has_xmm2) +if (n >64 &&static_cpu_has (X86_FEATURE_XMM2 )) n =__copy_user_zeroing_intel_nocache (to, from, n);else __copy_user_zeroing (to, from, n);
@@ -629,7 +629,7 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr {stac ();#ifdef CONFIG_X86_INTEL_USERCOPY -if (n >64 && cpu_has_xmm2) +if (n >64 &&static_cpu_has (X86_FEATURE_XMM2 )) n =__copy_user_intel_nocache (to, from, n);else __copy_user (to, from, n);
Signature · 1 line
2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_xmm2
x86/cpufeature: Remove cpu_has_xmm2
Commit-ID: 054efb6467f84490bdf92afab6d9dbd5102e620a Gitweb: http://git.kernel.org/tip/054efb6467f84490bdf92afab6d9dbd5102e620a Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:42:00 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:09 +0200
x86/cpufeature: Remove cpu_has_xmm2
--- arch/x86/crypto/poly1305_glue.c | 2 +- arch/x86/crypto/serpent_sse2_glue.c | 2 +- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/lib/usercopy_32.c | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-)
arch/x86/crypto/poly1305_glue.c +1 -1
@@ -179,7 +179,7 @@ static struct shash_alg alg = {static int __init poly1305_simd_mod_init (void ) { -if (!cpu_has_xmm2) +if (!boot_cpu_has (X86_FEATURE_XMM2 ))return -ENODEV ;#ifdef CONFIG_AS_AVX2
arch/x86/crypto/serpent_sse2_glue.c +1 -1
@@ -600,7 +600,7 @@ static struct crypto_alg serpent_algs[10] = { {static int __init serpent_sse2_init (void ) { -if (!cpu_has_xmm2) { +if (!boot_cpu_has (X86_FEATURE_XMM2 )) {printk (KERN_INFO "SSE2 instructions are not detected.\n" );return -ENODEV ; }
arch/x86/include/asm/cpufeature.h +0 -1
@@ -125,7 +125,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM) -#define cpu_has_xmm2 boot_cpu_has(X86_FEATURE_XMM2)#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -750,7 +750,7 @@ static void init_amd(struct cpuinfo_x86 *c)if (c->x86 >=0xf )set_cpu_cap (c,X86_FEATURE_K8 ); -if (cpu_has_xmm2) { +if (cpu_has (c,X86_FEATURE_XMM2 )) {/* MFENCE stops RDTSC speculation */ set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); }
arch/x86/kernel/cpu/intel.c +1 -1
@@ -456,7 +456,7 @@ static void init_intel(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_ARCH_PERFMON ); } -if (cpu_has_xmm2) +if (cpu_has (c,X86_FEATURE_XMM2 ))set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC );if (boot_cpu_has (X86_FEATURE_DS )) {
arch/x86/lib/usercopy_32.c +2 -2
@@ -612,7 +612,7 @@ unsigned long __copy_from_user_ll_nocache(void *to, const void __user *from, {stac ();#ifdef CONFIG_X86_INTEL_USERCOPY -if (n >64 && cpu_has_xmm2) +if (n >64 &&static_cpu_has (X86_FEATURE_XMM2 )) n =__copy_user_zeroing_intel_nocache (to, from, n);else __copy_user_zeroing (to, from, n);
@@ -629,7 +629,7 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr {stac ();#ifdef CONFIG_X86_INTEL_USERCOPY -if (n >64 && cpu_has_xmm2) +if (n >64 &&static_cpu_has (X86_FEATURE_XMM2 )) n =__copy_user_intel_nocache (to, from, n);else __copy_user (to, from, n);
Borislav Petkov
maintainerPATCH 8/10 x86/cpufeature: Kill cpu_has_pat
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
@tip guys, the pat_bsp_init() and pat_ap_init() hunk will conflict with
d63dcf49cf5a ("x86/mm/pat: Replace cpu_has_pat with boot_cpu_has()")
in tip/x86:mm. Let me know how you wanna handle it. Or you can simply delete those hunks below when applying after merging the above branch. Or I can send this patch later... Yadda yadda.
arch/x86/include/asm/cpufeature.h | 1 - arch/x86/mm/pat.c | 4 ++-- drivers/gpu/drm/i915/i915_gem.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -128,7 +128,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) -#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)/*
arch/x86/mm/pat.c +2 -2
@@ -202,7 +202,7 @@ static void pat_bsp_init(u64 pat) {u64 tmp_pat; -if (!cpu_has_pat) { +if (!boot_cpu_has (X86_FEATURE_PAT )) {pat_disable ("PAT not supported by CPU." );return ; }
@@ -227,7 +227,7 @@ static void pat_ap_init(u64 pat)if (!pat_enabled ())return ; -if (!cpu_has_pat) { +if (!boot_cpu_has (X86_FEATURE_PAT )) {/* * If this happens we are on a secondary CPU, but switched to * PAT on the boot CPU. We have no way to undo PAT.
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,if (args->flags & ~(I915_MMAP_WC ))return -EINVAL ; -if (args->flags &I915_MMAP_WC && !cpu_has_pat) +if (args->flags &I915_MMAP_WC && !boot_cpu_has (X86_FEATURE_PAT ))return -ENODEV ; obj =drm_gem_object_lookup (dev, file, args->handle);
Signature · 1 line
2.7.3
Re: [Intel-gfx] [PATCH 08/10] x86/cpufeature: Kill cpu_has_pat
Quoted 4 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Quoted 69 lines
---
@tip guys, the
pat_bsp_init()andpat_ap_init()hunk will conflict with
d63dcf49cf5a("x86/mm/pat: Replacecpu_has_patwithboot_cpu_has()")in tip/x86:mm. Let me know how you wanna handle it. Or you can simply delete those hunks below when applying after merging the above branch. Or I can send this patch later... Yadda yadda.
arch/x86/include/asm/cpufeature.h | 1 - arch/x86/mm/pat.c | 4 ++-- drivers/gpu/drm/i915/i915_gem.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)arch/x86/include/asm/cpufeature.h +0
-1@@ -128,7 +128,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_aes boot_cpu_has(X86_FEATURE_AES)#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) -#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)/* arch/x86/mm/pat.c +2
-2@@ -202,7 +202,7 @@ static void pat_bsp_init(u64 pat) {u64 tmp_pat; -if (!cpu_has_pat) { +if (!boot_cpu_has (X86_FEATURE_PAT )) {pat_disable ("PAT not supported by CPU." );return ; }@@ -227,7 +227,7 @@ static void pat_ap_init(u64 pat)if (!pat_enabled ())return ; -if (!cpu_has_pat) { +if (!boot_cpu_has (X86_FEATURE_PAT )) {/* * If this happens we are on a secondary CPU, but switched to * PAT on the boot CPU. We have no way to undo PAT. drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,if (args->flags & ~(I915_MMAP_WC ))return -EINVAL ; -if (args->flags &I915_MMAP_WC && !cpu_has_pat) +if (args->flags &I915_MMAP_WC && !boot_cpu_has (X86_FEATURE_PAT ))return -ENODEV ; obj =drm_gem_object_lookup (dev, file, args->handle);Signature · 6 lines
2.7.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
tip-bot for Borislav Petkov
merge bot[tip:x86/mm] x86/mm/pat, x86/cpufeature: Remove cpu_has_pat
In reply to Borislav Petkovx86/mm/pat, x86/cpufeature: Remove cpu_has_pat
Commit-ID: 568a58e5dfbcb88011cad7f87ed046aa00f19d1a Gitweb: http://git.kernel.org/tip/568a58e5dfbcb88011cad7f87ed046aa00f19d1a Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:42:01 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:32:43 +0200
x86/mm/pat, x86/cpufeature: Remove cpu_has_pat
--- arch/x86/include/asm/cpufeature.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -132,7 +132,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)#define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON) -#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,if (args->flags & ~(I915_MMAP_WC ))return -EINVAL ; -if (args->flags &I915_MMAP_WC && !cpu_has_pat) +if (args->flags &I915_MMAP_WC && !boot_cpu_has (X86_FEATURE_PAT ))return -ENODEV ; obj =drm_gem_object_lookup (dev, file, args->handle);
Borislav Petkov
maintainerPATCH 9/10 x86/cpufeature: Kill cpu_has_pge
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Use static_cpu_has() in __flush_tlb_all() due to the time-sensitivity of this one.
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/tlbflush.h | 2 +- arch/x86/kernel/cpu/intel.c | 6 +++--- arch/x86/kernel/cpu/mtrr/cyrix.c | 4 ++-- arch/x86/kernel/cpu/mtrr/generic.c | 4 ++-- arch/x86/mm/init.c | 2 +- arch/x86/xen/enlighten.c | 2 +- drivers/lguest/x86/core.c | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -121,7 +121,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC) -#define cpu_has_pge boot_cpu_has(X86_FEATURE_PGE)#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM)
arch/x86/include/asm/tlbflush.h +1 -1
@@ -181,7 +181,7 @@ static inline void __native_flush_tlb_single(unsigned long addr)static inline void __flush_tlb_all (void ) { -if (cpu_has_pge) +if (static_cpu_has (X86_FEATURE_PGE ))__flush_tlb_global ();else __flush_tlb ();
arch/x86/kernel/cpu/intel.c +3 -3
@@ -152,9 +152,9 @@ static void early_init_intel(struct cpuinfo_x86 *c)* the TLB when any changes are made to any of the page table entries. * The operating system must reload CR3 to cause the TLB to be flushed" * -* As a result cpu_has_pge() in arch/x86/include/asm/tlbflush.h should -* be false so that __flush_tlb_all() causes CR3 insted of CR4.PGE -* to be modified +* As a result, boot_cpu_has(X86_FEATURE_PGE) in arch/x86/include/asm/tlbflush.h +* should be false so that __flush_tlb_all() causes CR3 insted of CR4.PGE +* to be modified. */ if (c->x86 ==5 && c->x86_model ==9 ) {pr_info ("Disabling PGE capability bit\n" );
arch/x86/kernel/cpu/mtrr/cyrix.c +2 -2
@@ -137,7 +137,7 @@ static void prepare_set(void)u32 cr0;/* Save value of CR4 and clear Page Global Enable (bit 7) */ -if (cpu_has_pge) { +if (boot_cpu_has (X86_FEATURE_PGE )) { cr4 =__read_cr4 ();__write_cr4 (cr4 & ~X86_CR4_PGE ); }
@@ -170,7 +170,7 @@ static void post_set(void)write_cr0 (read_cr0 () & ~X86_CR0_CD );/* Restore value of CR4 */ -if (cpu_has_pge) +if (boot_cpu_has (X86_FEATURE_PGE ))__write_cr4 (cr4); }
arch/x86/kernel/cpu/mtrr/generic.c +2 -2
@@ -741,7 +741,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock)wbinvd ();/* Save value of CR4 and clear Page Global Enable (bit 7) */ -if (cpu_has_pge) { +if (boot_cpu_has (X86_FEATURE_PGE )) { cr4 =__read_cr4 ();__write_cr4 (cr4 & ~X86_CR4_PGE ); }
@@ -771,7 +771,7 @@ static void post_set(void) __releases(set_atomicity_lock)write_cr0 (read_cr0 () & ~X86_CR0_CD );/* Restore value of CR4 */ -if (cpu_has_pge) +if (boot_cpu_has (X86_FEATURE_PGE ))__write_cr4 (cr4);raw_spin_unlock (&set_atomicity_lock); }
arch/x86/mm/init.c +1 -1
@@ -166,7 +166,7 @@ static void __init probe_page_size_mask(void)cr4_set_bits_and_update_boot (X86_CR4_PSE );/* Enable PGE if available */ -if (cpu_has_pge) { +if (boot_cpu_has (X86_FEATURE_PGE )) {cr4_set_bits_and_update_boot (X86_CR4_PGE ); __supported_pte_mask |= _PAGE_GLOBAL; }else
arch/x86/xen/enlighten.c +1 -1
@@ -1472,7 +1472,7 @@ static void xen_pvh_set_cr_flags(int cpu)if (cpu_has_pse)cr4_set_bits_and_update_boot (X86_CR4_PSE ); -if (cpu_has_pge) +if (boot_cpu_has (X86_FEATURE_PGE ))cr4_set_bits_and_update_boot (X86_CR4_PGE ); }
drivers/lguest/x86/core.c +1 -1
@@ -599,7 +599,7 @@ void __init lguest_arch_host_init(void)* doing this. */ get_online_cpus (); -if (cpu_has_pge) {/* We have a broader idea of "global". */ +if (boot_cpu_has (X86_FEATURE_PGE )) {/* We have a broader idea of "global". */ /* Remember that this was originally set (for cleanup). */ cpu_had_pge =1 ;/*
Signature · 1 line
2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_pge
x86/cpufeature: Remove cpu_has_pge
Commit-ID: c109bf95992b391bb40bc37c5d309d13fead99b5 Gitweb: http://git.kernel.org/tip/c109bf95992b391bb40bc37c5d309d13fead99b5 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:42:02 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:09 +0200
x86/cpufeature: Remove cpu_has_pge
Use static_cpu_has() in __flush_tlb_all() due to the time-sensitivity of this one.
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/tlbflush.h | 2 +- arch/x86/kernel/cpu/intel.c | 6 +++--- arch/x86/kernel/cpu/mtrr/cyrix.c | 4 ++-- arch/x86/kernel/cpu/mtrr/generic.c | 4 ++-- arch/x86/mm/init.c | 2 +- arch/x86/xen/enlighten.c | 2 +- drivers/lguest/x86/core.c | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -121,7 +121,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC) -#define cpu_has_pge boot_cpu_has(X86_FEATURE_PGE)#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)#define cpu_has_xmm boot_cpu_has(X86_FEATURE_XMM)
arch/x86/include/asm/tlbflush.h +1 -1
@@ -181,7 +181,7 @@ static inline void __native_flush_tlb_single(unsigned long addr)static inline void __flush_tlb_all (void ) { -if (cpu_has_pge) +if (static_cpu_has (X86_FEATURE_PGE ))__flush_tlb_global ();else __flush_tlb ();
arch/x86/kernel/cpu/intel.c +3 -3
@@ -152,9 +152,9 @@ static void early_init_intel(struct cpuinfo_x86 *c)* the TLB when any changes are made to any of the page table entries. * The operating system must reload CR3 to cause the TLB to be flushed" * -* As a result cpu_has_pge() in arch/x86/include/asm/tlbflush.h should -* be false so that __flush_tlb_all() causes CR3 insted of CR4.PGE -* to be modified +* As a result, boot_cpu_has(X86_FEATURE_PGE) in arch/x86/include/asm/tlbflush.h +* should be false so that __flush_tlb_all() causes CR3 insted of CR4.PGE +* to be modified. */ if (c->x86 ==5 && c->x86_model ==9 ) {pr_info ("Disabling PGE capability bit\n" );
arch/x86/kernel/cpu/mtrr/cyrix.c +2 -2
@@ -137,7 +137,7 @@ static void prepare_set(void)u32 cr0;/* Save value of CR4 and clear Page Global Enable (bit 7) */ -if (cpu_has_pge) { +if (boot_cpu_has (X86_FEATURE_PGE )) { cr4 =__read_cr4 ();__write_cr4 (cr4 & ~X86_CR4_PGE ); }
@@ -170,7 +170,7 @@ static void post_set(void)write_cr0 (read_cr0 () & ~X86_CR0_CD );/* Restore value of CR4 */ -if (cpu_has_pge) +if (boot_cpu_has (X86_FEATURE_PGE ))__write_cr4 (cr4); }
arch/x86/kernel/cpu/mtrr/generic.c +2 -2
@@ -741,7 +741,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock)wbinvd ();/* Save value of CR4 and clear Page Global Enable (bit 7) */ -if (cpu_has_pge) { +if (boot_cpu_has (X86_FEATURE_PGE )) { cr4 =__read_cr4 ();__write_cr4 (cr4 & ~X86_CR4_PGE ); }
@@ -771,7 +771,7 @@ static void post_set(void) __releases(set_atomicity_lock)write_cr0 (read_cr0 () & ~X86_CR0_CD );/* Restore value of CR4 */ -if (cpu_has_pge) +if (boot_cpu_has (X86_FEATURE_PGE ))__write_cr4 (cr4);raw_spin_unlock (&set_atomicity_lock); }
arch/x86/mm/init.c +1 -1
@@ -166,7 +166,7 @@ static void __init probe_page_size_mask(void)cr4_set_bits_and_update_boot (X86_CR4_PSE );/* Enable PGE if available */ -if (cpu_has_pge) { +if (boot_cpu_has (X86_FEATURE_PGE )) {cr4_set_bits_and_update_boot (X86_CR4_PGE ); __supported_pte_mask |= _PAGE_GLOBAL; }else
arch/x86/xen/enlighten.c +1 -1
@@ -1472,7 +1472,7 @@ static void xen_pvh_set_cr_flags(int cpu)if (cpu_has_pse)cr4_set_bits_and_update_boot (X86_CR4_PSE ); -if (cpu_has_pge) +if (boot_cpu_has (X86_FEATURE_PGE ))cr4_set_bits_and_update_boot (X86_CR4_PGE ); }
drivers/lguest/x86/core.c +1 -1
@@ -599,7 +599,7 @@ void __init lguest_arch_host_init(void)* doing this. */ get_online_cpus (); -if (cpu_has_pge) {/* We have a broader idea of "global". */ +if (boot_cpu_has (X86_FEATURE_PGE )) {/* We have a broader idea of "global". */ /* Remember that this was originally set (for cleanup). */ cpu_had_pge =1 ;/*
Borislav Petkov
maintainerPATCH 10/10 x86/cpufeature: Kill cpu_has_pse
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/init.c | 4 ++-- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 4 ++-- arch/x86/mm/ioremap.c | 2 +- arch/x86/power/hibernate_32.c | 2 +- arch/x86/xen/enlighten.c | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -119,7 +119,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; } while (0)#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) -#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC)#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)
arch/x86/include/asm/pgtable.h +1 -1
@@ -183,7 +183,7 @@ static inline int pmd_trans_huge(pmd_t pmd)static inline int has_transparent_hugepage (void ) { -return cpu_has_pse; +return boot_cpu_has (X86_FEATURE_PSE ); }#ifdef __HAVE_ARCH_PTE_DEVMAP
arch/x86/mm/init.c +2 -2
@@ -157,12 +157,12 @@ static void __init probe_page_size_mask(void)* This will simplify cpa(), which otherwise needs to support splitting * large pages into small in interrupt context, etc. */ -if (cpu_has_pse && !debug_pagealloc_enabled ()) +if (boot_cpu_has (X86_FEATURE_PSE ) && !debug_pagealloc_enabled ()) page_size_mask |=1 <<PG_LEVEL_2M ;#endif /* Enable PSE if available */ -if (cpu_has_pse) +if (boot_cpu_has (X86_FEATURE_PSE ))cr4_set_bits_and_update_boot (X86_CR4_PSE );/* Enable PGE if available */
arch/x86/mm/init_32.c +1 -1
@@ -284,7 +284,7 @@ kernel_physical_mapping_init(unsigned long start,*/ mapping_iter =1 ; -if (!cpu_has_pse) +if (!boot_cpu_has (X86_FEATURE_PSE )) use_pse =0 ; repeat:
arch/x86/mm/init_64.c +2 -2
@@ -1295,7 +1295,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)struct vmem_altmap *altmap =to_vmem_altmap (start);int err; -if (cpu_has_pse) +if (boot_cpu_has (X86_FEATURE_PSE )) err =vmemmap_populate_hugepages (start, end, node, altmap);else if (altmap) { pr_err_once("%s: no cpu support for altmap allocations\n",
@@ -1338,7 +1338,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, }get_page_bootmem (section_nr,pud_page (*pud),MIX_SECTION_INFO ); -if (!cpu_has_pse) { +if (!boot_cpu_has (X86_FEATURE_PSE )) { next = (addr +PAGE_SIZE ) &PAGE_MASK ; pmd =pmd_offset (pud, addr);if (pmd_none (*pmd))
arch/x86/mm/ioremap.c +1 -1
@@ -386,7 +386,7 @@ int __init arch_ioremap_pud_supported(void)int __init arch_ioremap_pmd_supported (void ) { -return cpu_has_pse; +return boot_cpu_has (X86_FEATURE_PSE ); }/*
arch/x86/power/hibernate_32.c +1 -1
@@ -106,7 +106,7 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)* normal page tables. * NOTE: We can mark everything as executable here */ -if (cpu_has_pse) { +if (boot_cpu_has (X86_FEATURE_PSE )) {set_pmd (pmd,pfn_pmd (pfn,PAGE_KERNEL_LARGE_EXEC )); pfn +=PTRS_PER_PTE ; }else {
arch/x86/xen/enlighten.c +1 -1
@@ -1469,7 +1469,7 @@ static void xen_pvh_set_cr_flags(int cpu)* For BSP, PSE PGE are set in probe_page_size_mask(), for APs * set them here. For all, OSFXSR OSXMMEXCPT are set in fpu__init_cpu(). */ -if (cpu_has_pse) +if (boot_cpu_has (X86_FEATURE_PSE ))cr4_set_bits_and_update_boot (X86_CR4_PSE );if (boot_cpu_has (X86_FEATURE_PGE ))
Signature · 1 line
2.7.3
tip-bot for Borislav Petkov
merge bot[tip:x86/cpu] x86/cpufeature: Remove cpu_has_pse
x86/cpufeature: Remove cpu_has_pse
Commit-ID: 16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96 Gitweb: http://git.kernel.org/tip/16bf92261b1b6cb1a1c0671b445a2fcb5a1ecc96 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 29 Mar 2016 17:42:03 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 31 Mar 2016 13:35:10 +0200
x86/cpufeature: Remove cpu_has_pse
--- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/init.c | 4 ++-- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 4 ++-- arch/x86/mm/ioremap.c | 2 +- arch/x86/power/hibernate_32.c | 2 +- arch/x86/xen/enlighten.c | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-)
arch/x86/include/asm/cpufeature.h +0 -1
@@ -119,7 +119,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; } while (0)#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) -#define cpu_has_pse boot_cpu_has(X86_FEATURE_PSE)#define cpu_has_tsc boot_cpu_has(X86_FEATURE_TSC)#define cpu_has_apic boot_cpu_has(X86_FEATURE_APIC)#define cpu_has_fxsr boot_cpu_has(X86_FEATURE_FXSR)
arch/x86/include/asm/pgtable.h +1 -1
@@ -183,7 +183,7 @@ static inline int pmd_trans_huge(pmd_t pmd)static inline int has_transparent_hugepage (void ) { -return cpu_has_pse; +return boot_cpu_has (X86_FEATURE_PSE ); }#ifdef __HAVE_ARCH_PTE_DEVMAP
arch/x86/mm/init.c +2 -2
@@ -157,12 +157,12 @@ static void __init probe_page_size_mask(void)* This will simplify cpa(), which otherwise needs to support splitting * large pages into small in interrupt context, etc. */ -if (cpu_has_pse && !debug_pagealloc_enabled ()) +if (boot_cpu_has (X86_FEATURE_PSE ) && !debug_pagealloc_enabled ()) page_size_mask |=1 <<PG_LEVEL_2M ;#endif /* Enable PSE if available */ -if (cpu_has_pse) +if (boot_cpu_has (X86_FEATURE_PSE ))cr4_set_bits_and_update_boot (X86_CR4_PSE );/* Enable PGE if available */
arch/x86/mm/init_32.c +1 -1
@@ -284,7 +284,7 @@ kernel_physical_mapping_init(unsigned long start,*/ mapping_iter =1 ; -if (!cpu_has_pse) +if (!boot_cpu_has (X86_FEATURE_PSE )) use_pse =0 ; repeat:
arch/x86/mm/init_64.c +2 -2
@@ -1295,7 +1295,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)struct vmem_altmap *altmap =to_vmem_altmap (start);int err; -if (cpu_has_pse) +if (boot_cpu_has (X86_FEATURE_PSE )) err =vmemmap_populate_hugepages (start, end, node, altmap);else if (altmap) { pr_err_once("%s: no cpu support for altmap allocations\n",
@@ -1338,7 +1338,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, }get_page_bootmem (section_nr,pud_page (*pud),MIX_SECTION_INFO ); -if (!cpu_has_pse) { +if (!boot_cpu_has (X86_FEATURE_PSE )) { next = (addr +PAGE_SIZE ) &PAGE_MASK ; pmd =pmd_offset (pud, addr);if (pmd_none (*pmd))
arch/x86/mm/ioremap.c +1 -1
@@ -386,7 +386,7 @@ int __init arch_ioremap_pud_supported(void)int __init arch_ioremap_pmd_supported (void ) { -return cpu_has_pse; +return boot_cpu_has (X86_FEATURE_PSE ); }/*
arch/x86/power/hibernate_32.c +1 -1
@@ -106,7 +106,7 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)* normal page tables. * NOTE: We can mark everything as executable here */ -if (cpu_has_pse) { +if (boot_cpu_has (X86_FEATURE_PSE )) {set_pmd (pmd,pfn_pmd (pfn,PAGE_KERNEL_LARGE_EXEC )); pfn +=PTRS_PER_PTE ; }else {
arch/x86/xen/enlighten.c +1 -1
@@ -1469,7 +1469,7 @@ static void xen_pvh_set_cr_flags(int cpu)* For BSP, PSE PGE are set in probe_page_size_mask(), for APs * set them here. For all, OSFXSR OSXMMEXCPT are set in fpu__init_cpu(). */ -if (cpu_has_pse) +if (boot_cpu_has (X86_FEATURE_PSE ))cr4_set_bits_and_update_boot (X86_CR4_PSE );if (boot_cpu_has (X86_FEATURE_PGE ))