From patchwork Sat Jul 15 03:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 120741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp4204vqt; Fri, 14 Jul 2023 20:57:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlEhIknNdICEAs2/c5m/nukz9KvFIlFpG+lQKIfnai70t/c1jz/JoHb2S8TOL3m0p+7EgnEx X-Received: by 2002:a50:eb0b:0:b0:51e:65b:bc3b with SMTP id y11-20020a50eb0b000000b0051e065bbc3bmr5838535edp.15.1689393446814; Fri, 14 Jul 2023 20:57:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689393446; cv=none; d=google.com; s=arc-20160816; b=LCD3QcZiUG4uchkBJ8t47iUddt3Uc6RR2+rq12S1jrkM8reqCOyAAn1uhlZE0BMfnS 3H5qJ7z9U4SczA51pQ48s46AmjTQLQCCFkW9vx7KgQwY+Ig5n0ODWlL/3Xye0a4zqpxj 2bSA4ouHcsCoK109r8hK68gBAARbE0+6aelpagzfqea2rTS5P+jWeWVDvDBBYF5ABn15 WQLgq8heuPM1GpJuwuGwz4zof103hWPkz4sCAwZDaesKVUKKMxTjdPIsq0XaS6/okg1E J5uFUgQWvCJ41MC1ILg4ExIGW/iLUB4TbTnxLwQYbjc6saEalPobsDqINUiMKMEQVF3f F8KA== 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=xkfZCqhxVXYuQrKuecFhg1RgpxKjIEu3Yf9cDP57xVg=; fh=Ib1wi7jRbo+eNDLEErvWCJx+cnUm87PkGFthhdFf08Y=; b=IOldm7/tMo3jpThPl9T3OUX9C1wEfS6hm0ec9C72U2iF3oQERAvAsvU7YUySVabvoJ 2mAMznoI0rg52eqUoz+PFZv3k+etdsMwAjtHs4szbpFos30xlAgEtsd1zehs5KOp3elF ZxAiEtVMch43/nQhE0e+HFpBtMT9CuCNA+VjjlKJAMv36pqHMosVdrxtUt80f2u4KiD0 D/LNn+DkwLDCNgaz6ryZzDPabKOV/I+G+OA4hDpwRr+3h4vdgKLcwTstLKyeDebrMvGH SEqLj+G/mnBZ8PuCf5kPSQutFm/6LjRmgFvYKjoUXTTunYfrYUDQWNfgeXcyb/iK1YLE xeaA== 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 w6-20020a50fa86000000b0051def1478e6si9502079edr.586.2023.07.14.20.57.03; Fri, 14 Jul 2023 20:57:26 -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 S230145AbjGODbz (ORCPT + 99 others); Fri, 14 Jul 2023 23:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229981AbjGODbh (ORCPT ); Fri, 14 Jul 2023 23:31:37 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65F923A96; Fri, 14 Jul 2023 20:31:35 -0700 (PDT) Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R2v262NSQztRTY; Sat, 15 Jul 2023 11:28:30 +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; Sat, 15 Jul 2023 11:31:31 +0800 From: Yang Jihong To: , , , , , , , , , , , , , , , CC: Subject: [PATCH v2 3/7] perf record: Move setting dummy tracking before record__init_thread_masks() Date: Sat, 15 Jul 2023 03:29:11 +0000 Message-ID: <20230715032915.97146-4-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT In-Reply-To: <20230715032915.97146-1-yangjihong1@huawei.com> References: <20230715032915.97146-1-yangjihong1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.95] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: INBOX X-GMAIL-THRID: 1771457422459819861 X-GMAIL-MSGID: 1771457422459819861 When dummy tracking go system wide, the mmap cpu mask is changed. Therefore, needs to be placed before record__init_thread_masks(). Dummy tracking has been set in record__open(), move it before record__init_thread_masks() and add a helper for unified processing. 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|PERIOD|IDENTIFIER read_format ID|LOST disabled 1 inherit 1 freq 1 sample_id_all 1 exclude_guest 1 ------------------------------------------------------------ sys_perf_event_open: pid 6867 cpu 0 group_fd -1 flags 0x8 = 5 sys_perf_event_open: pid 6867 cpu 1 group_fd -1 flags 0x8 = 6 sys_perf_event_open: pid 6867 cpu 2 group_fd -1 flags 0x8 = 7 sys_perf_event_open: pid 6867 cpu 3 group_fd -1 flags 0x8 = 9 sys_perf_event_open: pid 6867 cpu 4 group_fd -1 flags 0x8 = 10 sys_perf_event_open: pid 6867 cpu 5 group_fd -1 flags 0x8 = 11 sys_perf_event_open: pid 6867 cpu 6 group_fd -1 flags 0x8 = 12 sys_perf_event_open: pid 6867 cpu 7 group_fd -1 flags 0x8 = 13 Opening: dummy:u ------------------------------------------------------------ perf_event_attr: type 1 size 136 config 0x9 { sample_period, sample_freq } 1 sample_type IP|TID|TIME|IDENTIFIER read_format ID|LOST disabled 1 inherit 1 exclude_kernel 1 exclude_hv 1 mmap 1 comm 1 enable_on_exec 1 task 1 sample_id_all 1 exclude_guest 1 mmap2 1 comm_exec 1 ksymbol 1 bpf_event 1 ------------------------------------------------------------ sys_perf_event_open: pid 6867 cpu 0 group_fd -1 flags 0x8 = 14 sys_perf_event_open: pid 6867 cpu 1 group_fd -1 flags 0x8 = 15 sys_perf_event_open: pid 6867 cpu 2 group_fd -1 flags 0x8 = 16 sys_perf_event_open: pid 6867 cpu 3 group_fd -1 flags 0x8 = 17 sys_perf_event_open: pid 6867 cpu 4 group_fd -1 flags 0x8 = 18 sys_perf_event_open: pid 6867 cpu 5 group_fd -1 flags 0x8 = 19 sys_perf_event_open: pid 6867 cpu 6 group_fd -1 flags 0x8 = 20 sys_perf_event_open: pid 6867 cpu 7 group_fd -1 flags 0x8 = 21 Signed-off-by: Yang Jihong --- tools/perf/builtin-record.c | 59 +++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index ca83599cc50c..ccbcb005e188 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -908,6 +908,37 @@ 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; + + /* + * 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) { + evsel = evlist__findnew_tracking_event(evlist, false); + if (!evsel) + return -ENOMEM; + + /* + * 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; + } + + return 0; +} + static bool record__kcore_readable(struct machine *machine) { char kcore[PATH_MAX]; @@ -1288,28 +1319,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, false); - 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) { @@ -4235,6 +4244,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");