From: Borislav Petkov <bp@alien8.de>
To: Kees Cook <keescook@chromium.org>, Peter Zijlstra <peterz@infradead.org>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
Lai Jiangshan <jiangshanlai@gmail.com>
Subject: Re: [PATCH v2 3/6] x86/cpu: Remove CONFIG_X86_SMAP and "nosmap"
Date: Tue, 8 Feb 2022 16:06:52 +0100 [thread overview]
Message-ID: <YgKHDBvQFVJhTBzN@zn.tnic> (raw)
In-Reply-To: <202202071405.FB72C07@keescook>
On Mon, Feb 07, 2022 at 02:07:27PM -0800, Kees Cook wrote:
> On Thu, Jan 27, 2022 at 12:56:23PM +0100, Borislav Petkov wrote:
> > From: Borislav Petkov <bp@suse.de>
> >
> > Those were added as part of the SMAP enablement but SMAP is currently
> > an integral part of kernel proper and there's no need to disable it
> > anymore.
> >
> > Rip out that functionality.
> >
> > If still needed - clearcpuid=smap.
> >
> > Signed-off-by: Borislav Petkov <bp@suse.de>
> > Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
> > ---
> > .../admin-guide/kernel-parameters.txt | 2 +-
> > Documentation/x86/cpuinfo.rst | 5 ++--
> > arch/x86/Kconfig | 11 ---------
> > arch/x86/include/asm/disabled-features.h | 8 +------
> > arch/x86/include/asm/smap.h | 24 -------------------
> > arch/x86/kernel/cpu/common.c | 15 +-----------
> > scripts/Makefile.build | 1 -
> > scripts/link-vmlinux.sh | 3 ---
> > .../arch/x86/include/asm/disabled-features.h | 8 +------
> > 9 files changed, 6 insertions(+), 71 deletions(-)
> > [...]
> > diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> > index a4b89b757287..9b37902607ed 100644
> > --- a/scripts/Makefile.build
> > +++ b/scripts/Makefile.build
> > @@ -233,7 +233,6 @@ objtool_args = \
> > $(if $(CONFIG_FRAME_POINTER),, --no-fp) \
> > $(if $(CONFIG_GCOV_KERNEL)$(CONFIG_LTO_CLANG), --no-unreachable)\
> > $(if $(CONFIG_RETPOLINE), --retpoline) \
> > - $(if $(CONFIG_X86_SMAP), --uaccess) \
> > $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount) \
> > $(if $(CONFIG_SLS), --sls)
> >
> > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
> > index 666f7bbc13eb..8547aaa1a630 100755
> > --- a/scripts/link-vmlinux.sh
> > +++ b/scripts/link-vmlinux.sh
> > @@ -140,9 +140,6 @@ objtool_link()
> > if is_enabled CONFIG_RETPOLINE; then
> > objtoolopt="${objtoolopt} --retpoline"
> > fi
> > - if is_enabled CONFIG_X86_SMAP; then
> > - objtoolopt="${objtoolopt} --uaccess"
> > - fi
> > if is_enabled CONFIG_SLS; then
> > objtoolopt="${objtoolopt} --sls"
> > fi
>
> I was expecting to see --uaccess unconditionally added to objtool
> arguments. I think that needs to happen?
Hmm, I think you're right.
Mr. Z?
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2022-02-08 15:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 11:56 [PATCH v2 0/6] x86/cpu: Do some janitorial work Borislav Petkov
2022-01-27 11:56 ` [PATCH v2 1/6] x86/cpu: Allow feature bit names from /proc/cpuinfo in clearcpuid= Borislav Petkov
2022-02-07 22:04 ` Kees Cook
2022-02-08 11:54 ` Borislav Petkov
2022-04-04 18:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2022-01-27 11:56 ` [PATCH v2 2/6] x86/cpu: Remove "nosep" Borislav Petkov
2022-02-07 21:58 ` Kees Cook
2022-04-04 18:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2022-01-27 11:56 ` [PATCH v2 3/6] x86/cpu: Remove CONFIG_X86_SMAP and "nosmap" Borislav Petkov
2022-02-07 22:07 ` Kees Cook
2022-02-08 15:06 ` Borislav Petkov [this message]
2022-02-08 21:01 ` Borislav Petkov
2022-02-09 2:56 ` Kees Cook
2022-02-09 11:53 ` Borislav Petkov
2022-04-04 18:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2022-01-27 11:56 ` [PATCH v2 4/6] x86/cpu: Remove "nosmep" Borislav Petkov
2022-02-07 22:07 ` Kees Cook
2022-04-04 18:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2022-01-27 11:56 ` [PATCH v2 5/6] x86/cpu: Remove "noexec" Borislav Petkov
2022-02-07 22:25 ` Kees Cook
2022-02-08 17:40 ` Sean Christopherson
2022-02-08 19:56 ` Borislav Petkov
2022-04-04 18:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2022-01-27 11:56 ` [PATCH v2 6/6] x86/cpu: Remove "noclflush" Borislav Petkov
2022-02-07 22:08 ` Kees Cook
2022-04-04 18:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
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=YgKHDBvQFVJhTBzN@zn.tnic \
--to=bp@alien8.de \
--cc=jiangshanlai@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--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
all inboxes | Powered by JetHome®