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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT 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 A910BC04AB1 for ; Thu, 9 May 2019 18:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C5DB2184C for ; Thu, 9 May 2019 18:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427687; bh=h2N+hDNITwH/Ke3AALEIDpBX62l9aCHbEXOmbu49DlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gVigUUskmCJrH+Tjjj28NiPcchS2DV3CguFUI2eWUfAL+/KHcCE6MLVJ8wlNHDEDa Z7AoCSwhpLfa0NKfD4/pAJ8xtTM6/ODZQaLhFvODiFpQ9JyF/6omPHOVfEaCzQVEIx IIa8PM3w6m4ZvUFoTeLJ4FA3/Sasmna6Xw4JhdLA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727947AbfEISsG (ORCPT ); Thu, 9 May 2019 14:48:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:40836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727213AbfEISsD (ORCPT ); Thu, 9 May 2019 14:48:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6327321848; Thu, 9 May 2019 18:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427682; bh=h2N+hDNITwH/Ke3AALEIDpBX62l9aCHbEXOmbu49DlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWfTta4q5OpMc1H4TYX5pc9CmKjwlLg4OwdS97S3gAgvRDB+KvRT5++1oZQ8ETsHI 1Pmng7ipO8FaocGEQBWeCj1bE5II1nijVDlSrpoCzFy/VY3qVlE0fY6x5vKUCIqIh0 L4uahYVvVNemSQewou5cklyrpVPc7lbFIq5TYqTo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephane Eranian , Nelson DSouza , "Peter Zijlstra (Intel)" , Alexander Shishkin , Arnaldo Carvalho de Melo , Jiri Olsa , Linus Torvalds , Thomas Gleixner , Vince Weaver , tonyj@suse.com, Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 30/66] perf/x86/intel: Initialize TFA MSR Date: Thu, 9 May 2019 20:42:05 +0200 Message-Id: <20190509181305.094955192@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190509181301.719249738@linuxfoundation.org> References: <20190509181301.719249738@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit d7262457e35dbe239659e62654e56f8ddb814bed ] Stephane reported that the TFA MSR is not initialized by the kernel, but the TFA bit could set by firmware or as a leftover from a kexec, which makes the state inconsistent. Reported-by: Stephane Eranian Tested-by: Nelson DSouza Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vince Weaver Cc: tonyj@suse.com Link: https://lkml.kernel.org/r/20190321123849.GN6521@hirez.programming.kicks-ass.net Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/events/intel/core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 26432ee4590e3..f9958ad4d3353 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3447,6 +3447,12 @@ static void intel_pmu_cpu_starting(int cpu) cpuc->lbr_sel = NULL; + if (x86_pmu.flags & PMU_FL_TFA) { + WARN_ON_ONCE(cpuc->tfa_shadow); + cpuc->tfa_shadow = ~0ULL; + intel_set_tfa(cpuc, false); + } + if (x86_pmu.version > 1) flip_smm_bit(&x86_pmu.attr_freeze_on_smi); -- 2.20.1