From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 349A3413256 for ; Mon, 15 Jun 2026 16:50:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781542225; cv=none; b=PM8SfWX3mWhOacLCeaywv0vdUF1/eJpDr3DuSlUC3bJ9+2nLsR+LdZUwcxfkz6MWPdiB5vA4FBL/k4pvt98WAzS9w9ev0Bw5L9KpXEEVEHJHO25JanHnYF4nU0a6j2LG59jW4a0kUMpZlaIq35OK1ewLOCM1AC7CFAzoG2qwsAs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781542225; c=relaxed/simple; bh=46UPsdVhKLSGOesq+b4o9rur5WYGR9zwjyMivGxYXrA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QcOQ4bPI2QYi8zp8FgO/dI7xYcGgmfR6ilkRb4gts9VIDvK3rrHOqD6S8h31yhtzRWt8YX8sbBFohl3U/kJsEPwoMGrjRbN6Fe9MymQAOEYEiiK9tpVEak7YAE0HVmhI055HqpGIw3l9YomHwNFu4zYhjkbq36g20FbPfZf/B4o= 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=cDqvz+iK; arc=none smtp.client-ip=74.125.82.202 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="cDqvz+iK" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-304f23c55b2so4505147eec.0 for ; Mon, 15 Jun 2026 09:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781542223; x=1782147023; 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=cDqvz+iKK7haF6NbQCFU8bovsHLBWeCh+KYetzFRetQ4Ejn6V+n76KS/x6GH62Z92i uP0ky6GTHQXCypcGwKvt+M/Os/8HBcS4WRmCAFjNdfNiII7naalrTgK00ApMBqa1agOC KBXbQLIamEnE7JrtiK5gzhYnNFzqYnhs2FYtH8T9URFNxyrf5Z7eDyUDF2ENkMBTCBy/ qyn7XBdjumkI+YVl6MHr2q6Tctwc3arknQHlawnbOlRi7/Gvb25W7fhwsVyRrWSERnxJ OPq6+DNRve2cQTZX+sySUIzmxcz0f1Fh5xR7RaQ0i2QrOra52mEJ7/Ir8VnlDSXfIxwf asLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781542223; x=1782147023; 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=DQRb4hMzg8+lNT7Rhx1lEXkaeJqxvfdHvetO772JIAld69kY+79FSRM5+Cux/vWtvY ZS7dgDidiXkvNw/nDDBeor8ROCwGOVKZeoqBmiPNvIt2FkvfCWIVPwUTPD4meSgGtul6 fWaDxadjiCOk2S1DSPpysJ5TWHy3SSDJUS2O+OWiz4f/w1SoVK2j4Xbgpx+Kla6KODxC qGAkIN2zmkWqDWpWEo7yL3JV4IAfeEXx5bSZuzd9KZVvDmGN5/CHY6hu1axBI5s8HTpl CLwv7+BTOL4hsos5CkcKOzoVUL3U4tXCp2hcfczb7OryvQXJBrSIBKjCpeKcy5+Renzq IZ8g== X-Forwarded-Encrypted: i=1; AFNElJ/RDqGYT4tgqpFkwahcSK9c05OqTcocM+jR46Ya59P2pGE6qQ0q2bY7JrH3X90+dsFBXKXmBrZORJ4QlaA=@vger.kernel.org X-Gm-Message-State: AOJu0YzGlDwLOA+ST4FpSTqNPWXsMBOmJOxrTTHf7QUEYinjuoBnRpxS oipa8iqtxDJ/lQk5qkq2QAdW05sEVapE7C+dDiFA9lP4AXmbRIuI9FHoE2J6HMPdgtsqwTTD3UM gs2yYtXZ/WA== X-Received: from dybmc34.prod.google.com ([2002:a05:7301:19a2:b0:307:d71d:34a7]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e882:b0:304:3c33:7ae7 with SMTP id 5a478bee46e88-30ba596a9c8mr200eec.7.1781542222501; Mon, 15 Jun 2026 09:50:22 -0700 (PDT) Date: Mon, 15 Jun 2026 09:49:54 -0700 In-Reply-To: <20260615165010.2724690-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: <20260615061631.2382079-1-irogers@google.com> <20260615165010.2724690-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260615165010.2724690-5-irogers@google.com> Subject: [PATCH v19 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