From: Thomas Gleixner <tglx@linutronix.de>
To: speck@linutronix.de
Subject: Re: [GIT pull] The L!TF bits
Date: Sat, 11 Aug 2018 22:21:31 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1808112217090.4958@nanos.tec.linutronix.de> (raw)
In-Reply-To: <alpine.DEB.2.21.1808112140500.1659@nanos.tec.linutronix.de>
On Sat, 11 Aug 2018, speck for Thomas Gleixner wrote:
> Linus,
>
> please pull the attached L!TF bundle.
Note this has a trivial merge conflict with the pending x86 bits for 4.19
if you pull those first. Otherwise the x86/cpu pull will
conflict. Resolution below, so that the L1TF stays on 29 and the new IBRS
one becomes 30 for sake of consistency with backports. I missed that when
merging the IBRS patch.
Thanks,
tglx
8<--------------
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@@ -219,7 -219,7 +219,8 @@@
#define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */
#define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */
#define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */
- #define X86_FEATURE_IBRS_ENHANCED ( 7*32+29) /* Enhanced IBRS */
+ #define X86_FEATURE_L1TF_PTEINV ( 7*32+29) /* "" L1TF workaround PTE inversion */
++#define X86_FEATURE_IBRS_ENHANCED ( 7*32+30) /* Enhanced IBRS */
prev parent reply other threads:[~2018-08-11 20:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-11 19:48 [GIT pull] The L!TF bits Thomas Gleixner
2018-08-11 20:21 ` Thomas Gleixner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.1808112217090.4958@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=speck@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).