From patchwork Tue Jul 4 07:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 115593 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1044633vqx; Tue, 4 Jul 2023 00:50:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlHAmN09XU8j12eiUwrRXf/ketGiis275/ZKZK3dQlYfFEaN3u3bPzdWZVezBLK3QpPyGl/n X-Received: by 2002:a05:6a20:8e17:b0:12e:6000:60b2 with SMTP id y23-20020a056a208e1700b0012e600060b2mr8533271pzj.23.1688457036236; Tue, 04 Jul 2023 00:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688457036; cv=none; d=google.com; s=arc-20160816; b=IhhCQ6MEfE7SuxyDKz54bIkeD9QuFnQAj5720IX/UZrkJU8+DtH0Ia+Ojg4TDygibX bW0tOfSnwZGzNJM38ujIXpidMODLbyzHmPrPAdGlfarL/3O9ERJHjtKLzjbwxnEMLKSm YtXGNPKX/iMJ9Lrl9i3rjhTd4gJ+LzzkmKLBX9FfA9bH8UNxI/U82N/l4tllxkLj0NBI mt+kb18AE36+Q2u9VMhOxgNVjwaN5EJgL04waR/LI7vn24jP/vx4sJstgBuEiJALG6ur bLWgAdnl3M0WinY7IjOcJfcPxBI87zO/G/WwnyBZsu4/E/FJ5e2FWNnxbse5V6ZIaN3j xIdQ== 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=4f8rq2KdEznb54P92CqCakb7UUV1vVGpDcjZ3igQOb4=; fh=td1tWwqmzXUMurl83U4wnxYbX8ZMZukrMraSvbRxzQ0=; b=PyhuGvLBzD/Ni2AoqxsWyZHnA90zUhTgWehQkpBFdu9yppqILDGLHBvpMOCaWwSUaK 6M/H5uz+9c4lyDNE0cE5ronDE6TrvF+oV00pFM1ahaupNdQpySwv6X9iMuS1289prjkD LGJPmKiynTNgzqXC2J2oBm7E8VFKAkrUugwJu76KzeltiR8as2xr9+CVzc48zQWjTluM ue+qcdS85m3eBc9w9C6vGJ8t0RXaBOmRLXcAXdNKKtr8/wPiiL5woRuqATeImX9jVAPL 7mbvdiiCn6C4kXn19etgQcv87jwsJMsRPvC2d4Qs3J6TY2vfuT7atb0EIKe2FLX1gxJ9 oRSQ== 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 bo3-20020a056a000e8300b0068208d19b23si10789368pfb.311.2023.07.04.00.50.22; Tue, 04 Jul 2023 00:50:36 -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 S231497AbjGDHoc (ORCPT + 99 others); Tue, 4 Jul 2023 03:44:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230512AbjGDHoa (ORCPT ); Tue, 4 Jul 2023 03:44:30 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EFDDE70; Tue, 4 Jul 2023 00:44:23 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4QwF9s2S8YzLngn; Tue, 4 Jul 2023 15:42:09 +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 1/5] perf evlist: Export perf_evlist__propagate_maps() Date: Tue, 4 Jul 2023 07:42:13 +0000 Message-ID: <20230704074217.240939-2-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, 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?1770475524843086061?= X-GMAIL-MSGID: =?utf-8?q?1770475524843086061?= For dummy events that keep tracking, we may need to modify its cpu_maps. For example, change the cpu_maps to track side-band events for all CPUS. Export perf_evlist__propagate_maps () to support this scenario. No functional change. Signed-off-by: Yang Jihong --- tools/lib/perf/evlist.c | 23 +++++++++-------------- tools/lib/perf/include/perf/evlist.h | 2 ++ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c index b8b066d0dc5e..a3057b692530 100644 --- a/tools/lib/perf/evlist.c +++ b/tools/lib/perf/evlist.c @@ -33,8 +33,8 @@ void perf_evlist__init(struct perf_evlist *evlist) perf_evlist__reset_id_hash(evlist); } -static void __perf_evlist__propagate_maps(struct perf_evlist *evlist, - struct perf_evsel *evsel) +void perf_evlist__propagate_maps(struct perf_evlist *evlist, + struct perf_evsel *evsel) { if (evsel->system_wide) { /* System wide: set the cpu map of the evsel to all online CPUs. */ @@ -78,16 +78,6 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist, evlist->all_cpus = perf_cpu_map__merge(evlist->all_cpus, evsel->cpus); } -static void perf_evlist__propagate_maps(struct perf_evlist *evlist) -{ - struct perf_evsel *evsel; - - evlist->needs_map_propagation = true; - - perf_evlist__for_each_evsel(evlist, evsel) - __perf_evlist__propagate_maps(evlist, evsel); -} - void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *evsel) { @@ -96,7 +86,7 @@ void perf_evlist__add(struct perf_evlist *evlist, evlist->nr_entries += 1; if (evlist->needs_map_propagation) - __perf_evlist__propagate_maps(evlist, evsel); + perf_evlist__propagate_maps(evlist, evsel); } void perf_evlist__remove(struct perf_evlist *evlist, @@ -175,6 +165,8 @@ void perf_evlist__set_maps(struct perf_evlist *evlist, struct perf_cpu_map *cpus, struct perf_thread_map *threads) { + struct perf_evsel *evsel; + /* * Allow for the possibility that one or another of the maps isn't being * changed i.e. don't put it. Note we are assuming the maps that are @@ -192,7 +184,10 @@ void perf_evlist__set_maps(struct perf_evlist *evlist, evlist->threads = perf_thread_map__get(threads); } - perf_evlist__propagate_maps(evlist); + evlist->needs_map_propagation = true; + + perf_evlist__for_each_evsel(evlist, evsel) + perf_evlist__propagate_maps(evlist, evsel); } int perf_evlist__open(struct perf_evlist *evlist) diff --git a/tools/lib/perf/include/perf/evlist.h b/tools/lib/perf/include/perf/evlist.h index e894b770779e..d5a2569b2177 100644 --- a/tools/lib/perf/include/perf/evlist.h +++ b/tools/lib/perf/include/perf/evlist.h @@ -48,4 +48,6 @@ LIBPERF_API struct perf_mmap *perf_evlist__next_mmap(struct perf_evlist *evlist, LIBPERF_API void perf_evlist__set_leader(struct perf_evlist *evlist); LIBPERF_API int perf_evlist__nr_groups(struct perf_evlist *evlist); +LIBPERF_API void perf_evlist__propagate_maps(struct perf_evlist *evlist, + struct perf_evsel *evsel); #endif /* __LIBPERF_EVLIST_H */ 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); From patchwork Tue Jul 4 07:42:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 115600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1046171vqx; Tue, 4 Jul 2023 00:54:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlHVgnrRoi/+qRctKrcJZbvGhuA3d9CtqwlEEWwfk7Yvd0xCquDL8OeaMEiikmDb9vAJctCY X-Received: by 2002:a17:90a:c918:b0:262:ebfd:ce44 with SMTP id v24-20020a17090ac91800b00262ebfdce44mr10488976pjt.34.1688457268858; Tue, 04 Jul 2023 00:54:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688457268; cv=none; d=google.com; s=arc-20160816; b=CeqqhvU8EXGXdLRFpm7xB6X/s+xCcM1gFNnu5iTkcp0ulAIjC8h6R+c3KXhsHF0Z4C Z4G9ChYgLs/dblSdEvPxs7LzuY+fOzBdwjMqXHcGlQ0R9K3eMcD7NS/V2xw5zy5qM0Zt Kl/KvBjljDM44AX4j+y4Z1lbl4RHfXvxhkcljcJZJpagNBBBqKboOcr0Guuxq/OZOXbQ mzdtxRrnuPln8+JUC9+k/Isf+RdxzbcnUTGkhsl0ZAcPbGk5qoZwhZ6SRI30FxtTyVWE vXUHhNXiHf+gXAcnaJYxLVH9Y0T3lUyrA16oeoXkEIlgY88zfGoygWAcRUs2FW2z+eTM TQ/g== 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=wZ0C2lkfZax7VbHphMYzhRUt0SW6Xd4bATRJOGN1W4M=; fh=td1tWwqmzXUMurl83U4wnxYbX8ZMZukrMraSvbRxzQ0=; b=hQPvXwxegczwtxv6ts+lnyqPaM/YnJBG/ZI9QxZdchk3DeYoyyohbtXOsS7XjHAal5 wrFyDvV1P5MYi5NkXgmE6z+Qv2T8XucrmwcUz3q0iO0TAiWgkZsLcWx5RodKgdbwb6pj /ICD3vE3cpZV3kjTo+uijqQS1jnyHgd6cSk0yroZ1O5e4NgIrWKkuNWHZYclcst7BHG2 XuLO/OkYY7q2fZ0Fa/RClR5riN+uDT4SjwvEX93B5iQFYT07n3hzctq1MpdC6Da0iGhI XY/1NTzXpWhSVYFwYYwiypGldZrXfWtCGYPEX5+zSEYy4Nv71oSiGTkC2cp2sjYDC/ly BtGA== 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 15-20020a63164f000000b005574bef6f31si20295271pgw.490.2023.07.04.00.54.14; Tue, 04 Jul 2023 00:54:28 -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 S231501AbjGDHou (ORCPT + 99 others); Tue, 4 Jul 2023 03:44:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231459AbjGDHoa (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 E766CE6D; Tue, 4 Jul 2023 00:44:23 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QwFCD5pDkzTm8c; Tue, 4 Jul 2023 15:43:20 +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:21 +0800 From: Yang Jihong To: , , , , , , , , , , , CC: Subject: [PATCH 3/5] perf record: Tracking side-band events for all CPUs when tracing selected CPUs Date: Tue, 4 Jul 2023 07:42:15 +0000 Message-ID: <20230704074217.240939-4-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?1770475744171711252?= X-GMAIL-MSGID: =?utf-8?q?1770475769314659751?= User space tasks can migrate between CPUs, we need to track side-band events for all CPUs. The specific scenarios are as follows: CPU0 CPU1 perf record -C 0 start taskA starts to be created and executed -> PERF_RECORD_COMM and PERF_RECORD_MMAP events only deliver to CPU1 ...... | migrate to CPU0 | Running on CPU0 <----------/ ... perf record -C 0 stop Now perf samples the PC of taskA. However, perf does not record the PERF_RECORD_COMM and PERF_RECORD_COMM events of taskA. Therefore, the comm and symbols of taskA cannot be parsed. The sys_perf_event_open invoked is as follows: # perf --debug verbose=3 record -e cpu-clock -C 1 true Opening: cpu-clock ------------------------------------------------------------ perf_event_attr: type 1 size 136 { sample_period, sample_freq } 4000 sample_type IP|TID|TIME|ID|CPU|PERIOD read_format ID|LOST disabled 1 inherit 1 freq 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid -1 cpu 1 group_fd -1 flags 0x8 = 5 Opening: dummy:HG ------------------------------------------------------------ perf_event_attr: type 1 size 136 config 0x9 { sample_period, sample_freq } 4000 sample_type IP|TID|TIME|ID|CPU|PERIOD read_format ID|LOST inherit 1 mmap 1 comm 1 freq 1 task 1 sample_id_all 1 mmap2 1 comm_exec 1 ksymbol 1 bpf_event 1 ------------------------------------------------------------ sys_perf_event_open: pid -1 cpu 0 group_fd -1 flags 0x8 = 6 sys_perf_event_open: pid -1 cpu 1 group_fd -1 flags 0x8 = 7 sys_perf_event_open: pid -1 cpu 2 group_fd -1 flags 0x8 = 9 sys_perf_event_open: pid -1 cpu 3 group_fd -1 flags 0x8 = 10 sys_perf_event_open: pid -1 cpu 4 group_fd -1 flags 0x8 = 11 sys_perf_event_open: pid -1 cpu 5 group_fd -1 flags 0x8 = 12 sys_perf_event_open: pid -1 cpu 6 group_fd -1 flags 0x8 = 13 sys_perf_event_open: pid -1 cpu 7 group_fd -1 flags 0x8 = 14 Signed-off-by: Yang Jihong --- tools/perf/builtin-record.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 8872cd037f2c..69e0d8c75aab 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -908,6 +908,31 @@ static int record__config_off_cpu(struct record *rec) return off_cpu_prepare(rec->evlist, &rec->opts.target, &rec->opts); } +static int record__config_tracking_events(struct record *rec) +{ + struct evsel *evsel; + struct evlist *evlist = rec->evlist; + struct record_opts *opts = &rec->opts; + + /* + * User space tasks can migrate between CPUs, so when tracing + * selected CPUs, sideband for all CPUs is still needed. + */ + if (opts->target.cpu_list) { + evsel = evlist__findnew_tracking_event(evlist); + if (!evsel) + return -ENOMEM; + + if (!evsel->core.system_wide) { + evsel->core.system_wide = true; + evsel__set_sample_bit(evsel, TIME); + perf_evlist__propagate_maps(&evlist->core, &evsel->core); + } + } + + return 0; +} + static bool record__kcore_readable(struct machine *machine) { char kcore[PATH_MAX]; @@ -4235,6 +4260,12 @@ int cmd_record(int argc, const char **argv) goto out; } + err = record__config_tracking_events(rec); + if (err) { + pr_err("record__config_tracking_events failed, error %d\n", err); + goto out; + } + err = record__init_thread_masks(rec); if (err) { pr_err("Failed to initialize parallel data streaming masks\n"); From patchwork Tue Jul 4 07:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 115592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1043310vqx; Tue, 4 Jul 2023 00:47:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Nl+dhbryPptbqcZLu3Vv7hLBQmed70qhUVwhpxRpLuHGcYN13venBqogzGE5lsGpwqERB X-Received: by 2002:a9d:73c9:0:b0:6b8:7478:5861 with SMTP id m9-20020a9d73c9000000b006b874785861mr11501589otk.32.1688456844325; Tue, 04 Jul 2023 00:47:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688456844; cv=none; d=google.com; s=arc-20160816; b=dScjxqm+MVVt3j4yS9cv5omiJCCXy0AmWvMuNylc9pjwvO9mA9kJCZTEB6h38z3esi /fSvVEtGs6pN4Xm4sigoS3VwaF3stvocoNW9v+07dIQ9YRw3RPAC7g+It9nHyWSmntQM P0mQ3JXPljzBDGedCQdM04nVdhPwZH57R2dqAsUq2rGIvs7KUWQTcFstC29/My/HaA3j 1D5KXxLhxLlGpWB40nrJalXYupkKBaa7gqGqtV1mjJH4+z6CdA930fk82LDzsYPKr7h5 fceroXJ08QKc9SCJ2BRNqRAyV/H9EKMRRQrBQLPO7/nTk32hk5bskNluDAgrOqo6S4yw 7cbg== 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=EO9VNYMWXIQfwZNdyIb7KPJ7pVNEk665BTSuTYq5SYI=; fh=td1tWwqmzXUMurl83U4wnxYbX8ZMZukrMraSvbRxzQ0=; b=mx02q3aHOfgMA7tBCp5DGuajIofKbmKBwwZcJ2g3fOXG0DsQvqSM+BFZiKXbgYk+ES Kr1d5R7ObDZ1wj9M3o8RAgZdiVm3dft7H/zr9OYPtwuhh7gGoXClC8hMjKl9r29tzje0 vlBlnTq9jAW1rs/JiT/8i+ZxiuS3iF3KKc4c+A40EgF1k9paTMtBJffYceJZT1e989CS 1CWHWZhk4hjBbqfP717hlDi1E9LHRL/amcsRFu8r4XiK0NWys2qKnxRcwl/EAqngfJL4 G8Zp5Xhy3oJ/FnYvOt08zf9DS/AHKarPoLaUofK4IDvz9YCEFtz7bbexD0sQVp/YT706 NQfg== 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 v2-20020a17090ad58200b00263c7cadb62si3988703pju.38.2023.07.04.00.47.11; Tue, 04 Jul 2023 00:47:24 -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 S230214AbjGDHoo (ORCPT + 99 others); Tue, 4 Jul 2023 03:44:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231450AbjGDHoa (ORCPT ); Tue, 4 Jul 2023 03:44:30 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26FFFE7A; Tue, 4 Jul 2023 00:44:24 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4QwF9t4yctzLnh6; Tue, 4 Jul 2023 15:42:10 +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:21 +0800 From: Yang Jihong To: , , , , , , , , , , , CC: Subject: [PATCH 4/5] perf test: Add test case for record tracking Date: Tue, 4 Jul 2023 07:42:16 +0000 Message-ID: <20230704074217.240939-5-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, 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?1770475323608790843?= X-GMAIL-MSGID: =?utf-8?q?1770475323608790843?= Add a new test case to record tracking side-band events for all CPUs when tracing selected CPUs Test result: # ./perf test list 2>&1 | grep 'perf record tracking tests' 95: perf record tracking tests f# ./perf test 95 95: perf record tracking tests : Ok Signed-off-by: Yang Jihong --- tools/perf/tests/shell/record_tracking.sh | 44 +++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 tools/perf/tests/shell/record_tracking.sh diff --git a/tools/perf/tests/shell/record_tracking.sh b/tools/perf/tests/shell/record_tracking.sh new file mode 100755 index 000000000000..fe05f4772999 --- /dev/null +++ b/tools/perf/tests/shell/record_tracking.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# perf record tracking tests +# SPDX-License-Identifier: GPL-2.0 + +set -e + +err=0 +perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX) + +can_cpu_wide() +{ + if ! perf record -o ${perfdata} -BN --no-bpf-event -e dummy:u -C $1 true 2>&1 >/dev/null + then + echo "record tracking test [Skipped cannot record cpu$1]" + err=2 + fi + + rm -f ${perfdata} + return $err +} + +test_system_wide_tracking() +{ + # Need CPU 0 and CPU 1 + can_cpu_wide 0 || return 0 + can_cpu_wide 1 || return 0 + + # Record on CPU 0 a task running on CPU 1 + perf record -BN --no-bpf-event -o ${perfdata} -e dummy:u -C 0 -- taskset --cpu-list 1 true + + # Should get MMAP events from CPU 1 + mmap_cnt=`perf script -i ${perfdata} --show-mmap-events -C 1 2>/dev/null | grep MMAP | wc -l` + + rm -f ${perfdata} + + if [ ${mmap_cnt} -gt 0 ] ; then + return 0 + fi + + echo "Failed to record MMAP events on CPU 1 when tracing CPU 0" + return 1 +} + +test_system_wide_tracking From patchwork Tue Jul 4 07:42:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 115603 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1047847vqx; Tue, 4 Jul 2023 00:59:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Wqc/Ll0Ym3HKuwEOymklxST26TWBKy8w+PDGThrI/M4BblKu7XFRonJP+IUlVn/xgod1B X-Received: by 2002:a05:6808:1392:b0:3a0:663d:fd18 with SMTP id c18-20020a056808139200b003a0663dfd18mr13204417oiw.57.1688457544735; Tue, 04 Jul 2023 00:59:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688457544; cv=none; d=google.com; s=arc-20160816; b=Rvoiy66UnSwmDJP87XJ8pfjCjqFe67AwTukDH9CClTUsahoXDqdNmq/0zt5x+WxyUs cWP32U9SKIDZXKpTjXwx3LLK1u3Xnad8N7tBkZNHEvX4NXehQYMM6dVyG74beu3Sf5Z7 29MDSRZENS6oy75GlELqI+ptVkOCUUYCeB8rKNGSNvucOCIYkDHRlRTwoCGLnEttgd32 qxGc25qUMAspjpLN9rxYbk4beteVHfAWCVvHceJa6E/jg/gZjRON2iZ2cedGKFQsHLK2 e8j3G+DSLt6r58jpC8iozKkDd+81apSecnT/Cpu7iRW+CpZUDOFr+8JCC1cKVwQ4dvP5 SvJg== 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=/IX40+XQQMyRhKOenjX68ENSOSTwRDREDtWXfj28Z3A=; fh=td1tWwqmzXUMurl83U4wnxYbX8ZMZukrMraSvbRxzQ0=; b=05JGiYPW4KzRXbSwnUFHbRvO41/reC5xVaIkCAbkQVYLVtB9qf0r/B8cZpNr4DuBIK Z2ZCe/A5l1sX6MtdhTYvC2e35PvGI023nMVzK/DeJkPwfBi6t9rcWDKUdMNHAGyPIPZg wKOUlnxr9P/eBnXDsocBYVfLmbRBaoF6amn4r/jkf6ertfBMc7Klg2H8QN/KBnSofV4/ AoL2zQDRYKtOlk3gL9exs2ujZaxs2EefRxqZVgMsmN87o+ztGBO7WJ0W3jNq8R8sxQ1x Efrl2lzVqZyogl7LBf+tNubOPjRAQEVtWpGLYIwe+MtHB2JZgusaEC6zshd3xLaVXhWn 7bGQ== 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 s15-20020a63dc0f000000b005575a1d0e2csi8229713pgg.269.2023.07.04.00.58.52; Tue, 04 Jul 2023 00:59:04 -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 S231459AbjGDHox (ORCPT + 99 others); Tue, 4 Jul 2023 03:44:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231481AbjGDHob (ORCPT ); Tue, 4 Jul 2023 03:44:31 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C088E76; Tue, 4 Jul 2023 00:44:24 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QwF8j0WSGzMqK8; Tue, 4 Jul 2023 15:41:09 +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:22 +0800 From: Yang Jihong To: , , , , , , , , , , , CC: Subject: [PATCH 5/5] perf record: All config tracking are integrated into record__config_tracking_events() Date: Tue, 4 Jul 2023 07:42:17 +0000 Message-ID: <20230704074217.240939-6-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?1770476057892996613?= X-GMAIL-MSGID: =?utf-8?q?1770476057892996613?= The current perf-record also config tracking events in record__open(), move it to the record__config_tracking_events(). The sys_perf_event_open invoked is as follows: # perf --debug verbose=3 record -e cpu-clock -D 100 true Opening: cpu-clock ------------------------------------------------------------ perf_event_attr: type 1 size 136 { sample_period, sample_freq } 4000 sample_type IP|TID|TIME|ID|PERIOD read_format ID|LOST disabled 1 inherit 1 freq 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid 3569 cpu 0 group_fd -1 flags 0x8 = 5 sys_perf_event_open: pid 3569 cpu 1 group_fd -1 flags 0x8 = 6 sys_perf_event_open: pid 3569 cpu 2 group_fd -1 flags 0x8 = 7 sys_perf_event_open: pid 3569 cpu 3 group_fd -1 flags 0x8 = 9 sys_perf_event_open: pid 3569 cpu 4 group_fd -1 flags 0x8 = 10 sys_perf_event_open: pid 3569 cpu 5 group_fd -1 flags 0x8 = 11 sys_perf_event_open: pid 3569 cpu 6 group_fd -1 flags 0x8 = 12 sys_perf_event_open: pid 3569 cpu 7 group_fd -1 flags 0x8 = 13 Opening: dummy:HG ------------------------------------------------------------ perf_event_attr: type 1 size 136 config 0x9 { sample_period, sample_freq } 4000 sample_type IP|TID|TIME|ID|PERIOD read_format ID|LOST disabled 1 inherit 1 mmap 1 comm 1 freq 1 enable_on_exec 1 task 1 sample_id_all 1 mmap2 1 comm_exec 1 ksymbol 1 bpf_event 1 ------------------------------------------------------------ sys_perf_event_open: pid 3569 cpu 0 group_fd -1 flags 0x8 = 14 sys_perf_event_open: pid 3569 cpu 1 group_fd -1 flags 0x8 = 15 sys_perf_event_open: pid 3569 cpu 2 group_fd -1 flags 0x8 = 16 sys_perf_event_open: pid 3569 cpu 3 group_fd -1 flags 0x8 = 17 sys_perf_event_open: pid 3569 cpu 4 group_fd -1 flags 0x8 = 18 sys_perf_event_open: pid 3569 cpu 5 group_fd -1 flags 0x8 = 19 sys_perf_event_open: pid 3569 cpu 6 group_fd -1 flags 0x8 = 20 sys_perf_event_open: pid 3569 cpu 7 group_fd -1 flags 0x8 = 21 Signed-off-by: Yang Jihong --- tools/perf/builtin-record.c | 46 ++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 69e0d8c75aab..1e21f64e4cfa 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -915,15 +915,31 @@ static int record__config_tracking_events(struct record *rec) struct record_opts *opts = &rec->opts; /* - * User space tasks can migrate between CPUs, so when tracing - * selected CPUs, sideband for all CPUs is still needed. + * For initial_delay, system wide or a hybrid system, we need to add a + * dummy event so that we can track PERF_RECORD_MMAP to cover the delay + * of waiting or event synthesis. */ - if (opts->target.cpu_list) { + if (opts->target.initial_delay || target__has_cpu(&opts->target) || + perf_pmus__num_core_pmus() > 1) { evsel = evlist__findnew_tracking_event(evlist); if (!evsel) return -ENOMEM; - if (!evsel->core.system_wide) { + /* + * Enable the dummy event when the process is forked for + * initial_delay, immediately for system wide. + */ + if (opts->target.initial_delay && !evsel->immediate && + !target__has_cpu(&opts->target)) + evsel->core.attr.enable_on_exec = 1; + else + evsel->immediate = 1; + + /* + * User space tasks can migrate between CPUs, so when tracing + * selected CPUs, sideband for all CPUs is still needed. + */ + if (opts->target.cpu_list && !evsel->core.system_wide) { evsel->core.system_wide = true; evsel__set_sample_bit(evsel, TIME); perf_evlist__propagate_maps(&evlist->core, &evsel->core); @@ -1313,28 +1329,6 @@ static int record__open(struct record *rec) struct record_opts *opts = &rec->opts; int rc = 0; - /* - * For initial_delay, system wide or a hybrid system, we need to add a - * dummy event so that we can track PERF_RECORD_MMAP to cover the delay - * of waiting or event synthesis. - */ - if (opts->target.initial_delay || target__has_cpu(&opts->target) || - perf_pmus__num_core_pmus() > 1) { - pos = evlist__findnew_tracking_event(evlist); - if (!pos) - return -ENOMEM; - - /* - * Enable the dummy event when the process is forked for - * initial_delay, immediately for system wide. - */ - if (opts->target.initial_delay && !pos->immediate && - !target__has_cpu(&opts->target)) - pos->core.attr.enable_on_exec = 1; - else - pos->immediate = 1; - } - evlist__config(evlist, opts, &callchain_param); evlist__for_each_entry(evlist, pos) {