From patchwork Tue Jul 4 07:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 115596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1045491vqx; Tue, 4 Jul 2023 00:52:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ65BAIqZ9SzmRC7N7k6GNpwDUmX3KUcJc3B+euNrfpqM/ZOqsDlInkOb4SN0nw6vIKipNdd X-Received: by 2002:a05:6a21:32a1:b0:12c:362c:5843 with SMTP id yt33-20020a056a2132a100b0012c362c5843mr18122610pzb.3.1688457168334; Tue, 04 Jul 2023 00:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688457168; cv=none; d=google.com; s=arc-20160816; b=q2a5ywxAFd01y4iIRyAEQmbWAXWhaHlrS3P2C6InQN+t63bVuPMrsiSKh15ykyxznc ubZKz9FWohsbNF+U9CdDjS+LIXIA5/v5gkhdYenFoCpeefHkrCV7/WLZJT9jvQ0UmStF y0S7qJDUbAXJNv4Zp7W8pXXr9rgd5qQCtRm0b4uK86+oemzHusQodQyv0d5BdDVJ4zeP g5/oT3qwCJjlIPpdPGg0p0R1lbrUpmlsA3cWXttlPj3gu8nZQBPiKKECjB11hDieCurW 0s8ZA61D6bYW6bgUYVfFO1V4OATkaOG0/uskiG6Drpl6pTTfdNwYuQ/PIakaKg1SLPTN FthA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pFWuk9CQgB53mYDiTiy+lICk6MCGHxzRe0lIgvhuc8E=; fh=td1tWwqmzXUMurl83U4wnxYbX8ZMZukrMraSvbRxzQ0=; b=fXJkvDvIo4aDPDm1AvSSy+K90m/QOyf/NbCXzZlgnZBIPwxWqoIdFnIMx2AsTPlwBK tLlofSkEy6HzGI4omlBQlRJkJst8Yii4lzwzec5E1IpG9Z73BnEMaJhoGuNfLZwCn5j8 v5UB9j5MF3s4f4Yuu4V0yS0NQyJM9FLBjKFvQL/xWINgmiCySBLhubys3WmJW5t7G/sV +wvbtVQ8wHATeuYuyl5sc0901mptjVlev4eMJpPt+wSfagNIsDA4G3V5hrn7rX9zVuyZ Yc2ChW105lZ3dvZXnX1onSSHe3RDwvxuBsecPo8D5jpxRe3LTn2cgKLsQ5/jCUHIewWy NZTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a17090276c700b001b22f31cce9si19348906plt.179.2023.07.04.00.52.32; Tue, 04 Jul 2023 00:52:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231509AbjGDHoh (ORCPT + 99 others); Tue, 4 Jul 2023 03:44:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231345AbjGDHoa (ORCPT ); Tue, 4 Jul 2023 03:44:30 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A3DAE71; Tue, 4 Jul 2023 00:44:23 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QwF8g56ttzMqK1; Tue, 4 Jul 2023 15:41:07 +0800 (CST) Received: from localhost.localdomain (10.67.174.95) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 4 Jul 2023 15:44:20 +0800 From: Yang Jihong To: , , , , , , , , , , , CC: Subject: [PATCH 2/5] perf evlist: Add evlist__findnew_tracking_event() helper Date: Tue, 4 Jul 2023 07:42:14 +0000 Message-ID: <20230704074217.240939-3-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230704074217.240939-1-yangjihong1@huawei.com> References: <20230704074217.240939-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770475663647654343?= X-GMAIL-MSGID: =?utf-8?q?1770475663647654343?= Currently, intel-bts, intel-pt, and arm-spe may add a dummy event for tracking to the evlist. We may need to search for the dummy event for some settings. Therefore, add evlist__findnew_tracking_event() helper. Signed-off-by: Yang Jihong --- tools/perf/builtin-record.c | 11 +++-------- tools/perf/util/evlist.c | 17 +++++++++++++++++ tools/perf/util/evlist.h | 1 + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index aec18db7ff23..8872cd037f2c 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1295,14 +1295,9 @@ static int record__open(struct record *rec) */ if (opts->target.initial_delay || target__has_cpu(&opts->target) || perf_pmus__num_core_pmus() > 1) { - pos = evlist__get_tracking_event(evlist); - if (!evsel__is_dummy_event(pos)) { - /* Set up dummy event. */ - if (evlist__add_dummy(evlist)) - return -ENOMEM; - pos = evlist__last(evlist); - evlist__set_tracking_event(evlist, pos); - } + pos = evlist__findnew_tracking_event(evlist); + if (!pos) + return -ENOMEM; /* * Enable the dummy event when the process is forked for diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 7ef43f72098e..4621ddaeb8f3 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1694,6 +1694,23 @@ void evlist__set_tracking_event(struct evlist *evlist, struct evsel *tracking_ev tracking_evsel->tracking = true; } +struct evsel *evlist__findnew_tracking_event(struct evlist *evlist) +{ + struct evsel *evsel; + + evsel = evlist__get_tracking_event(evlist); + if (!evsel__is_dummy_event(evsel)) { + /* Set up dummy event. */ + if (evlist__add_dummy(evlist)) + return NULL; + + evsel = evlist__last(evlist); + evlist__set_tracking_event(evlist, evsel); + } + + return evsel; +} + struct evsel *evlist__find_evsel_by_str(struct evlist *evlist, const char *str) { struct evsel *evsel; diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 664c6bf7b3e0..4d28c50ba842 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -387,6 +387,7 @@ bool evlist_cpu_iterator__end(const struct evlist_cpu_iterator *evlist_cpu_itr); struct evsel *evlist__get_tracking_event(struct evlist *evlist); void evlist__set_tracking_event(struct evlist *evlist, struct evsel *tracking_evsel); +struct evsel *evlist__findnew_tracking_event(struct evlist *evlist); struct evsel *evlist__find_evsel_by_str(struct evlist *evlist, const char *str);