linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lai Jiangshan <laijs@linux.alibaba.com>
To: Lai Jiangshan <jiangshanlai@gmail.com>,
	linux-kernel@vger.kernel.org,
	Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org, Andy Lutomirski <luto@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [PATCH V3 32/49] x86/entry: Add the C version ist_restore_cr3()
Date: Mon, 25 Oct 2021 08:34:54 +0800	[thread overview]
Message-ID: <5591e2b1-5701-80da-557a-899fd3158697@linux.alibaba.com> (raw)
In-Reply-To: <20211014034121.17025-1-jiangshanlai@gmail.com>



On 2021/10/14 11:41, Lai Jiangshan wrote:
>
>   static __always_inline void switch_to_kernel_cr3(void)
>   {
>   	if (static_cpu_has(X86_FEATURE_PTI))
> @@ -49,9 +70,34 @@ static __always_inline unsigned long ist_switch_to_kernel_cr3(void)
>   
>   	return cr3;
>   }
> +
> +static __always_inline void ist_restore_cr3(unsigned long cr3)
> +{
> +	if (!static_cpu_has(X86_FEATURE_PTI))
> +		return;
> +
> +	if (unlikely(cr3 & PTI_USER_PGTABLE_MASK)) {
> +		pti_switch_to_user_cr3(cr3);
> +		return;
> +	}

The C code is semantically copied from ASM.

The ASM code is from the commit 21e9445911025("x86/mm: Optimize RESTORE_CR3")
which still keeps the older behavior of writing to CR3 unconditionally
even the saved CR3 is kernel CR3.

Is there any special reason that the CR3 needs to be written for kernel CR3?

I would add a commit to change it in ASM code by skipping cr3 write when
it is kernel CR3, and then make the C code as the same as new ASM code.

> +
> +	/*
> +	 * KERNEL pages can always resume with NOFLUSH as we do
> +	 * explicit flushes.
> +	 */
> +	if (static_cpu_has(X86_FEATURE_PCID))
> +		cr3 |= X86_CR3_PCID_NOFLUSH;
> +
> +	/*
> +	 * The CR3 write could be avoided when not changing its value,
> +	 * but would require a CR3 read.
> +	 */
> +	native_write_cr3(cr3);
> +}
>   #else
>   static __always_inline void switch_to_kernel_cr3(void) {}
>   static __always_inline unsigned long ist_switch_to_kernel_cr3(void) { return 0; }
> +static __always_inline void ist_restore_cr3(unsigned long cr3) {}
>   #endif
>   
>   /*
> 

  reply	other threads:[~2021-10-25  0:34 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-14  3:13 [PATCH V3 00/49] x86/entry/64: Convert a bunch of ASM entry code into C code Lai Jiangshan
2021-10-14  3:13 ` [PATCH V3 01/49] x86/entry: Add fence for kernel entry swapgs in paranoid_entry() Lai Jiangshan
2021-10-14  3:13 ` [PATCH V3 02/49] x86/entry: Use the correct fence macro after swapgs in kernel CR3 Lai Jiangshan
2021-10-14  3:13 ` [PATCH V3 03/49] x86/traps: Remove stack-protector from traps.c Lai Jiangshan
2021-10-14  3:13 ` [PATCH V3 04/49] x86/xen: Add xenpv_restore_regs_and_return_to_usermode() Lai Jiangshan
2021-10-16 18:08   ` Boris Ostrovsky
2021-10-14  3:13 ` [PATCH V3 05/49] x86/entry: Use swapgs and native_iret directly in swapgs_restore_regs_and_return_to_usermode Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 06/49] compiler_types.h: Add __noinstr_section() for noinstr Lai Jiangshan
2021-10-14 18:29   ` Nick Desaulniers
2021-10-14 18:35     ` Miguel Ojeda
2021-10-18  9:16       ` Lai Jiangshan
2021-10-18 11:29         ` Miguel Ojeda
2021-10-14  3:33 ` [PATCH V3 07/49] x86/entry: Introduce __entry_text for entry code written in C Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 08/49] x86/entry: Move PTI_USER_* to arch/x86/include/asm/processor-flags.h Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 09/49] x86: Remove unused kernel_to_user_p4dp() and user_to_kernel_p4dp() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 10/49] x86: Replace PTI_PGTABLE_SWITCH_BIT with PTI_USER_PGTABLE_BIT Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 11/49] x86: Mark __native_read_cr3() & native_write_cr3() as __always_inline Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 12/49] x86/traps: Move the declaration of native_irq_return_iret into proto.h Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 13/49] x86/entry: Add arch/x86/entry/entry64.c for C entry code Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 14/49] x86/entry: Expose the address of .Lgs_change to entry64.c Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 15/49] x86/entry: Add C verion of SWITCH_TO_KERNEL_CR3 as switch_to_kernel_cr3() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 16/49] x86/traps: Add fence_swapgs_{user,kernel}_entry() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 17/49] x86/entry: Add C {user,kernel}_entry_swapgs_and_fence() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 18/49] x86/traps: Move pt_regs only in fixup_bad_iret() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 19/49] x86/entry: Switch the stack after error_entry() returns Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 20/49] x86/entry: move PUSH_AND_CLEAR_REGS out of error_entry Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 21/49] x86/entry: Move cld to the start of idtentry Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 22/49] x86/entry: Don't call error_entry for XENPV Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 23/49] x86/entry: Convert SWAPGS to swapgs in error_entry() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 24/49] x86/entry: Implement the whole error_entry() as C code Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 25/49] x86/entry: Use idtentry macro for entry_INT80_compat Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 26/49] x86/entry: Convert SWAPGS to swapgs in entry_SYSENTER_compat() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 27/49] x86: Remove the definition of SWAPGS Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 28/49] x86/entry: Make paranoid_exit() callable Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 29/49] x86/entry: Call paranoid_exit() in asm_exc_nmi() Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 30/49] x86/entry: move PUSH_AND_CLEAR_REGS out of paranoid_entry Lai Jiangshan
2021-10-14  3:33 ` [PATCH V3 31/49] x86/entry: Add the C version ist_switch_to_kernel_cr3() Lai Jiangshan
2021-10-14  3:41 ` [PATCH V3 32/49] x86/entry: Add the C version ist_restore_cr3() Lai Jiangshan
2021-10-25  0:34   ` Lai Jiangshan [this message]
2021-10-14  3:41 ` [PATCH V3 33/49] x86/entry: Add the C version get_percpu_base() Lai Jiangshan
2021-10-14  3:41 ` [PATCH V3 34/49] x86/entry: Add the C version ist_switch_to_kernel_gsbase() Lai Jiangshan
2021-10-14  3:41 ` [PATCH V3 35/49] x86/entry: Implement the C version ist_paranoid_entry() Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 36/49] x86/entry: Implement the C version ist_paranoid_exit() Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 37/49] x86/entry: Add a C macro to define the function body for IST in .entry.text Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 38/49] x86/debug, mce: Use C entry code Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 39/49] x86/idtentry.h: Move the definitions *IDTENTRY_{MCE|DEBUG}* up Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 40/49] x86/nmi: Use DEFINE_IDTENTRY_NMI for nmi Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 41/49] x86/nmi: Use C entry code Lai Jiangshan
2021-10-14  3:50 ` [PATCH V3 42/49] x86/entry: Add a C macro to define the function body for IST in .entry.text with an error code Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 43/49] x86/doublefault: Use C entry code Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 44/49] x86/sev: Add and use ist_vc_switch_off_ist() Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 45/49] x86/sev: Use C entry code Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 46/49] x86/entry: Remove ASM function paranoid_entry() and paranoid_exit() Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 47/49] x86/entry: Remove the unused ASM macros Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 48/49] x86/entry: Remove save_ret from PUSH_AND_CLEAR_REGS Lai Jiangshan
2021-10-14  3:58 ` [PATCH V3 49/49] x86/syscall/64: Move the checking for sysret to C code Lai Jiangshan
2021-10-23  0:01 ` [PATCH V3 00/49] x86/entry/64: Convert a bunch of ASM entry code into " Lai Jiangshan

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=5591e2b1-5701-80da-557a-899fd3158697@linux.alibaba.com \
    --to=laijs@linux.alibaba.com \
    --cc=bp@alien8.de \
    --cc=hpa@zytor.com \
    --cc=jiangshanlai@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --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).