From: Dave Hansen <dave.hansen@intel.com>
To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Ard Biesheuvel <ardb@kernel.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Xiongwei Song <xiongwei.song@windriver.com>,
Xin Li <xin3.li@intel.com>,
"Mike Rapoport (IBM)" <rppt@kernel.org>,
Brijesh Singh <brijesh.singh@amd.com>,
Michael Roth <michael.roth@amd.com>,
Tony Luck <tony.luck@intel.com>,
Alexey Kardashevskiy <aik@amd.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
Sohil Mehta <sohil.mehta@intel.com>,
Ingo Molnar <mingo@kernel.org>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Daniel Sneddon <daniel.sneddon@linux.intel.com>,
Kai Huang <kai.huang@intel.com>,
Sandipan Das <sandipan.das@amd.com>,
Breno Leitao <leitao@debian.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Alexei Starovoitov <ast@kernel.org>, Hou Tao <houtao1@huawei.com>,
Juergen Gross <jgross@suse.com>,
Vegard Nossum <vegard.nossum@oracle.com>,
Kees Cook <kees@kernel.org>, Eric Biggers <ebiggers@google.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Luis Chamberlain <mcgrof@kernel.org>,
Yuntao Wang <ytcoode@gmail.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Tejun Heo <tj@kernel.org>, Changbin Du <changbin.du@huawei.com>,
Huang Shijie <shijie@os.amperecomputing.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-efi@vger.kernel.org, linux-mm@kvack.org
Subject: Re: [PATCHv9 02/16] x86/alternatives: Disable LASS when patching kernel alternatives
Date: Wed, 9 Jul 2025 09:58:23 -0700 [thread overview]
Message-ID: <7d93b343-b275-4edb-ae26-4578ae53652f@intel.com> (raw)
In-Reply-To: <20250707080317.3791624-3-kirill.shutemov@linux.intel.com>
On 7/7/25 01:03, Kirill A. Shutemov wrote:
> From: Sohil Mehta <sohil.mehta@intel.com>
>
> For patching, the kernel initializes a temporary mm area in the lower
> half of the address range. See commit 4fc19708b165 ("x86/alternatives:
> Initialize temporary mm for patching").
>
> Disable LASS enforcement during patching to avoid triggering a #GP
> fault.
>
> The objtool warns due to a call to a non-allowed function that exists
> outside of the stac/clac guard, or references to any function with a
> dynamic function pointer inside the guard. See the Objtool warnings
> section #9 in the document tools/objtool/Documentation/objtool.txt.
>
> Considering that patching is usually small, replace the memcpy() and
> memset() functions in the text poking functions with their open coded
> versions.
>
> Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> ---
> arch/x86/include/asm/smap.h | 33 +++++++++++++++++++++++++++++++--
> arch/x86/kernel/alternative.c | 28 ++++++++++++++++++++++++++--
> 2 files changed, 57 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
> index 4f84d421d1cf..d0cc24348641 100644
> --- a/arch/x86/include/asm/smap.h
> +++ b/arch/x86/include/asm/smap.h
> @@ -23,18 +23,47 @@
>
> #else /* __ASSEMBLER__ */
>
> +/*
> + * The CLAC/STAC instructions toggle the enforcement of X86_FEATURE_SMAP and
> + * X86_FEATURE_LASS.
> + *
> + * SMAP enforcement is based on the _PAGE_BIT_USER bit in the page tables: the
> + * kernel is not allowed to touch pages with the bit set unless the AC bit is
> + * set.
> + *
> + * LASS enforcement is based on bit 63 of the virtual address. The kernel is
> + * not allowed to touch memory in the lower half of the virtual address space
> + * unless the AC bit is set.
> + *
> + * Use stac()/clac() when accessing userspace (_PAGE_USER) mappings,
> + * regardless of location.
> + *
> + * Use lass_stac()/lass_clac() when accessing kernel mappings (!_PAGE_USER)
> + * in the lower half of the address space.
> + *
> + * Note: a barrier is implicit in alternative().
> + */
> +
> static __always_inline void clac(void)
> {
> - /* Note: a barrier is implicit in alternative() */
> alternative("", "clac", X86_FEATURE_SMAP);
> }
>
> static __always_inline void stac(void)
> {
> - /* Note: a barrier is implicit in alternative() */
> alternative("", "stac", X86_FEATURE_SMAP);
> }
>
> +static __always_inline void lass_clac(void)
> +{
> + alternative("", "clac", X86_FEATURE_LASS);
> +}
> +
> +static __always_inline void lass_stac(void)
> +{
> + alternative("", "stac", X86_FEATURE_LASS);
> +}
Could we please move the comments about lass_*() closer to the LASS
functions?
> static __always_inline unsigned long smap_save(void)
> {
> unsigned long flags;
> diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> index ea1d984166cd..992ece0e879a 100644
> --- a/arch/x86/kernel/alternative.c
> +++ b/arch/x86/kernel/alternative.c
> @@ -2447,16 +2447,40 @@ void __init_or_module text_poke_early(void *addr, const void *opcode,
> __ro_after_init struct mm_struct *text_poke_mm;
> __ro_after_init unsigned long text_poke_mm_addr;
>
> +/*
> + * Text poking creates and uses a mapping in the lower half of the
> + * address space. Relax LASS enforcement when accessing the poking
> + * address.
> + */
> +
> static void text_poke_memcpy(void *dst, const void *src, size_t len)
> {
> - memcpy(dst, src, len);
> + lass_stac();
> +
> + /*
> + * Objtool is picky about what occurs within the STAC/CLAC region
> + * because this code runs with protection disabled. Objtool typically
> + * does not permit function calls in this area.
> + *
> + * Avoid using memcpy() here. Instead, open code it.
> + */
> + asm volatile("rep movsb"
> + : "+D" (dst), "+S" (src), "+c" (len) : : "memory");
> +
> + lass_clac();
> }
This didn't turn out great. At the _very_ least, we could have a:
inline_memcpy_i_really_mean_it()
with the rep mov. Or even a #define if we were super paranoid the
compiler is out to get us.
But _actually_ open-coding inline assembly is far too ugly to live.
We can also be a bit more compact about the comments:
/*
* objtool enforces a strict policy of "no function calls within
* AC=1 regions". Adhere to the policy by doing a memcpy() that
* will never result in a function call.
*/
next prev parent reply other threads:[~2025-07-09 16:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250707080317.3791624-1-kirill.shutemov@linux.intel.com>
[not found] ` <20250707080317.3791624-5-kirill.shutemov@linux.intel.com>
2025-07-09 1:19 ` [PATCHv9 04/16] x86/cpu: Defer CR pinning setup until core initcall Sohil Mehta
2025-07-09 9:38 ` Kirill A. Shutemov
2025-07-09 17:00 ` Dave Hansen
2025-07-31 23:45 ` Sohil Mehta
2025-08-01 0:01 ` Dave Hansen
2025-08-01 4:43 ` Sohil Mehta
2025-08-01 14:22 ` Dave Hansen
2025-08-02 18:51 ` Kees Cook
2025-08-04 6:55 ` H. Peter Anvin
[not found] ` <20250707080317.3791624-6-kirill.shutemov@linux.intel.com>
2025-07-09 1:27 ` [PATCHv9 05/16] efi: Disable LASS around set_virtual_address_map() EFI call Sohil Mehta
[not found] ` <20250707080317.3791624-12-kirill.shutemov@linux.intel.com>
2025-07-09 2:40 ` [PATCHv9 11/16] x86/traps: Communicate a LASS violation in #GP message Sohil Mehta
2025-07-09 9:31 ` Kirill A. Shutemov
2025-07-09 9:36 ` Geert Uytterhoeven
2025-07-09 9:51 ` Kirill A. Shutemov
[not found] ` <20250707080317.3791624-13-kirill.shutemov@linux.intel.com>
2025-07-09 4:59 ` [PATCHv9 12/16] x86/traps: Generalize #GP address decode and hint code Sohil Mehta
[not found] ` <20250707080317.3791624-17-kirill.shutemov@linux.intel.com>
2025-07-09 5:31 ` [PATCHv9 16/16] x86: Re-enable Linear Address Masking Sohil Mehta
2025-07-09 11:00 ` Kirill A. Shutemov
2025-07-11 0:42 ` Sohil Mehta
[not found] ` <20250707080317.3791624-3-kirill.shutemov@linux.intel.com>
2025-07-09 1:08 ` [PATCHv9 02/16] x86/alternatives: Disable LASS when patching kernel alternatives Sohil Mehta
2025-07-09 9:35 ` Kirill A. Shutemov
2025-07-09 16:58 ` Dave Hansen [this message]
2025-07-25 2:35 ` Sohil Mehta
2025-07-28 19:11 ` David Laight
2025-07-28 19:28 ` H. Peter Anvin
2025-07-28 19:38 ` David Laight
2025-08-01 0:15 ` Sohil Mehta
[not found] ` <20250707080317.3791624-14-kirill.shutemov@linux.intel.com>
2025-07-09 5:12 ` [PATCHv9 13/16] x86/traps: Handle LASS thrown #SS Sohil Mehta
2025-07-09 10:38 ` Kirill A. Shutemov
2025-07-11 1:22 ` Sohil Mehta
2025-07-11 1:23 ` Sohil Mehta
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=7d93b343-b275-4edb-ae26-4578ae53652f@intel.com \
--to=dave.hansen@intel.com \
--cc=acme@redhat.com \
--cc=aik@amd.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=ardb@kernel.org \
--cc=ast@kernel.org \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=changbin.du@huawei.com \
--cc=christophe.leroy@csgroup.eu \
--cc=corbet@lwn.net \
--cc=daniel.sneddon@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ebiggers@google.com \
--cc=geert+renesas@glider.be \
--cc=houtao1@huawei.com \
--cc=hpa@zytor.com \
--cc=jgg@ziepe.ca \
--cc=jgross@suse.com \
--cc=jpoimboe@kernel.org \
--cc=kai.huang@intel.com \
--cc=kees@kernel.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=leitao@debian.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@rasmusvillemoes.dk \
--cc=luto@kernel.org \
--cc=mcgrof@kernel.org \
--cc=mhiramat@kernel.org \
--cc=michael.roth@amd.com \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulmck@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rppt@kernel.org \
--cc=sandipan.das@amd.com \
--cc=shijie@os.amperecomputing.com \
--cc=sohil.mehta@intel.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=tony.luck@intel.com \
--cc=vegard.nossum@oracle.com \
--cc=x86@kernel.org \
--cc=xin3.li@intel.com \
--cc=xiongwei.song@windriver.com \
--cc=ytcoode@gmail.com \
/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).