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 X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AD97C432C0 for ; Mon, 18 Nov 2019 01:23:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0847220856 for ; Mon, 18 Nov 2019 01:23:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RvWNCzx3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726541AbfKRBW7 (ORCPT ); Sun, 17 Nov 2019 20:22:59 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:35009 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726414AbfKRBW7 (ORCPT ); Sun, 17 Nov 2019 20:22:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574040177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NuKKozoX2IaGiwfBygC66aUq6NMWEqsDHdKXFpwLIXU=; b=RvWNCzx3JTqwH0aW9c1xKKATQR0AISaGvzLcofhx3P4Bb6yeEwx9i3r+ifuh/D6tzsVDkW FoTsfweJtAycxVVw0i47ovXcO9SdHrMLwelhod7uR/18Dc4rBGYPeYLcIAcgrhX8qpmE8a jQfu9Bb+icRBleydAQilJNQOi50ze2A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347-B32kBpQdNrKDSGFJPojxsQ-1; Sun, 17 Nov 2019 20:22:54 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01969801FCF; Mon, 18 Nov 2019 01:22:52 +0000 (UTC) Received: from llong.remote.csb (ovpn-120-229.rdu2.redhat.com [10.10.120.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E421A614F2; Mon, 18 Nov 2019 01:22:49 +0000 (UTC) Subject: Re: [tip: x86/pti] x86/speculation: Fix redundant MDS mitigation message To: Borislav Petkov Cc: linux-tip-commits@vger.kernel.org, Pawan Gupta , Borislav Petkov , Greg Kroah-Hartman , "H. Peter Anvin" , Ingo Molnar , Josh Poimboeuf , Mark Gross , Peter Zijlstra , Thomas Gleixner , Tim Chen , Tony Luck , Tyler Hicks , x86-ml , Ingo Molnar , linux-kernel@vger.kernel.org References: <20191115161445.30809-3-longman@redhat.com> <157390711921.12247.3084878540998345444.tip-bot2@tip-bot2> <20191116142411.GA23231@zn.tnic> From: Waiman Long Organization: Red Hat Message-ID: Date: Sun, 17 Nov 2019 20:22:49 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20191116142411.GA23231@zn.tnic> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: B32kBpQdNrKDSGFJPojxsQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/16/19 9:24 AM, Borislav Petkov wrote: > On Sat, Nov 16, 2019 at 12:25:19PM -0000, tip-bot2 for Waiman Long wrote: >> +static void __init mds_print_mitigation(void) >> +{ >> =09pr_info("%s\n", mds_strings[mds_mitigation]); >> } > Almost. This causes > > MDS: Vulnerable > > to be printed on an in-order 32-bit Atom here, which is wrong. I've > fixed it up to: > > --- > diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c > index cb2fbd93ef4d..8bf64899f56a 100644 > --- a/arch/x86/kernel/cpu/bugs.c > +++ b/arch/x86/kernel/cpu/bugs.c > @@ -256,6 +256,9 @@ static void __init mds_select_mitigation(void) > =20 > static void __init mds_print_mitigation(void) > { > +=09if (!boot_cpu_has_bug(X86_BUG_MDS) || cpu_mitigations_off()) > +=09=09return; > + > =09pr_info("%s\n", mds_strings[mds_mitigation]); > } > =20 > You are right. I missed that. Thanks for fixing it. Cheers, Longman