lkml.org 
[lkml]   [2023]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/bugs] x86/srso: Print mitigation for retbleed IBPB case
    The following commit has been merged into the x86/bugs branch of tip:

    Commit-ID: 6988c6ceccb03bb29723bbf5645f7f5ab0658816
    Gitweb: https://git.kernel.org/tip/6988c6ceccb03bb29723bbf5645f7f5ab0658816
    Author: Josh Poimboeuf <jpoimboe@kernel.org>
    AuthorDate: Mon, 04 Sep 2023 22:04:51 -07:00
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitterDate: Tue, 19 Sep 2023 11:42:47 +02:00

    x86/srso: Print mitigation for retbleed IBPB case

    When overriding the requested mitigation with IBPB due to retbleed=ibpb,
    print the mitigation in the usual format instead of a custom error
    message.

    Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
    Link: https://lore.kernel.org/r/ec3af919e267773d896c240faf30bfc6a1fd6304.1693889988.git.jpoimboe@kernel.org
    ---
    arch/x86/kernel/cpu/bugs.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index 235c0e0..6c47f37 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -2425,9 +2425,8 @@ static void __init srso_select_mitigation(void)

    if (retbleed_mitigation == RETBLEED_MITIGATION_IBPB) {
    if (has_microcode) {
    - pr_err("Retbleed IBPB mitigation enabled, using same for SRSO\n");
    srso_mitigation = SRSO_MITIGATION_IBPB;
    - goto pred_cmd;
    + goto out;
    }
    }

    @@ -2490,7 +2489,8 @@ static void __init srso_select_mitigation(void)
    break;
    }

    - pr_info("%s%s\n", srso_strings[srso_mitigation], (has_microcode ? "" : ", no microcode"));
    +out:
    + pr_info("%s%s\n", srso_strings[srso_mitigation], has_microcode ? "" : ", no microcode");

    pred_cmd:
    if ((!boot_cpu_has_bug(X86_BUG_SRSO) || srso_cmd == SRSO_CMD_OFF) &&
    \
     
     \ /
      Last update: 2023-09-19 13:24    [W:4.470 / U:0.652 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site