From: Nathan Chancellor <nathan@kernel.org>
To: Kees Cook <kees@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Vegard Nossum <vegard.nossum@oracle.com>,
Miguel Ojeda <ojeda@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Jeff Johnson <jeff.johnson@oss.qualcomm.com>,
Randy Dunlap <rdunlap@infradead.org>,
David Woodhouse <dwmw2@infradead.org>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
Nick Desaulniers <nick.desaulniers+lkml@gmail.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.com>,
Marco Elver <elver@google.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
Ramon de C Valle <rcvalle@google.com>,
Jonathan Corbet <corbet@lwn.net>,
"Paul E. McKenney" <paulmck@kernel.org>,
Nicolas Schier <nicolas.schier@linux.dev>,
Masahiro Yamada <masahiroy@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Sami Tolvanen <samitolvanen@google.com>,
Mark Rutland <mark.rutland@arm.com>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, x86@kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH v2 4/9] x86/cfi: Standardize on common "CFI:" prefix for CFI reports
Date: Thu, 4 Sep 2025 11:40:04 -0700 [thread overview]
Message-ID: <20250904184004.GC2110053@ax162> (raw)
In-Reply-To: <20250904034656.3670313-4-kees@kernel.org>
On Wed, Sep 03, 2025 at 08:46:43PM -0700, Kees Cook wrote:
> Use a regular "CFI:" prefix for CFI reports during alternatives setup,
> including reporting when nothing has happened (i.e. CONFIG_FINEIBT=n).
>
> Signed-off-by: Kees Cook <kees@kernel.org>
> ---
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Obviously minor but I had pointed out on v1 that there appears to be
some inconsistency within the diff around capitalization, "ignoring" vs.
"Ignoring".
> ---
> arch/x86/kernel/alternative.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> index 7bde68247b5f..d8f4ac95b4df 100644
> --- a/arch/x86/kernel/alternative.c
> +++ b/arch/x86/kernel/alternative.c
> @@ -1266,26 +1266,26 @@ static __init int cfi_parse_cmdline(char *str)
> } else if (!strcmp(str, "norand")) {
> cfi_rand = false;
> } else if (!strcmp(str, "warn")) {
> - pr_alert("CFI mismatch non-fatal!\n");
> + pr_alert("CFI: mismatch non-fatal!\n");
> cfi_warn = true;
> } else if (!strcmp(str, "paranoid")) {
> if (cfi_mode == CFI_FINEIBT) {
> cfi_paranoid = true;
> } else {
> - pr_err("Ignoring paranoid; depends on fineibt.\n");
> + pr_err("CFI: ignoring paranoid; depends on fineibt.\n");
> }
> } else if (!strcmp(str, "bhi")) {
> #ifdef CONFIG_FINEIBT_BHI
> if (cfi_mode == CFI_FINEIBT) {
> cfi_bhi = true;
> } else {
> - pr_err("Ignoring bhi; depends on fineibt.\n");
> + pr_err("CFI: ignoring bhi; depends on fineibt.\n");
> }
> #else
> - pr_err("Ignoring bhi; depends on FINEIBT_BHI=y.\n");
> + pr_err("CFI: ignoring bhi; depends on FINEIBT_BHI=y.\n");
> #endif
> } else {
> - pr_err("Ignoring unknown cfi option (%s).", str);
> + pr_err("CFI: Ignoring unknown option (%s).", str);
> }
>
> str = next;
> @@ -1757,7 +1757,7 @@ static void __apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,
> switch (cfi_mode) {
> case CFI_OFF:
> if (builtin)
> - pr_info("Disabling CFI\n");
> + pr_info("CFI: disabled\n");
> return;
>
> case CFI_KCFI:
> @@ -1766,7 +1766,8 @@ static void __apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,
> goto err;
>
> if (builtin)
> - pr_info("Using kCFI\n");
> + pr_info("CFI: Using %sretpoline kCFI\n",
> + cfi_rand ? "rehashed " : "");
> return;
>
> case CFI_FINEIBT:
> @@ -2005,6 +2006,8 @@ bool decode_fineibt_insn(struct pt_regs *regs, unsigned long *target, u32 *type)
> static void __apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,
> s32 *start_cfi, s32 *end_cfi, bool builtin)
> {
> + if (IS_ENABLED(CONFIG_CFI) && builtin)
> + pr_info("CFI: Using standard kCFI\n");
> }
>
> #ifdef CONFIG_X86_KERNEL_IBT
> --
> 2.34.1
>
next prev parent reply other threads:[~2025-09-04 18:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-04 3:46 [PATCH v2 0/9] kcfi: Prepare for GCC support Kees Cook
2025-09-04 3:46 ` [PATCH v2 1/9] compiler_types.h: Move __nocfi out of compiler-specific header Kees Cook
2025-09-04 18:28 ` Nathan Chancellor
2025-09-04 3:46 ` [PATCH v2 2/9] x86/traps: Clarify KCFI instruction layout Kees Cook
2025-09-04 3:46 ` [PATCH v2 3/9] x86/cfi: Document the "cfi=" bootparam options Kees Cook
2025-09-04 18:32 ` Nathan Chancellor
2025-09-04 3:46 ` [PATCH v2 4/9] x86/cfi: Standardize on common "CFI:" prefix for CFI reports Kees Cook
2025-09-04 18:40 ` Nathan Chancellor [this message]
2025-09-05 0:40 ` Kees Cook
2025-09-04 3:46 ` [PATCH v2 5/9] x86/cfi: Add "debug" option to "cfi=" bootparam Kees Cook
2025-09-04 7:00 ` Peter Zijlstra
2025-09-04 3:46 ` [PATCH v2 6/9] x86/cfi: Remove __noinitretpoline and __noretpoline Kees Cook
2025-09-04 3:46 ` [PATCH v2 7/9] kconfig: Add transitional symbol attribute for migration support Kees Cook
2025-09-04 3:46 ` [PATCH v2 8/9] kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI Kees Cook
2025-09-04 3:46 ` [PATCH v2 9/9] ARM: traps: Implement KCFI trap handler for ARM32 Kees Cook
2025-09-04 7:04 ` [PATCH v2 0/9] kcfi: Prepare for GCC support Peter Zijlstra
2025-09-04 16:37 ` Kees Cook
2025-09-04 20:01 ` Peter Zijlstra
2025-09-05 0:42 ` Kees Cook
2025-09-05 7:44 ` Miguel Ojeda
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=20250904184004.GC2110053@ax162 \
--to=nathan@kernel.org \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=dwmw2@infradead.org \
--cc=elver@google.com \
--cc=jeff.johnson@oss.qualcomm.com \
--cc=justinstitt@google.com \
--cc=kees@kernel.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=morbo@google.com \
--cc=nick.desaulniers+lkml@gmail.com \
--cc=nicolas.schier@linux.dev \
--cc=ojeda@kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=przemyslaw.kitszel@intel.com \
--cc=rcvalle@google.com \
--cc=rdunlap@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=samitolvanen@google.com \
--cc=vegard.nossum@oracle.com \
--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).