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 B1AFAC433F5 for ; Wed, 24 Nov 2021 13:32:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352463AbhKXNgB (ORCPT ); Wed, 24 Nov 2021 08:36:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:50198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351799AbhKXNde (ORCPT ); Wed, 24 Nov 2021 08:33:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C0C1761BD3; Wed, 24 Nov 2021 12:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637758416; bh=UctDOi6sgnFA9Ck2+gmrfdDnMs5ZuezcCI9kSB0HyJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xL90GQtOHc5RW9crQrp/9YaKLJSOzgrDOT3QaqQXeowaBtqeZ4mFdJdQkev/AaEH5 jojXhx0I9UPbrh8vvvQClBaXLN7cuMsg2g0mylghgMH9VDzgfmNnSChFkEXKYA3Ll2 AqTGr5WqFQtbMJZEMewgVVoOKDw38hDatDtGFM+0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wanpeng Li , Like Xu , "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 5.10 062/154] perf/x86/vlbr: Add c->flags to vlbr event constraints Date: Wed, 24 Nov 2021 12:57:38 +0100 Message-Id: <20211124115704.327482886@linuxfoundation.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211124115702.361983534@linuxfoundation.org> References: <20211124115702.361983534@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Like Xu [ Upstream commit 5863702561e625903ec678551cb056a4b19e0b8a ] Just like what we do in the x86_get_event_constraints(), the PERF_X86_EVENT_LBR_SELECT flag should also be propagated to event->hw.flags so that the host lbr driver can save/restore MSR_LBR_SELECT for the special vlbr event created by KVM or BPF. Fixes: 097e4311cda9 ("perf/x86: Add constraint to create guest LBR event without hw counter") Reported-by: Wanpeng Li Signed-off-by: Like Xu Signed-off-by: Peter Zijlstra (Intel) Tested-by: Wanpeng Li Link: https://lore.kernel.org/r/20211103091716.59906-1-likexu@tencent.com Signed-off-by: Sasha Levin --- arch/x86/events/intel/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 4684bf9fcc428..a521135247eb6 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -2879,8 +2879,10 @@ intel_vlbr_constraints(struct perf_event *event) { struct event_constraint *c = &vlbr_constraint; - if (unlikely(constraint_match(c, event->hw.config))) + if (unlikely(constraint_match(c, event->hw.config))) { + event->hw.flags |= c->flags; return c; + } return NULL; } -- 2.33.0