All of
 help / color / mirror / Atom feed
From: "tip-bot2 for David Kaplan" <>
Cc: David Kaplan <>,
	"Borislav Petkov (AMD)" <>,,
Subject: [tip: x86/urgent] x86/cpu: Fix check for RDPKRU in __show_regs()
Date: Wed, 24 Apr 2024 12:43:15 -0000	[thread overview]
Message-ID: <171396259581.10875.10910607244661766462.tip-bot2@tip-bot2> (raw)
In-Reply-To: <>

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     b53c6bd5d271d023857174b8fd3e32f98ae51372
Author:        David Kaplan <>
AuthorDate:    Sun, 21 Apr 2024 21:17:28 +02:00
Committer:     Borislav Petkov (AMD) <>
CommitterDate: Wed, 24 Apr 2024 14:30:21 +02:00

x86/cpu: Fix check for RDPKRU in __show_regs()

cpu_feature_enabled(X86_FEATURE_OSPKE) does not necessarily reflect
whether CR4.PKE is set on the CPU.  In particular, they may differ on
non-BSP CPUs before setup_pku() is executed.  In this scenario, RDPKRU
will #UD causing the system to hang.

Fix by checking CR4 for PKE enablement which is always correct for the
current CPU.

The scenario happens by inserting a WARN* before setup_pku() in
identiy_cpu() or some other diagnostic which would lead to calling

  [ bp: Massage commit message. ]

Signed-off-by: David Kaplan <>
Signed-off-by: Borislav Petkov (AMD) <>
 arch/x86/kernel/process_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 7062b84..6d3d20e 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -139,7 +139,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode,
 		       log_lvl, d3, d6, d7);
-	if (cpu_feature_enabled(X86_FEATURE_OSPKE))
+	if (cr4 & X86_CR4_PKE)
 		printk("%sPKRU: %08x\n", log_lvl, read_pkru());

      reply	other threads:[~2024-04-24 12:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-21 19:17 [PATCH] x86/cpu: Fix check for RDPKRU in __show_regs() bp
2024-04-24 12:43 ` tip-bot2 for David Kaplan [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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=171396259581.10875.10910607244661766462.tip-bot2@tip-bot2 \ \ \ \ \ \ \

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.