From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.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 646E21D416C for ; Mon, 15 Jun 2026 00:28:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781483308; cv=none; b=lyTcbO4/mvu7+uH0NTOfr6KmHoOPVooZS9d3Ilu7jOZfCCQS1X7Bq/OdZnQHgGONBoCjB7j4r714IqLqBU4kGvPygHBFjbBYB3+U//NhUmH0STTL6+RhMPxV+Kk7tiJuw+hOU44O+Q/gxqgIbn8gIP9uUZS1DOrK61qufZemNaM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781483308; c=relaxed/simple; bh=46UPsdVhKLSGOesq+b4o9rur5WYGR9zwjyMivGxYXrA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PaDP/qG5dTQIEYSCcNuUPCi4EWqnIEkH0PVTRKNMCbeKSYRFaiQ8VaNBHy3CgbyvRen/QbEwxNBoUtNYqk2rqMUfqZKugJ8M9A3VhC2tMTDot69CKr40/lj9AVPNRZRIpvq8CpINjnkt+xUBieEBgTGEKI9hkcSFiSY0s9uerYw= 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=hxa2WHa+; arc=none smtp.client-ip=74.125.82.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="hxa2WHa+" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1361d52b3a0so3093603c88.0 for ; Sun, 14 Jun 2026 17:28:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781483306; x=1782088106; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vT2Mha6cP/S+RPKLMMcfihXr8wIiT308bjbyJ4T0oAQ=; b=hxa2WHa+6B4XBMZll2lWVNlDSRreH+Fch5aaytp72wPIdu83CmbUAFqbp2wTwKeWA5 Mm6akxXubJzxesA7JwUVsjWo23Tp8NOdiDFtc3GaVjNYEB43KJryieyRpLKLwGzIc8vJ PUBOfAxLVXy1icTbR8SCiEhryL1DvIZf/wIrx/z8lsJwXjEcM0qCltDNshQKTaGLF584 9QPsZa0CzKPELc8nOY8NvJQSK6jESqtTW6u0WhUbO+bL6N389TMgglBhDF/QeX7L+cP+ QUcTCw/iSZIIadZzbL1xJr+UjXL6OgWhpEvhthnGSKoMwwYP2inr+nJob7W4EISvGE53 Jtzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781483306; x=1782088106; h=cc: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=vT2Mha6cP/S+RPKLMMcfihXr8wIiT308bjbyJ4T0oAQ=; b=B74BvnsOFRVOjMvzoZVym0G97VIFImntJt4+tKFXhU+ueLuZDje6rnR+sNXQjgNd6j 4z4aX3ZZiwNWWul8mj7vRuWSH8TxLB2SOQaKS3wRYdoybBc6RXJtg5k7Rd4FJQUsXxMs VG/QQg1YkzooNCBsMJecRb3P5J86KNHo2hyEg8FmkqFaKcBppQMIyDtihZSO2gBN2nmW kF9G0hue2I9A/2g6o5BTn8fmti6Xy62ynKAwfkVzf6rnMyXUcOpD/XhaWjIbrW4h2Fjg AQafrBrCaC15gjBz9iR2gE0GMDtW7BqWkAl5HCQoPqX7rMDMZ/uV4g5UrLIgS+2zGehj FbVQ== X-Forwarded-Encrypted: i=1; AFNElJ8C/eEMm81cT0p/gFMd2PpG8sUcANg3LDN/wrRz9MtPVQc1XfcWk9kXF5PGDMtwqeoV1M8Na7SGKqR77ok=@vger.kernel.org X-Gm-Message-State: AOJu0YwLZsyW0x1MWdOJBhAj0/ClB9vbHVvHwLZWOYa1xgiUhnMhYqQE dGKgP5O50hUw8P5LMQhUoCmPVEPTyraKz9EvLXC6DT055UPiA5o5wKWSOd8H8vCPoTxJwY0WF8q e7eXsE72jRg== X-Received: from dlak21.prod.google.com ([2002:a05:701b:2915:b0:138:1ff:e092]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:688a:b0:138:407c:1d1a with SMTP id a92af1059eb24-13879024fa2mr3141604c88.38.1781483306182; Sun, 14 Jun 2026 17:28:26 -0700 (PDT) Date: Sun, 14 Jun 2026 17:27:56 -0700 In-Reply-To: <20260615002812.2234795-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: <20260613071100.1508192-1-irogers@google.com> <20260615002812.2234795-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260615002812.2234795-5-irogers@google.com> Subject: [PATCH v18 04/20] perf data: Add open flag From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, tmricht@linux.ibm.com Content-Type: text/plain; charset="UTF-8" Avoid double opens and ensure only open files are closed. This addresses some issues with python integration where the data file wants to be opened before being given to a session. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers Acked-by: Namhyung Kim --- Changes in v2: 1. Fixed File Rotation: In perf_data__switch() , I added data->open = false; after the file is closed. This ensures that the subsequent perf_data__open() call will not exit early and will successfully open the new file. 2. Fixed Memory Leak: In open_dir() , I added a call to zfree(&data->file.path) if mkdir() fails, preventing the leak of the path string. --- tools/perf/util/data.c | 27 ++++++++++++++++++++++----- tools/perf/util/data.h | 4 +++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index 94dc534a7386..33fd1b82019e 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -345,9 +345,10 @@ static int open_dir(struct perf_data *data) if (asprintf(&data->file.path, "%s/data", data->path) < 0) return -1; - if (perf_data__is_write(data) && - mkdir(data->path, S_IRWXU) < 0) + if (perf_data__is_write(data) && mkdir(data->path, 0700) < 0) { + zfree(&data->file.path); return -1; + } ret = open_file(data); @@ -360,9 +361,16 @@ static int open_dir(struct perf_data *data) int perf_data__open(struct perf_data *data) { - if (check_pipe(data)) + int ret; + + if (data->open) return 0; + if (check_pipe(data)) { + data->open = true; + return 0; + } + /* currently it allows stdio for pipe only */ data->file.use_stdio = false; @@ -375,16 +383,24 @@ int perf_data__open(struct perf_data *data) if (perf_data__is_read(data)) data->is_dir = is_dir(data); - return perf_data__is_dir(data) ? - open_dir(data) : open_file_dup(data); + ret = perf_data__is_dir(data) ? open_dir(data) : open_file_dup(data); + + if (!ret) + data->open = true; + + return ret; } void perf_data__close(struct perf_data *data) { + if (!data->open) + return; + if (perf_data__is_dir(data)) perf_data__close_dir(data); perf_data_file__close(&data->file); + data->open = false; } static ssize_t perf_data_file__read(struct perf_data_file *file, void *buf, size_t size) @@ -457,6 +473,7 @@ int perf_data__switch(struct perf_data *data, if (!at_exit) { perf_data_file__close(&data->file); + data->open = false; ret = perf_data__open(data); if (ret < 0) goto out; diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h index 8299fb5fa7da..76f57f60361f 100644 --- a/tools/perf/util/data.h +++ b/tools/perf/util/data.h @@ -50,6 +50,8 @@ struct perf_data { const char *path; /** @file: Underlying file to be used. */ struct perf_data_file file; + /** @open: Has the file or directory been opened. */ + bool open; /** @is_pipe: Underlying file is a pipe. */ bool is_pipe; /** @is_dir: Underlying file is a directory. */ @@ -59,7 +61,7 @@ struct perf_data { /** @in_place_update: A file opened for reading but will be written to. */ bool in_place_update; /** @mode: Read or write mode. */ - enum perf_data_mode mode; + enum perf_data_mode mode:8; struct { /** @version: perf_dir_version. */ -- 2.54.0.1136.gdb2ca164c4-goog