Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp182763pxb; Wed, 3 Nov 2021 02:18:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWV4NgeE0bJyxGulLh23voBcq85sfnJ3JETsgCV5pi6rwdaEy0IdvPE3b9GOhNz+gDKbKc X-Received: by 2002:a05:6e02:893:: with SMTP id z19mr28895773ils.224.1635931136500; Wed, 03 Nov 2021 02:18:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635931136; cv=none; d=google.com; s=arc-20160816; b=XziPnKJtSq1fHdWZHzSeRVLZveG5kDrkVFxrb/mRBsDyBc8HIGA6jGWtwl1nk7UlaR aC+b0h8I/zVX99zoOkzRG7j1sAH4lUwdIzYck20PjSo18txQyAE3uEjcN9hVr9W651Mu qqOrCWzowQQDFTlIscJD4GymW4BTbKohkfsQA5SIBs+8Q0nLPxdYwtvr9OOhHiRJvKG5 W85+5tD8GCZLTgXbX3JN0tU2YUc2zBJ7uAxkMZfeXxsLC1fMKrlDiTT/WLGOwUIcFZ7j Y19zQSGIAgG0TAO5uqeNiVQ2uZpdsYd//AkCtmfsCf+b2YFTmrNtpSD94UrvcY3DA7i4 EiDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=3aDTcyLaxlTzmld97lRKtg8oGlo6vYz73kceJptCCyg=; b=E1Ce9RNabqv7ZD1VcA45L4XO7CHYTPRBfYT0S5OIJ6Tcm+upt8+WywyycE4QbKfSlo lW3Bzppn2i8espGfPuTOcoslbVIXm0kSVZr7LAOu0+64UqL6Yt6Zk7LM2KxNXY9aAo6x wwj8/f3T/GABmZaiJCTphOmccuiASykRyj3b5Kb8RTmSrQLbrFfHAXQtHfyccLqigW+a haNQQenO7d08Mi7f6Ctq48M58wjwSZZaZ8jrx1Cz295QvcBhRtTuNMKG3EGPZ33qe5gH UCK6FPXD0wdrWYA59sXtJEz/7lDTMMpP9scWb/zdTdjf1KqPd9eoOpodRk9MeMX5Kr2d Eahw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=meXBYcAi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l5si2513426ilh.2.2021.11.03.02.18.44; Wed, 03 Nov 2021 02:18:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=meXBYcAi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231903AbhKCJUC (ORCPT + 99 others); Wed, 3 Nov 2021 05:20:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbhKCJUC (ORCPT ); Wed, 3 Nov 2021 05:20:02 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18469C061714; Wed, 3 Nov 2021 02:17:26 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id gt5so847647pjb.1; Wed, 03 Nov 2021 02:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3aDTcyLaxlTzmld97lRKtg8oGlo6vYz73kceJptCCyg=; b=meXBYcAiuUATe1TchsOkL+iwWGF4ZhfPlpPyx2mL0tbJ0kc2ItO128v1H68+26QmC/ GtA90sX/kENmd3CgrXitRqK5AbOhSJUS+TFyxV5Qr8CfwfAc9Dqc618h48hUTZtQ94QP brIaD2hshMz5BOEcFxexpcL93rWF3dG8HZqcin42PvJE3dojownEjfXdBOAxcc1TIQY1 hoVVx++YcGVIz5iuc/IXSrIytYWZ/EE24TD/1Myq4y+k7GF6crtExBLI9dBZzVW+XRkJ 48dtGK1U1Gt5CM6+HtB+1jvOTylYXvHSKQcJzxGtr8axwSXKytWov/biJoE67V5U/Y2o rWmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3aDTcyLaxlTzmld97lRKtg8oGlo6vYz73kceJptCCyg=; b=GfVJnW0icl0ncDT4UD4kbJ/rMLXJkbWaQB39x1aXTALzQY3rR0sTVJmYs6qcoAtYVx jmFKEMBTSdL4uKjwvzt5PGsoxuNkiYXRw12GF4wgMJG6qFLhy4ql0i/1gSjPszrr9hV0 tjD87teqjptbajtEyJtCEsYffjKbUXz5nBZ3N8AXrYvGUSOG/sWsxZb5TBtT+3LsmWPM FCuEH+YekwwcXZiFD7vZiYB7fyxFEq24U4m0y/7t/arisslFjpHASML3kSvYpn69Eu28 /qzCC4i8dafDyqstRbfkAW5lDKiboGJx4uNMCugUNp/Vt+5sjrUTh9ECUjhukdeAGiqb M5EA== X-Gm-Message-State: AOAM531QKb4w7yfVXmZn43YIN2aEhojg9ARECEeoBteUkWbnoww8tkCs wFHEE3jYntw5SAshkVC248E= X-Received: by 2002:a17:90a:e613:: with SMTP id j19mr13309561pjy.182.1635931045671; Wed, 03 Nov 2021 02:17:25 -0700 (PDT) Received: from localhost.localdomain ([103.7.29.32]) by smtp.gmail.com with ESMTPSA id m3sm1891037pfk.190.2021.11.03.02.17.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Nov 2021 02:17:24 -0700 (PDT) From: Like Xu X-Google-Original-From: Like Xu To: Peter Zijlstra Cc: Alexander Shishkin , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Jiri Olsa , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] perf/x86/vlbr: Add c->flags to vlbr event constraints Date: Wed, 3 Nov 2021 17:17:16 +0800 Message-Id: <20211103091716.59906-1-likexu@tencent.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Like Xu 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. Reported-by: Wanpeng Li Fixes: 097e4311cda9 ("perf/x86: Add constraint to create guest LBR event without hw counter") Signed-off-by: Like Xu --- 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 7011e87be6d0..30b5d1b3cb03 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -2997,8 +2997,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