From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
To: Borislav Petkov <bp@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>, Andy Lutomirski <luto@kernel.org>,
x86@kernel.org, "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Dave Hansen <dave.hansen@intel.com>,
Tony Luck <tony.luck@intel.com>,
Cathy Zhang <cathy.zhang@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Kyung Min Park <kyung.min.park@intel.com>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
linux-kernel@vger.kernel.org,
Ricardo Neri <ricardo.neri@intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
linux-edac@vger.kernel.org
Subject: Re: [PATCH v2] x86/cpu: Use SERIALIZE in sync_core() when available
Date: Wed, 5 Aug 2020 08:54:01 -0700 [thread overview]
Message-ID: <20200805155401.GB25981@ranerica-svr.sc.intel.com> (raw)
In-Reply-To: <20200805044840.GA9127@nazgul.tnic>
On Wed, Aug 05, 2020 at 06:48:40AM +0200, Borislav Petkov wrote:
> On Tue, Aug 04, 2020 at 07:10:59PM -0700, Ricardo Neri wrote:
> > The SERIALIZE instruction gives software a way to force the processor to
> > complete all modifications to flags, registers and memory from previous
> > instructions and drain all buffered writes to memory before the next
> > instruction is fetched and executed. Thus, it serves the purpose of
> > sync_core(). Use it when available.
> >
> > Commit 7117f16bf460 ("objtool: Fix ORC vs alternatives") enforced stack
> > invariance in alternatives. The iret-to-self does not comply with such
> > invariance. Thus, it cannot be used inside alternative code. Instead, use
> > an alternative that jumps to SERIALIZE when available.
> >
> > Cc: Andy Lutomirski <luto@kernel.org>
> > Cc: Cathy Zhang <cathy.zhang@intel.com>
> > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> > Cc: Fenghua Yu <fenghua.yu@intel.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: Kyung Min Park <kyung.min.park@intel.com>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Cc: "Ravi V. Shankar" <ravi.v.shankar@intel.com>
> > Cc: Sean Christopherson <sean.j.christopherson@intel.com>
> > Cc: linux-edac@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > Suggested-by: Andy Lutomirski <luto@kernel.org>
> > Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
> > ---
> > This is a v2 from my initial submission [1]. The first three patches of
> > the series have been merged in Linus' tree. Hence, I am submitting only
> > this patch for review.
> >
> > [1]. https://lkml.org/lkml/2020/7/27/8
> >
> > Changes since v1:
> > * Support SERIALIZE using alternative runtime patching.
> > (Peter Zijlstra, H. Peter Anvin)
> > * Added a note to specify which version of binutils supports SERIALIZE.
> > (Peter Zijlstra)
> > * Verified that (::: "memory") is used. (H. Peter Anvin)
> > ---
> > arch/x86/include/asm/special_insns.h | 2 ++
> > arch/x86/include/asm/sync_core.h | 10 +++++++++-
> > 2 files changed, 11 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h
> > index 59a3e13204c3..25cd67801dda 100644
> > --- a/arch/x86/include/asm/special_insns.h
> > +++ b/arch/x86/include/asm/special_insns.h
> > @@ -10,6 +10,8 @@
> > #include <linux/irqflags.h>
> > #include <linux/jump_label.h>
> >
> > +/* Instruction opcode for SERIALIZE; supported in binutils >= 2.35. */
> > +#define __ASM_SERIALIZE ".byte 0xf, 0x1, 0xe8"
> > /*
> > * Volatile isn't enough to prevent the compiler from reordering the
> > * read/write functions for the control registers and messing everything up.
> > diff --git a/arch/x86/include/asm/sync_core.h b/arch/x86/include/asm/sync_core.h
> > index fdb5b356e59b..201ea3d9a6bd 100644
> > --- a/arch/x86/include/asm/sync_core.h
> > +++ b/arch/x86/include/asm/sync_core.h
> > @@ -5,15 +5,19 @@
> > #include <linux/preempt.h>
> > #include <asm/processor.h>
> > #include <asm/cpufeature.h>
> > +#include <asm/special_insns.h>
> >
> > #ifdef CONFIG_X86_32
> > static inline void iret_to_self(void)
> > {
> > asm volatile (
> > + ALTERNATIVE("", "jmp 2f", X86_FEATURE_SERIALIZE)
> > "pushfl\n\t"
> > "pushl %%cs\n\t"
> > "pushl $1f\n\t"
> > "iret\n\t"
> > + "2:\n\t"
> > + __ASM_SERIALIZE "\n"
> > "1:"
> > : ASM_CALL_CONSTRAINT : : "memory");
> > }
> > @@ -23,6 +27,7 @@ static inline void iret_to_self(void)
> > unsigned int tmp;
> >
> > asm volatile (
> > + ALTERNATIVE("", "jmp 2f", X86_FEATURE_SERIALIZE)
>
> Why is this and above stuck inside the asm statement?
>
> Why can't you simply do:
>
> if (static_cpu_has(X86_FEATURE_SERIALIZE)) {
> asm volatile(__ASM_SERIALIZE ::: "memory");
> return;
> }
>
> on function entry instead of making it more unreadable for no particular
> reason?
My my first submission I had implemented it as you describe. The only
difference was that I used boot_cpu_has() instead of static_cpu_has()
as the latter has a comment stating that:
"Use static_cpu_has() only in fast paths (...) boot_cpu_has() is
already fast enough for the majority of cases..."
sync_core_before_usermode() already handles what I think are the
critical paths.
Thanks and BR,
Ricardo
prev parent reply other threads:[~2020-08-05 20:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 2:10 [PATCH v2] x86/cpu: Use SERIALIZE in sync_core() when available Ricardo Neri
2020-08-05 4:48 ` Borislav Petkov
2020-08-05 4:58 ` hpa
2020-08-05 5:08 ` Borislav Petkov
2020-08-05 5:10 ` hpa
2020-08-05 17:07 ` Ricardo Neri
2020-08-05 18:28 ` Andy Lutomirski
2020-08-05 19:11 ` Ricardo Neri
2020-08-05 20:30 ` Andy Lutomirski
2020-08-05 22:19 ` Luck, Tony
2020-08-05 15:54 ` Ricardo Neri [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=20200805155401.GB25981@ranerica-svr.sc.intel.com \
--to=ricardo.neri-calderon@linux.intel.com \
--cc=bp@suse.de \
--cc=cathy.zhang@intel.com \
--cc=dave.hansen@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=kyung.min.park@intel.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=ricardo.neri@intel.com \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/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 NNTP newsgroup(s).