From patchwork Sun Nov 6 20:57:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Huey X-Patchwork-Id: 9414085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E71EA60515 for ; Sun, 6 Nov 2016 20:59:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D570628E16 for ; Sun, 6 Nov 2016 20:59:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C843028F97; Sun, 6 Nov 2016 20:59:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F94128E16 for ; Sun, 6 Nov 2016 20:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752073AbcKFU7K (ORCPT ); Sun, 6 Nov 2016 15:59:10 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36178 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266AbcKFU55 (ORCPT ); Sun, 6 Nov 2016 15:57:57 -0500 Received: by mail-pf0-f194.google.com with SMTP id n85so14151460pfi.3 for ; Sun, 06 Nov 2016 12:57:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n5OmFN9y6CJLg1apQ1dh6kVAbCWJ25Jt1uFLLsJuakY=; b=GTMjXCpJz57UJ0Jxf3TuJl865KJbzaWW6OzsVNwrGXBVyeSjDkKSTkROGo+NGJ6gMQ Tt+ZIYnTvBWoRw4PoBfy0isQ6FiGLW3rTXMyjcC7Dlj+WwqswP6w8mowU+GwtAO4R5SD PCFvgPzo7LUQN+2T7V55PTffZpBpCl6u8YLmU9jTjRQpJlzy/0vFwv/Oa+gkXJipWOGl t3Jx81Y8k4Qw78xctl8ovRNCeT+iEC+Gb2k0y7SHrV3iI3kLfJbAhwCDkPBkYtCatbcv q9boChaAom9fcejNfDpdA0doOof48IP+vRkTJWJk7hzrpM/ATjvyV5k7Cx54WtdoHIJJ zKXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n5OmFN9y6CJLg1apQ1dh6kVAbCWJ25Jt1uFLLsJuakY=; b=XYDOalypJdUf5PcniZCFDeJONxijkf9Zvsueldd3afZnJ3ZlQTka/DQbZtvMz0etZ7 kiC33jBXpSsn86xIaJh8qt9G9L/m0VJBLzZksXtTJCl/nCBBh1ify92KoNCbjvFzITpl +eptvrh0IUz8xPDWsaWcjAqG6J9X3bdG6/SxQxEmXjBY/rMdQ6eCr3Lwr+RYDvJ2LCfl zNEmPfDaUvTw3A74gAJr5FyXk+qs/x5aIQYUEvdvRMEfcPsGPRIXcXseD8ozqqD4RVLO JDYBhecODnz9vxdTrUf8QCiyS1pvXWbANZe500J24ApVwEVv+JJAnQ69GXnF+H0d1Hiq rWWw== X-Gm-Message-State: ABUngvd983KByTV02gNSBgNVahSm8e8mynYCV5c015Isu7qSoqo8QFRvfiwHXVVQ+OVVGQ== X-Received: by 10.99.109.6 with SMTP id i6mr5678509pgc.139.1478465876799; Sun, 06 Nov 2016 12:57:56 -0800 (PST) Received: from minbar.hsd1.ca.comcast.net (c-73-162-102-141.hsd1.ca.comcast.net. [73.162.102.141]) by smtp.gmail.com with ESMTPSA id ix3sm34973893pac.17.2016.11.06.12.57.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Nov 2016 12:57:56 -0800 (PST) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Robert O'Callahan , Thomas Gleixner , Andy Lutomirski , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Jeff Dike , Richard Weinberger , Alexander Viro , Shuah Khan , Dave Hansen , Borislav Petkov , Peter Zijlstra , Boris Ostrovsky , Len Brown , "Rafael J. Wysocki" , Dmitry Safonov , David Matlack Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v9 5/7] x86/cpufeature: Detect CPUID faulting support Date: Sun, 6 Nov 2016 12:57:40 -0800 Message-Id: <20161106205742.4042-6-khuey@kylehuey.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161106205742.4042-1-khuey@kylehuey.com> References: <20161106205742.4042-1-khuey@kylehuey.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Intel supports faulting on the CPUID instruction beginning with Ivy Bridge. When enabled, the processor will fault on attempts to execute the CPUID instruction with CPL>0. This will allow a ptracer to emulate the CPUID instruction. Bit 31 of MSR_PLATFORM_INFO advertises support for this feature. It is documented in detail in Section 2.3.2 of http://www.intel.com/content/dam/www/public/us/en/documents/application-notes/virtualization-technology-flexmigration-application-note.pdf Detect support for this feature and expose it as X86_FEATURE_CPUID_FAULT. Signed-off-by: Kyle Huey Reviewed-by: Andy Lutomirski --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/scattered.c | 22 +++++++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index a396292..62962e8 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -184,16 +184,17 @@ * Auxiliary flags: Linux defined - For features scattered in various * CPUID levels like 0x6, 0xA etc, word 7. * * Reuse free bits when adding new feature flags! */ #define X86_FEATURE_CPB ( 7*32+ 2) /* AMD Core Performance Boost */ #define X86_FEATURE_EPB ( 7*32+ 3) /* IA32_ENERGY_PERF_BIAS support */ +#define X86_FEATURE_CPUID_FAULT ( 7*32+ 4) /* Intel CPUID faulting */ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ #define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ #define X86_FEATURE_AVX512_4VNNIW (7*32+16) /* AVX-512 Neural Network Instructions */ #define X86_FEATURE_AVX512_4FMAPS (7*32+17) /* AVX-512 Multiply Accumulation Single precision */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 78f3760..97fb50b 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -36,16 +36,18 @@ #define EFER_LMSLE (1<<_EFER_LMSLE) #define EFER_FFXSR (1<<_EFER_FFXSR) /* Intel MSRs. Some also available on other CPUs */ #define MSR_IA32_PERFCTR0 0x000000c1 #define MSR_IA32_PERFCTR1 0x000000c2 #define MSR_FSB_FREQ 0x000000cd #define MSR_PLATFORM_INFO 0x000000ce +#define PLATINFO_CPUID_FAULT_BIT 31 +#define PLATINFO_CPUID_FAULT (1ULL << PLATINFO_CPUID_FAULT_BIT) #define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2 #define NHM_C3_AUTO_DEMOTE (1UL << 25) #define NHM_C1_AUTO_DEMOTE (1UL << 26) #define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) #define SNB_C1_AUTO_UNDEMOTE (1UL << 27) #define SNB_C3_AUTO_UNDEMOTE (1UL << 28) diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 1db8dc4..97a340d 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -19,41 +19,61 @@ struct cpuid_bit { enum cpuid_regs { CR_EAX = 0, CR_ECX, CR_EDX, CR_EBX }; +struct msr_bit { + u16 feature; + u16 msr; + u8 bit; +}; + void init_scattered_cpuid_features(struct cpuinfo_x86 *c) { + const struct cpuid_bit *cb; + const struct msr_bit *mb; u32 max_level; u32 regs[4]; - const struct cpuid_bit *cb; + u64 msrval; static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_INTEL_PT, CR_EBX,25, 0x00000007, 0 }, { X86_FEATURE_AVX512_4VNNIW, CR_EDX, 2, 0x00000007, 0 }, { X86_FEATURE_AVX512_4FMAPS, CR_EDX, 3, 0x00000007, 0 }, { X86_FEATURE_APERFMPERF, CR_ECX, 0, 0x00000006, 0 }, { X86_FEATURE_EPB, CR_ECX, 3, 0x00000006, 0 }, { X86_FEATURE_HW_PSTATE, CR_EDX, 7, 0x80000007, 0 }, { X86_FEATURE_CPB, CR_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CR_EDX,11, 0x80000007, 0 }, { 0, 0, 0, 0, 0 } }; + static const struct msr_bit msr_bits[] = { + { X86_FEATURE_CPUID_FAULT, MSR_PLATFORM_INFO, 31 }, + { 0, 0, 0 } + }; + for (cb = cpuid_bits; cb->feature; cb++) { /* Verify that the level is valid */ max_level = cpuid_eax(cb->level & 0xffff0000); if (max_level < cb->level || max_level > (cb->level | 0xffff)) continue; cpuid_count(cb->level, cb->sub_leaf, ®s[CR_EAX], ®s[CR_EBX], ®s[CR_ECX], ®s[CR_EDX]); if (regs[cb->reg] & (1 << cb->bit)) set_cpu_cap(c, cb->feature); } + + for (mb = msr_bits; mb->feature; mb++) { + if (rdmsrl_safe(mb->msr, &msrval)) + continue; + if (msrval & (1ULL << mb->bit)) + set_cpu_cap(c, mb->feature); + } }