From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>, Kees Cook <kees@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] x86/cfi: Add 'cfi=warn' boot option
Date: Wed, 26 Feb 2025 12:04:49 -0000 [thread overview]
Message-ID: <174057148993.10177.11418020321616617043.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250224124159.924496481@infradead.org>
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 9a54fb31343362f93680543e37afc14484c185d9
Gitweb: https://git.kernel.org/tip/9a54fb31343362f93680543e37afc14484c185d9
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 24 Feb 2025 13:37:04 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 26 Feb 2025 12:10:48 +01:00
x86/cfi: Add 'cfi=warn' boot option
Rebuilding with CONFIG_CFI_PERMISSIVE=y enabled is such a pain, esp. since
clang is so slow.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Kees Cook <kees@kernel.org>
Link: https://lore.kernel.org/r/20250224124159.924496481@infradead.org
---
arch/x86/kernel/alternative.c | 3 +++
include/linux/cfi.h | 2 ++
kernel/cfi.c | 4 +++-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 247ee5f..1142ebd 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1022,6 +1022,9 @@ static __init int cfi_parse_cmdline(char *str)
cfi_mode = CFI_FINEIBT;
} else if (!strcmp(str, "norand")) {
cfi_rand = false;
+ } else if (!strcmp(str, "warn")) {
+ pr_alert("CFI mismatch non-fatal!\n");
+ cfi_warn = true;
} else {
pr_err("Ignoring unknown cfi option (%s).", str);
}
diff --git a/include/linux/cfi.h b/include/linux/cfi.h
index f0df518..1db17ec 100644
--- a/include/linux/cfi.h
+++ b/include/linux/cfi.h
@@ -11,6 +11,8 @@
#include <linux/module.h>
#include <asm/cfi.h>
+extern bool cfi_warn;
+
#ifndef cfi_get_offset
static inline int cfi_get_offset(void)
{
diff --git a/kernel/cfi.c b/kernel/cfi.c
index 08caad7..19be796 100644
--- a/kernel/cfi.c
+++ b/kernel/cfi.c
@@ -7,6 +7,8 @@
#include <linux/cfi.h>
+bool cfi_warn __ro_after_init = IS_ENABLED(CONFIG_CFI_PERMISSIVE);
+
enum bug_trap_type report_cfi_failure(struct pt_regs *regs, unsigned long addr,
unsigned long *target, u32 type)
{
@@ -17,7 +19,7 @@ enum bug_trap_type report_cfi_failure(struct pt_regs *regs, unsigned long addr,
pr_err("CFI failure at %pS (no target information)\n",
(void *)addr);
- if (IS_ENABLED(CONFIG_CFI_PERMISSIVE)) {
+ if (cfi_warn) {
__warn(NULL, 0, (void *)addr, 0, regs, NULL);
return BUG_TRAP_TYPE_WARN;
}
next prev parent reply other threads:[~2025-02-26 12:04 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 12:37 [PATCH v4 00/10] x86/ibt: FineIBT-BHI Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 01/10] x86/cfi: Add warn option Peter Zijlstra
2025-02-24 18:57 ` Kees Cook
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` tip-bot2 for Peter Zijlstra [this message]
2025-02-24 12:37 ` [PATCH v4 02/10] x86/ibt: Add exact_endbr() helper Peter Zijlstra
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 03/10] x86/traps: Decode 0xEA #UD Peter Zijlstra
2025-02-24 18:58 ` Kees Cook
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` [tip: x86/core] x86/traps: Decode 0xEA instructions as #UD tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 04/10] x86/traps: Allow custom fixups in handle_bug() Peter Zijlstra
2025-02-24 18:59 ` Kees Cook
2025-02-25 8:54 ` Peter Zijlstra
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 05/10] x86/ibt: Optimize FineIBT sequence Peter Zijlstra
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` [tip: x86/core] x86/ibt: Optimize the FineIBT instruction sequence tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 06/10] x86/traps: Decode LOCK Jcc.d8 #UD Peter Zijlstra
2025-02-24 21:46 ` David Laight
2025-02-25 18:33 ` Kees Cook
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` [tip: x86/core] x86/traps: Decode LOCK Jcc.d8 as #UD tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 07/10] x86/ibt: Add paranoid FineIBT mode Peter Zijlstra
2025-02-24 19:00 ` Kees Cook
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 08/10] x86: BHI stubs Peter Zijlstra
2025-02-24 19:01 ` Kees Cook
2025-02-25 8:52 ` Peter Zijlstra
2025-02-25 18:31 ` Kees Cook
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` [tip: x86/core] x86/bhi: Add " tip-bot2 for Peter Zijlstra
2025-02-26 12:54 ` tip-bot2 for Peter Zijlstra
2025-02-24 12:37 ` [PATCH v4 09/10] x86/ibt: Implement FineIBT-BHI mitigation Peter Zijlstra
2025-02-25 9:12 ` Peter Zijlstra
2025-02-26 0:04 ` Constable, Scott D
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` tip-bot2 for Peter Zijlstra
2025-02-26 12:54 ` tip-bot2 for Peter Zijlstra
2025-02-26 19:53 ` Peter Zijlstra
2025-03-10 8:55 ` Peter Zijlstra
2025-03-10 16:00 ` Miguel Ojeda
2025-03-10 16:02 ` Peter Zijlstra
2025-03-11 19:09 ` Ramon de C Valle
2025-03-11 19:41 ` Miguel Ojeda
2025-03-11 20:23 ` Ramon de C Valle
2025-03-12 9:16 ` Peter Zijlstra
2025-03-12 11:36 ` Miguel Ojeda
2025-03-19 0:04 ` Nathan Chancellor
2025-02-24 12:37 ` [PATCH v4 10/10] x86/ibt: Optimize fineibt-bhi arity 1 case Peter Zijlstra
2025-02-26 10:54 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2025-02-26 12:04 ` [tip: x86/core] x86/ibt: Optimize the " tip-bot2 for Peter Zijlstra
2025-02-26 12:54 ` tip-bot2 for Peter Zijlstra
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=174057148993.10177.11418020321616617043.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@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®