Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758202AbcLPSDG (ORCPT ); Fri, 16 Dec 2016 13:03:06 -0500 Received: from mga06.intel.com ([134.134.136.31]:21613 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757961AbcLPSBZ (ORCPT ); Fri, 16 Dec 2016 13:01:25 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,358,1477983600"; d="scan'208";a="1100125514" From: Grzegorz Andrejczuk To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org Cc: linux-kernel@vger.kernel.org, Piotr.Luc@intel.com, dave.hansen@linux.intel.com, Grzegorz Andrejczuk Subject: [PATCH v10 4/5] x86/cpufeature: enable RING3MWAIT for Knights Landing Date: Fri, 16 Dec 2016 19:00:03 +0100 Message-Id: <1481911204-3713-5-git-send-email-grzegorz.andrejczuk@intel.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1481911204-3713-1-git-send-email-grzegorz.andrejczuk@intel.com> References: <1481911204-3713-1-git-send-email-grzegorz.andrejczuk@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2792 Lines: 96 This patch enables ring 3 MONITOR/MWAIT for Intel Xeon Phi x200 codenamed Knights Landing. The patch: - Sets CPU feature X86_FEATURE_RING3MWAIT. - Sets HWCAP2_RING3MWAIT bit in ELF_HWCAP2. - Adds the ring3mwait=disable command line parameter. - Sets bit 1 of the MSR MISC_FEATURE_ENABLES or clears it when the ring3mwait=disable command line parameter is used. Presence of this feature cannot be detected automatically (by reading any other MSR) therefore it is required to explicitly check for the family and model of the CPU before attempting to enable it. Signed-off-by: Grzegorz Andrejczuk --- Documentation/kernel-parameters.txt | 3 +++ arch/x86/kernel/cpu/intel.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 37babf9..c8bca65 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3734,6 +3734,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. rhash_entries= [KNL,NET] Set number of hash buckets for route cache + ring3mwait= [KNL] + disable Disable ring 3 MONITOR/MWAIT feature on supported CPUs. + ro [KNL] Mount root device read-only on boot rodata= [KNL] diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index fcd484d..70d4985 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #ifdef CONFIG_X86_64 #include @@ -61,6 +63,36 @@ void check_mpx_erratum(struct cpuinfo_x86 *c) } } +static int ring3mwait_disabled __read_mostly; + +static int __init ring3mwait_disable(char *__unused) +{ + ring3mwait_disabled = 1; + return 1; +} +__setup("ring3mwait=disable", ring3mwait_disable); + +static void probe_xeon_phi_r3mwait(struct cpuinfo_x86 *c) +{ + /* + * Ring 3 MONITOR/MWAIT feature cannot be detected without + * cpu model and family comparison. + */ + if (c->x86 != 6 || c->x86_model != INTEL_FAM6_XEON_PHI_KNL) + return; + + if (ring3mwait_disabled) { + msr_clear_bit(MSR_MISC_FEATURE_ENABLES, + MSR_MISC_FEATURE_ENABLES_RING3MWAIT_BIT); + return; + } + + msr_set_bit(MSR_MISC_FEATURE_ENABLES, + MSR_MISC_FEATURE_ENABLES_RING3MWAIT_BIT); + set_cpu_cap(c, X86_FEATURE_RING3MWAIT); + set_bit(HWCAP2_RING3MWAIT, &ELF_HWCAP2); +} + static void early_init_intel(struct cpuinfo_x86 *c) { u64 misc_enable; @@ -565,6 +597,8 @@ static void init_intel(struct cpuinfo_x86 *c) detect_vmx_virtcap(c); init_intel_energy_perf(c); + + probe_xeon_phi_r3mwait(c); } #ifdef CONFIG_X86_32 -- 2.5.1