From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7DD9C433E0 for ; Wed, 29 Jul 2020 18:58:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAD0720809 for ; Wed, 29 Jul 2020 18:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596049092; bh=Ly9QFQV2PQXXgMS/azzOUT/yG2ADq6EwyCow2scRvBg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=it7XdiG4f1ejBvt5F4/q2pGlikSFOdS9okpRO4boUhzgjhmifrBMKslY+7YUIui8q bhAreULwScR+YJgeUALX8vUD5ie/Byb4e8+e7WCo9708L6RxS8mRLpeVH6OoiL75he 8bW8f5n3K/YkVdXTBRYnmuQu0HipkdlU7cdqVrak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727055AbgG2S6K (ORCPT ); Wed, 29 Jul 2020 14:58:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:51366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgG2S6K (ORCPT ); Wed, 29 Jul 2020 14:58:10 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D0D402075D; Wed, 29 Jul 2020 18:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596049090; bh=Ly9QFQV2PQXXgMS/azzOUT/yG2ADq6EwyCow2scRvBg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=2U/DqMj/VatFQrcdaquXiqVEVRllaRSKTZIpjooW3Umxtp7mqsk+A9HGFXYpdErtk XWL+HYrRDXtnSfCE+TnbrPfmai0E2jTledFm0efWbJvQYyhAaOY5AJrvppJRJuScwL 9WH4VuoPf+9T2emZgSDaGqb4gCP3r2eo1cXwboas= Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 049CB40E69; Wed, 29 Jul 2020 15:58:08 -0300 (-03) Date: Wed, 29 Jul 2020 15:58:07 -0300 From: Arnaldo Carvalho de Melo To: Adrian Hunter , Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , Andi Kleen , Athira Rajeev , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Stephane Eranian Subject: Re: [PATCH v2 4/5] perf record: Don't clear event's period if set by a term Message-ID: <20200729185807.GD433799@kernel.org> References: <20200728085734.609930-1-irogers@google.com> <20200728085734.609930-5-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200728085734.609930-5-irogers@google.com> X-Url: http://acmel.wordpress.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Em Tue, Jul 28, 2020 at 01:57:33AM -0700, Ian Rogers escreveu: > If events in a group explicitly set a frequency or period with leader > sampling, don't disable the samples on those events. > > Prior to 5.8: > perf record -e '{cycles/period=12345000/,instructions/period=6789000/}:S' > would clear the attributes then apply the config terms. In commit > 5f34278867b7 leader sampling configuration was moved to after applying the > config terms, in the example, making the instructions' event have its period > cleared. > This change makes it so that sampling is only disabled if configuration > terms aren't present. Adrian, can you take a look at this one? - Arnaldo > Fixes: 5f34278867b7 ("perf evlist: Move leader-sampling configuration") > Signed-off-by: Ian Rogers > --- > tools/perf/util/record.c | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c > index a4cc11592f6b..01d1c6c613f7 100644 > --- a/tools/perf/util/record.c > +++ b/tools/perf/util/record.c > @@ -2,6 +2,7 @@ > #include "debug.h" > #include "evlist.h" > #include "evsel.h" > +#include "evsel_config.h" > #include "parse-events.h" > #include > #include > @@ -38,6 +39,9 @@ static void evsel__config_leader_sampling(struct evsel *evsel, struct evlist *ev > struct perf_event_attr *attr = &evsel->core.attr; > struct evsel *leader = evsel->leader; > struct evsel *read_sampler; > + struct evsel_config_term *term; > + struct list_head *config_terms = &evsel->config_terms; > + int term_types, freq_mask; > > if (!leader->sample_read) > return; > @@ -47,16 +51,24 @@ static void evsel__config_leader_sampling(struct evsel *evsel, struct evlist *ev > if (evsel == read_sampler) > return; > > + /* Determine the evsel's config term types. */ > + term_types = 0; > + list_for_each_entry(term, config_terms, list) { > + term_types |= 1 << term->type; > + } > /* > - * Disable sampling for all group members other than the leader in > - * case the leader 'leads' the sampling, except when the leader is an > - * AUX area event, in which case the 2nd event in the group is the one > - * that 'leads' the sampling. > + * Disable sampling for all group members except those with explicit > + * config terms or the leader. In the case of an AUX area event, the 2nd > + * event in the group is the one that 'leads' the sampling. > */ > - attr->freq = 0; > - attr->sample_freq = 0; > - attr->sample_period = 0; > - attr->write_backward = 0; > + freq_mask = (1 << EVSEL__CONFIG_TERM_FREQ) | (1 << EVSEL__CONFIG_TERM_PERIOD); > + if ((term_types & freq_mask) == 0) { > + attr->freq = 0; > + attr->sample_freq = 0; > + attr->sample_period = 0; > + } > + if ((term_types & (1 << EVSEL__CONFIG_TERM_OVERWRITE)) == 0) > + attr->write_backward = 0; > > /* > * We don't get a sample for slave events, we make them when delivering > -- > 2.28.0.163.g6104cc2f0b6-goog > -- - Arnaldo