From nobody Mon Feb 9 00:55:16 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 5F67E1DEFE9 for ; Wed, 9 Apr 2025 06:07:58 +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=1744178879; cv=none; b=OfUfA+D1sfbacLY6U1hmy/7ktaHRBdzMn/sXm+YWJNpObwLEZ/0AO4PsqcERHO9bFr7QlbiMJiUx87Hl0b3AGVtKGgkzoyddUKcqpuTjQZcChHmA0GmhlGL130xUZ0ngelxPh+gqmghMiGV+krJTk8GfqjhbNCi8oE4IvSC4cOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744178879; c=relaxed/simple; bh=ifUhHpvB3YWjewd+FCiG+bnPL8N1hMQyEOj1ALhK2zo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=RK+R5ER03eaoxqd6ZMG909v3jUqQrZJcjYok+UU0EruFAISY2xVn2B89n+vNWmNouZdGYD+T7wJltmy90NzAnm72+ElhRxrFJk7Ro4FW+xwUeJOuxFsS5dhDfiGu74br4Tk+HxhagCpVs8fhD+qxXmYPqDvXvPAuDwsulQARAsM= 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=jnpBvdTs; 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="jnpBvdTs" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3032f4eca83so5922246a91.3 for ; Tue, 08 Apr 2025 23:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744178878; x=1744783678; 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=Kljzr7zwrGyBJiGR5feDDMzqEBYffKkoUZPkiCSQTN4=; b=jnpBvdTsNIkL9Y+INoYplvMowWOqukQIGXsF1qLQEksf4Phcl4Tb+KzvfF368jRfUP 5gus+X+lDjRGdvbX15rii1GYSyzNgmwB9gxblVHgoJiKTC/XOYANj/MJYhvHcBG2MBiN 9CttAKavh8SQZHH9cg5OLIu5lurjEaIe/qMvmbgqdniPhXH+8T8A/vrZA8pgJSFkaMKJ 8IzL6MlBLI66WIj42xexxF2KU0+q076TO4PnWzc+44y5k/bI6tWqml0+2y3BChM35vuD 8B7rg2DNgKp17p1P+tbAqfPdKWLYpWMrOImNTtNnFbqKLTrUqUW/EiD2GToKJstInNKt Rxzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744178878; x=1744783678; 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=Kljzr7zwrGyBJiGR5feDDMzqEBYffKkoUZPkiCSQTN4=; b=l3uJP1N73A1OUcRwfHjkwhhLMXNgek78lO+tLp8zQQtZ2yKD2aWcfMW9ZQzMvnvZhj DrSt37S+SJLCZ3Cq5vOGmNLeSmdxDsAjQJ2nmFM0rGFtSruQqJKWO8XLRlmNTD98uMNx RI14oiY7wA6kpE7aRGrTHHJOjseXghI9D8szK3ke31nzJ1oiXrqLNN8ZdYL0kKbAFoDC UEl4JQaRz8e4jwyvyHk2wXaEhWWPO1y2TFhYWM+SX1MegVj7UL7RIkAyD+K1gWmx0cXV AGXX+31cACU35wng2CLwbKmK49r87gj4rhh51r8eFTyTlrVcGTxDKMh4SfnlMRxwQvhw R5oQ== X-Forwarded-Encrypted: i=1; AJvYcCWY4ilZapoNQydKaqh/Jk44A38ea7DI7H3Q1ryBhEqBg7a5oDTG7wCk6Aa90NFxjf+I3xcRGPjou4pr7/k=@vger.kernel.org X-Gm-Message-State: AOJu0YxXumtr8MiZAtfBhWlMMpQVNS5DTE+J+7/edJ1PwZldmIwuJHxR u4TA5rETe8WC2rbBrUXdq74S/Q7ul77RDwk9rHxdBPP1pLvdZoWG0rrs9auyUsSxtncVFawfM1h pq6ZUoA== X-Google-Smtp-Source: AGHT+IFRgIGGntOtaXj20y3ZRBzDmXfIbHlWcY+BS00WdlQCaqmWppoWl3xud8Dln8ejt7nVx+339ycDI40W X-Received: from pjbqo15.prod.google.com ([2002:a17:90b:3dcf:b0:2ea:aa56:49c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:264b:b0:2ee:aa28:79aa with SMTP id 98e67ed59e1d1-306dd32483bmr1678142a91.6.1744178877593; Tue, 08 Apr 2025 23:07:57 -0700 (PDT) Date: Tue, 8 Apr 2025 23:07:29 -0700 In-Reply-To: <20250409060744.698511-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: <20250409060744.698511-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250409060744.698511-3-irogers@google.com> Subject: [PATCH v4 02/16] perf intel-tpebs: Simplify tpebs_cmd 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" No need to dynamically allocate when there is 1. tpebs_pid duplicates tpebs_cmd.pid, so remove. Use 0 as the uninitialized value (PID =3D=3D 0 is reserved for the kernel) rather than -1. Signed-off-by: Ian Rogers --- tools/perf/util/intel-tpebs.c | 55 ++++++++++++----------------------- 1 file changed, 18 insertions(+), 37 deletions(-) diff --git a/tools/perf/util/intel-tpebs.c b/tools/perf/util/intel-tpebs.c index 3503da28a12f..74b43faab986 100644 --- a/tools/perf/util/intel-tpebs.c +++ b/tools/perf/util/intel-tpebs.c @@ -28,11 +28,10 @@ #define PERF_DATA "-" =20 bool tpebs_recording; -static pid_t tpebs_pid =3D -1; static size_t tpebs_event_size; static LIST_HEAD(tpebs_results); static pthread_t tpebs_reader_thread; -static struct child_process *tpebs_cmd; +static struct child_process tpebs_cmd; =20 struct tpebs_retire_lat { struct list_head nd; @@ -83,16 +82,6 @@ static int get_perf_record_args(const char **record_argv= , char buf[], return 0; } =20 -static int prepare_run_command(const char **argv) -{ - tpebs_cmd =3D zalloc(sizeof(struct child_process)); - if (!tpebs_cmd) - return -ENOMEM; - tpebs_cmd->argv =3D argv; - tpebs_cmd->out =3D -1; - return 0; -} - static int start_perf_record(int control_fd[], int ack_fd[], const char *cpumap_buf) { @@ -110,10 +99,10 @@ static int start_perf_record(int control_fd[], int ack= _fd[], if (ret) goto out; =20 - ret =3D prepare_run_command(record_argv); - if (ret) - goto out; - ret =3D start_command(tpebs_cmd); + assert(tpebs_cmd.pid =3D=3D 0); + tpebs_cmd.argv =3D record_argv; + tpebs_cmd.out =3D -1; + ret =3D start_command(&tpebs_cmd); out: free(record_argv); return ret; @@ -156,14 +145,13 @@ static int process_feature_event(struct perf_session = *session, return 0; } =20 -static void *__sample_reader(void *arg) +static void *__sample_reader(void *arg __maybe_unused) { - struct child_process *child =3D arg; struct perf_session *session; struct perf_data data =3D { .mode =3D PERF_DATA_MODE_READ, .path =3D PERF_DATA, - .file.fd =3D child->out, + .file.fd =3D tpebs_cmd.out, }; struct perf_tool tool; =20 @@ -189,12 +177,12 @@ static int tpebs_stop(void) int ret =3D 0; =20 /* Like tpebs_start, we should only run tpebs_end once. */ - if (tpebs_pid !=3D -1) { - kill(tpebs_cmd->pid, SIGTERM); - tpebs_pid =3D -1; + if (tpebs_cmd.pid !=3D 0) { + kill(tpebs_cmd.pid, SIGTERM); pthread_join(tpebs_reader_thread, NULL); - close(tpebs_cmd->out); - ret =3D finish_command(tpebs_cmd); + close(tpebs_cmd.out); + ret =3D finish_command(&tpebs_cmd); + tpebs_cmd.pid =3D 0; if (ret =3D=3D -ERR_RUN_COMMAND_WAITPID_SIGNAL) ret =3D 0; } @@ -219,7 +207,7 @@ int tpebs_start(struct evlist *evsel_list) * We should only run tpebs_start when tpebs_recording is enabled. * And we should only run it once with all the required events. */ - if (tpebs_pid !=3D -1 || !tpebs_recording) + 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)); @@ -284,10 +272,11 @@ int tpebs_start(struct evlist *evsel_list) ret =3D start_perf_record(control_fd, ack_fd, cpumap_buf); if (ret) goto out; - tpebs_pid =3D tpebs_cmd->pid; - if (pthread_create(&tpebs_reader_thread, NULL, __sample_reader, tpebs_cm= d)) { - kill(tpebs_cmd->pid, SIGTERM); - close(tpebs_cmd->out); + + if (pthread_create(&tpebs_reader_thread, /*attr=3D*/NULL, __sample_reade= r, + /*arg=3D*/NULL)) { + kill(tpebs_cmd.pid, SIGTERM); + close(tpebs_cmd.out); pr_err("Could not create thread to process sample data.\n"); ret =3D -1; goto out; @@ -416,18 +405,10 @@ void tpebs_delete(void) { struct tpebs_retire_lat *r, *rtmp; =20 - if (tpebs_pid =3D=3D -1) - return; - tpebs_stop(); =20 list_for_each_entry_safe(r, rtmp, &tpebs_results, nd) { list_del_init(&r->nd); tpebs_retire_lat__delete(r); } - - if (tpebs_cmd) { - free(tpebs_cmd); - tpebs_cmd =3D NULL; - } } --=20 2.49.0.504.g3bcea36a83-goog