From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94314C6FA8F for ; Thu, 24 Aug 2023 21:41:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243754AbjHXVlY (ORCPT ); Thu, 24 Aug 2023 17:41:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243745AbjHXVk5 (ORCPT ); Thu, 24 Aug 2023 17:40:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 868E419A0 for ; Thu, 24 Aug 2023 14:40:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2050C6313A for ; Thu, 24 Aug 2023 21:40:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12D7CC433C7; Thu, 24 Aug 2023 21:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692913254; bh=VnIgZOsYuMfvNLV27JRIntctRbnkD24emyKs6rgPNOs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TDh1z40Uvp+DPCJQy9gCOCxp3RvPgV3VB+z5T23vIXXVDxj+GoiO04d58aBxvOink p+jZhHL39tyIkwl+Ji9id2F5haGQXBXH7P8fzl2yNqs6baZYT8dV+dPSQmfknp9pZ4 ccWE8+YdL51KyFqKZyGma3AnYUErKFibm+PcztkogfXyM8nRC3ybGVJ3NchaIqJv6w Is9x7bNTFIoE+ZvXbGdHiVZPFtx8M9EFLfAC/gZkkPNVt4eujP1R9lkE8+0eN6/W9s 3Zh5g5UXEoPbjn0svGuBKU/9c6NjgqlLUsO6H72zIct10RqPEP+ELOomABVeev26A1 CiBpDpE3/tpCg== Date: Thu, 24 Aug 2023 14:40:52 -0700 From: Josh Poimboeuf To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Babu Moger , Paolo Bonzini , Sean Christopherson , David.Kaplan@amd.com, Andrew Cooper , Nikolay Borisov , gregkh@linuxfoundation.org, Thomas Gleixner Subject: Re: [PATCH 10/22] x86/srso: Print mitigation for retbleed IBPB case Message-ID: <20230824214052.v2sxidqqdfounkrw@treble> References: <3836b2e27c9537d95ecce2a1e33e53315176ebc1.1692580085.git.jpoimboe@kernel.org> <20230824044818.GDZObhEh3MWZN8vcfW@fat_crate.local> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230824044818.GDZObhEh3MWZN8vcfW@fat_crate.local> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 24, 2023 at 06:48:18AM +0200, Borislav Petkov wrote: > On Sun, Aug 20, 2023 at 06:19:07PM -0700, Josh Poimboeuf wrote: > > When overriding the requested mitigation with IBPB due to retbleed=ibpb, > > print the actual mitigation. > > > > Signed-off-by: Josh Poimboeuf > > --- > > arch/x86/kernel/cpu/bugs.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c > > index da480c089739..4e332707a343 100644 > > --- a/arch/x86/kernel/cpu/bugs.c > > +++ b/arch/x86/kernel/cpu/bugs.c > > @@ -2427,7 +2427,7 @@ static void __init srso_select_mitigation(void) > > if (has_microcode) { > > pr_info("Retbleed IBPB mitigation enabled, using same for SRSO\n"); > > This print was supposed to do that. Now you have two for the IBPB case. > If you want to print it using the usual format, then whack the above. Sure, and in that case I'll just drop the other one which changes the above from pr_err() to pr_info(). -- Josh