Received: by 10.223.176.46 with SMTP id f43csp2332891wra; Thu, 25 Jan 2018 08:18:07 -0800 (PST) X-Google-Smtp-Source: AH8x225zyCJQOCa/rZ+FpCbgf+S0NEwLQo77XtItHBTQNwF1JXjJ/ehREEa2mBn91iKJgCA83BAY X-Received: by 10.99.126.17 with SMTP id z17mr13326335pgc.338.1516897087084; Thu, 25 Jan 2018 08:18:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516897087; cv=none; d=google.com; s=arc-20160816; b=mKJEcsgA7veqxUnharlrsH0B814L2VH7mFgBQVloTTSS/+nHGMLHVbaWyPlEVCDS0W piFPs+XnLVp3lVKQnrFbY+NFWtA2twaBOd6c/HKEIkviYFHASky5M161wkcd6DOwNH67 ZSp433l+TG12v462wRDzyXZD9IjFMtKNrtgKNy+FQPaZ+KtC6ofsFKl/4fjXYLNC9L9S xOrRVa1NbWmv5KWBQrmtd8QTbdZ4gy26TsIduTz8mA2bc7hAy6f18J2XvZmKHR1Hk5w2 fKscL2ifbtwoD12OZJ72Rj3oE/+IDR6Tu+dkevB5bmkKQnKBmGMYqVEtfM3XlOSLX0O5 VwpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:arc-authentication-results; bh=GkhjsaMS5Bme/Ox+tx4JKBCYNXZocDfBtlXw8PoahO4=; b=D3tdoqy0NqYCXGpc/l0ED/QXzGoccoZVTZ/pXf+Ovn/xb/t3r1CiM4MpvdykVbl+Du inNcAobUoCZX4rUz3y7+ffax3RMbVOdLepJObq7BdLSIEUH+X4LKaGs2PhGp0Ex3ERqC h3nDFH9xtnD62owYlr5VkSymwg6w4P4Ubku+XrBtOryIAxux5ViqLY43ec/5xDrqHrVK C90g6u/uYeGFJ4MboqoEwHdvyiUo2L8Yx5ADp8UrtuhXPvWV4IVgVmrd0sNDKkAuMTDf Lm4mLLNcHUa6rB8iU1WdlZ5CezYcc+2oGaGKK/iMvO7C+atPrbioxqqHu6jjT5jiGiIz or+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=kpJ0hYGL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.uk Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z21si1743982pge.348.2018.01.25.08.17.52; Thu, 25 Jan 2018 08:18:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.co.uk header.s=amazon201209 header.b=kpJ0hYGL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.co.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751274AbeAYQOm (ORCPT + 99 others); Thu, 25 Jan 2018 11:14:42 -0500 Received: from smtp-fw-4101.amazon.com ([72.21.198.25]:17830 "EHLO smtp-fw-4101.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751254AbeAYQOl (ORCPT ); Thu, 25 Jan 2018 11:14:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazon201209; t=1516896881; x=1548432881; h=from:to:subject:date:message-id:in-reply-to:references; bh=GkhjsaMS5Bme/Ox+tx4JKBCYNXZocDfBtlXw8PoahO4=; b=kpJ0hYGLJ24QsBtjZcbZqvErCnGOUeFqOZDs4Nc9vxSBJXroqdI7NQ/c WwTtO6OB2Itniw1y8mBhmam5DEyvUSAyYJHE866y/CEWouc5FvKrkNC3T tZbnBdYTfe2Z1ht/5ge8g+L6NEEy0V+OYgo54c9/ivbwplEnnGdbPdtlH 8=; X-IronPort-AV: E=Sophos;i="5.46,412,1511827200"; d="scan'208";a="705292090" Received: from iad6-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-2b-c7131dcf.us-west-2.amazon.com) ([10.124.125.6]) by smtp-border-fw-out-4101.iad4.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Jan 2018 16:14:38 +0000 Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (pdx2-ws-svc-lb17-vlan3.amazon.com [10.247.140.70]) by email-inbound-relay-2b-c7131dcf.us-west-2.amazon.com (8.14.7/8.14.7) with ESMTP id w0PGEWOL050968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Jan 2018 16:14:34 GMT Received: from uc8d3ff76b9bc5848a9cc.ant.amazon.com (localhost [127.0.0.1]) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Debian-3) with ESMTP id w0PGEU7d008060; Thu, 25 Jan 2018 16:14:31 GMT Received: (from dwmw@localhost) by uc8d3ff76b9bc5848a9cc.ant.amazon.com (8.15.2/8.15.2/Submit) id w0PGEThJ008058; Thu, 25 Jan 2018 16:14:29 GMT From: David Woodhouse To: arjan@linux.intel.com, tglx@linutronix.de, karahmed@amazon.de, x86@kernel.org, linux-kernel@vger.kernel.org, tim.c.chen@linux.intel.com, bp@alien8.de, peterz@infradead.org, pbonzini@redhat.com, ak@linux.intel.com, torvalds@linux-foundation.org, gregkh@linux-foundation.org, dave.hansen@intel.com, gnomes@lxorguk.ukuu.org.uk, ashok.raj@intel.com, mingo@kernel.org Subject: [PATCH v5 4/7] x86/msr: Add definitions for new speculation control MSRs Date: Thu, 25 Jan 2018 16:14:12 +0000 Message-Id: <1516896855-7642-5-git-send-email-dwmw@amazon.co.uk> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516896855-7642-1-git-send-email-dwmw@amazon.co.uk> References: <1516896855-7642-1-git-send-email-dwmw@amazon.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add MSR and bit definitions for SPEC_CTRL, PRED_CMD and ARCH_CAPABILITIES. See Intel's 336996-Speculative-Execution-Side-Channel-Mitigations.pdf Signed-off-by: David Woodhouse Reviewed-by: Greg Kroah-Hartman --- arch/x86/include/asm/msr-index.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index fa11fb1..eb83ff1 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -39,6 +39,13 @@ /* Intel MSRs. Some also available on other CPUs */ +#define MSR_IA32_SPEC_CTRL 0x00000048 /* Speculation Control */ +#define SPEC_CTRL_IBRS (1 << 0) /* Indirect Branch Restricted Speculation */ +#define SPEC_CTRL_STIBP (1 << 1) /* Single Thread Indirect Branch Predictors */ + +#define MSR_IA32_PRED_CMD 0x00000049 /* Prediction Command */ +#define PRED_CMD_IBPB (1 << 0) /* Indirect Branch Prediction Barrier */ + #define MSR_PPIN_CTL 0x0000004e #define MSR_PPIN 0x0000004f @@ -57,6 +64,11 @@ #define SNB_C3_AUTO_UNDEMOTE (1UL << 28) #define MSR_MTRRcap 0x000000fe + +#define MSR_IA32_ARCH_CAPABILITIES 0x0000010a +#define ARCH_CAP_RDCL_NO (1 << 0) /* Not susceptible to Meltdown */ +#define ARCH_CAP_IBRS_ALL (1 << 1) /* Enhanced IBRS support */ + #define MSR_IA32_BBL_CR_CTL 0x00000119 #define MSR_IA32_BBL_CR_CTL3 0x0000011e -- 2.7.4