From nobody Mon Feb 9 06:24:54 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36B2D222572 for ; Mon, 7 Apr 2025 05:01:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744002079; cv=none; b=djhwq3ITrCJE/hFTdMOPFFD7JrcI5ZGQfvv7Hb00nJttsjObaLKBRkMXuZFPwHyOh20FwUk9XKw6bHfMHzQdIwDYUVKizZQORMdzhKnw/PJ1bPUcBeEOGwc8LC4sNSu6CE/+bZpljVgeQ7326rozXogwGAywRh0Rtm7x9yLD3AM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744002079; c=relaxed/simple; bh=JVanJEDpcMknG2x/X1wULUkE8JUqUZb8O7VIacDzqk4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=HHp4VWp1BGIJQ5nIQEBqDOIQzb+o1tL4qqOtrg+OjvnNydZGX2jqrhEl8U/HGGmXoCeefvYYJm+D8VMBvGWNcaqzrZiR5x1u3q+vBO1PCv6FGgBwRB/AbN7fDwgSWT8OEr0e6U9fkYraRebsr9+38wdOwlXQUansMXbyJDeYkY0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Jg8hfxpN; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Jg8hfxpN" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff8340d547so3624792a91.2 for ; Sun, 06 Apr 2025 22:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744002076; x=1744606876; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=EpNqTL2jhuFhMzQj4yTZFm6mW4YS6L/CEY0JlzRGbe8=; b=Jg8hfxpNE4CLi29SwpOwcqjlLKR8J/0dgPLAPdhnnRzB+WY1l/RJhZ2Al9V8Tof5C2 Y42VfVVf3T0Jqv60mi2mgF8gIcDEPCSWsxd0lJx0pLfI1/pHT969synJO7noAtHti7Ra O8tsCPp5CXK0g/jToCi5jgt9GVU/ElxNWUUx5T+nC7CWdRrrGVKSX8OetBdSZIQVrA3C FWwnuJYM7VmNBGcFQdCoG6XJG28/w1dEVdL6CYCRDNX55MuPo75DrpvNaBH8OJCpAo3L QLXPKtDRUWMzuihylTT1FiHXrl1bfCos5DKstxbfWZVfTDPK0KWBOuWS0F0NvwLTIg1I 0RLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744002076; x=1744606876; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EpNqTL2jhuFhMzQj4yTZFm6mW4YS6L/CEY0JlzRGbe8=; b=wVQbxGndgSY5Q1cgcqQFvvPfq5B2K4IlhhYz5+6aYEV0uUs+6jvSVPiRX6GP7rJdff uATbF+h8KLXfEBx4SrcZZGjoLzPNMGZUIAF9jBK/oS3txlri2nRMLrKEOApE0kUw3N7q n6vUUtTROJApsbK8ln0IyRjtfGj8hTzb/eqReNB/sHCzca4fDD09mDSwLIceqHGg31u0 FC6kRUH7+4pY95fSYCoeiRSfLWhC1Uskg4/0D3+vTrtKc6CC4gkrAyrP/dVUsR0dqkbV XORoH8PoX7Yc7uYYFgSNSVMbqVGWi43rX/xHCdGNJ0yGKtRfS97+HsFqSEeyEB6OVxfp jMdw== X-Forwarded-Encrypted: i=1; AJvYcCUBjRFUx0CPbWbvPPmCNnQBhJ8Vr15Bkl2BfohmeEQhuTATTvbIz4OcEHqCus7qhjlk/5pKKPMjMtXX1+M=@vger.kernel.org X-Gm-Message-State: AOJu0YwisllAIm9oCvVbOqhJ3mkaIWUA7TppSOLAEsNLbvgactcW9EYo xBetYv784eCGESC6FmoQymgKT97p4i7zzBg1GP3ND1Io4DzuVZqmoaVM/+7yPpibDqeGe15GT+o BTuRvYw== X-Google-Smtp-Source: AGHT+IFVyCvW/Feca4p+3QkEEYUKy/g8V1QEEW2jH9+cPAXYC8KCcIe55abMoTfG5uAAP7CNk9mofbT8RVSJ X-Received: from pjn3.prod.google.com ([2002:a17:90b:5703:b0:301:1bf5:2f07]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:6d0:b0:2ee:e518:c1d8 with SMTP id 98e67ed59e1d1-306a491f86amr16428164a91.30.1744002076510; Sun, 06 Apr 2025 22:01:16 -0700 (PDT) Date: Sun, 6 Apr 2025 22:00:49 -0700 In-Reply-To: <20250407050101.1389825-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250407050101.1389825-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250407050101.1389825-5-irogers@google.com> Subject: [PATCH v2 04/16] perf intel-tpebs: Separate evsel__tpebs_prepare out of evsel__tpebs_open From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Weilin Wang , James Clark , Xu Yang , John Garry , Howard Chu , Levi Yun , Dominique Martinet , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Separate the creation of the tpebs_retire_lat result out of the opening step. This is in preparation for adding a prepare operation for evlists. Signed-off-by: Ian Rogers --- tools/perf/util/intel-tpebs.c | 133 ++++++++++++++++++++++------------ 1 file changed, 86 insertions(+), 47 deletions(-) diff --git a/tools/perf/util/intel-tpebs.c b/tools/perf/util/intel-tpebs.c index 566e0ddcad88..2186818b2c9b 100644 --- a/tools/perf/util/intel-tpebs.c +++ b/tools/perf/util/intel-tpebs.c @@ -37,7 +37,7 @@ static struct child_process tpebs_cmd; struct tpebs_retire_lat { struct list_head nd; /* Event name */ - const char *name; + char *name; /* Event name with the TPEBS modifier R */ const char *tpebs_name; /* Count of retire_latency values found in sample data */ @@ -190,6 +190,82 @@ static int tpebs_stop(void) return ret; } =20 +static char *evsel__tpebs_name(struct evsel *evsel) +{ + char *name, *modifier; + + name =3D strdup(evsel->name); + if (!name) + return NULL; + + modifier =3D strrchr(name, 'R'); + if (!modifier) { + pr_err("Tpebs event missing modifier '%s'\n", name); + free(name); + return NULL; + } + + *modifier =3D 'p'; + return name; +} + +static struct tpebs_retire_lat *tpebs_retire_lat__new(struct evsel *evsel) +{ + struct tpebs_retire_lat *result =3D zalloc(sizeof(*result)); + + if (!result) + return NULL; + + result->tpebs_name =3D evsel->name; + result->name =3D evsel__tpebs_name(evsel); + if (!result->name) { + free(result); + return NULL; + } + list_add_tail(&result->nd, &tpebs_results); + tpebs_event_size++; + return result; +} + +/** + * evsel__tpebs_prepare - create tpebs data structures ready for opening. + * @evsel: retire_latency evsel, all evsels on its list will be prepared. + */ +static int evsel__tpebs_prepare(struct evsel *evsel) +{ + struct evsel *pos; + struct tpebs_retire_lat *tpebs_event; + + list_for_each_entry(tpebs_event, &tpebs_results, nd) { + if (!strcmp(tpebs_event->tpebs_name, evsel->name)) { + /* + * evsel, or an identically named one, was already + * prepared. + */ + return 0; + } + } + tpebs_event =3D tpebs_retire_lat__new(evsel); + if (!tpebs_event) + return -ENOMEM; + + /* + * Eagerly prepare all other evsels on the list to try to ensure that by + * open they are all known. + */ + evlist__for_each_entry(evsel->evlist, pos) { + int ret; + + if (pos =3D=3D evsel || !pos->retire_lat) + continue; + + ret =3D evsel__tpebs_prepare(pos); + if (ret) + return ret; + } + return 0; +} + /** * evsel__tpebs_open - starts tpebs execution. * @evsel: retire_latency evsel, all evsels on its list will be selected. = Each @@ -197,10 +273,7 @@ static int tpebs_stop(void) */ int evsel__tpebs_open(struct evsel *evsel) { - int ret =3D 0; - struct evsel *pos; - struct evlist *evsel_list =3D evsel->evlist; - char cpumap_buf[50]; + int ret; =20 /* * We should only run tpebs_start when tpebs_recording is enabled. @@ -209,49 +282,13 @@ int evsel__tpebs_open(struct evsel *evsel) if (tpebs_cmd.pid !=3D 0 || !tpebs_recording) return 0; =20 - cpu_map__snprint(evsel_list->core.user_requested_cpus, cpumap_buf, sizeof= (cpumap_buf)); - /* - * Prepare perf record for sampling event retire_latency before fork and - * prepare workload - */ - evlist__for_each_entry(evsel_list, pos) { - int i; - char *name; - struct tpebs_retire_lat *new; - - if (!pos->retire_lat) - continue; - - pr_debug("tpebs: Retire_latency of event %s is required\n", pos->name); - for (i =3D strlen(pos->name) - 1; i > 0; i--) { - if (pos->name[i] =3D=3D 'R') - break; - } - if (i <=3D 0 || pos->name[i] !=3D 'R') { - ret =3D -1; - goto err; - } - - name =3D strdup(pos->name); - if (!name) { - ret =3D -ENOMEM; - goto err; - } - name[i] =3D 'p'; - - new =3D zalloc(sizeof(*new)); - if (!new) { - ret =3D -1; - zfree(&name); - goto err; - } - new->name =3D name; - new->tpebs_name =3D pos->name; - list_add_tail(&new->nd, &tpebs_results); - tpebs_event_size +=3D 1; - } + ret =3D evsel__tpebs_prepare(evsel); + if (ret) + return ret; =20 if (tpebs_event_size > 0) { + struct evlist *evsel_list =3D evsel->evlist; + char cpumap_buf[50]; struct pollfd pollfd =3D { .events =3D POLLIN, }; int control_fd[2], ack_fd[2], len; char ack_buf[8]; @@ -268,6 +305,9 @@ int evsel__tpebs_open(struct evsel *evsel) goto out; } =20 + cpu_map__snprint(evsel_list->core.user_requested_cpus, cpumap_buf, + sizeof(cpumap_buf)); + ret =3D start_perf_record(control_fd, ack_fd, cpumap_buf); if (ret) goto out; @@ -321,7 +361,6 @@ int evsel__tpebs_open(struct evsel *evsel) close(ack_fd[0]); close(ack_fd[1]); } -err: if (ret) tpebs_delete(); return ret; --=20 2.49.0.504.g3bcea36a83-goog