From nobody Fri Dec 19 12:49:38 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 A8A6123D294 for ; Sun, 7 Dec 2025 02:23:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765074231; cv=none; b=TpqJccpBucE2anW4HtCmynjSm7bQS616jHjGeuHx4ss+o0ZTxImHfXGt86YtydEFxOWlfCfEYfjzs3FGkbEzTXy+1qN83zPLvkzK5nqDCZ1vDc6Ond6Q7Lf5xEI4CTxe9pcrw2TjGJXa7E0pzFyeeNUtSkOkkWuQU4YOeqnroHA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765074231; c=relaxed/simple; bh=6o9pGBnHlXFvBgZNvxTYG5hdLg8Lc8RAyepBuDI614g=; h=Date:Mime-Version:Message-ID:Subject:From:To:Content-Type; b=C+a1++4FIvpSwFK3qaUOXJv7fg1v3eo/cgQjYm5PDmtTUCYkScooGm+/GB6I2vhuNNANW2DiwDhm+Qv80dYE/q+sq71dl0ox4CyIHyG4+hH32caMLVEQtVwQ8dqUaYh/QvbCsxT2bnfjFahwOCPDfFv02BQa82KdoSOfDxMzqdc= 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=I2Wt9XXD; arc=none smtp.client-ip=209.85.214.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="I2Wt9XXD" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-297f587dc2eso25921305ad.2 for ; Sat, 06 Dec 2025 18:23:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1765074229; x=1765679029; darn=vger.kernel.org; h=to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=e/BpikQAuzfkcicgmAn22YMgdzTScgVjWtNgIDkUOP4=; b=I2Wt9XXD9eEa2RweDC8mGba+H1y/tsz9toO3C8omkSMFTKXqeuDBa6NmpPKyIHfaiI VWAmLGSAUDX0uHFrDNOyv2WRq6FUI8sbtityNojTEwfGcDbB4OWZ9dcsjEYKvbkwOb23 suy4fy8NJ4c16sDpTTY8vYxaicIkCKz4cDuPPGb4J0Er0wQOTZbGEbR5hcPIvADmwAMD RjSoQUi/H4uUlhJjifkm/XxbqPfZWH5xQq27Bxcg3SxWuBRZjTXTQAWyoHt8aBcAiIWr enARAKzylUS1DvUI8m3/ZszMCufNI8q/ry2eO7GgoMU4ayq+MdN2v0h0sZkMUZXX+kDW EAFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765074229; x=1765679029; h=to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=e/BpikQAuzfkcicgmAn22YMgdzTScgVjWtNgIDkUOP4=; b=PFxq52zCvc5qjpCz6+/OMb7aT7gFJRxLlhzW85WpzONgKf9RM3K8yYGobvd41beyXU OfI7y21WRKumnQ4slOKAGvA1MZlrM/m0oXAXiZQhHus9/QOlqL9z8kj+YJsuc9hlYqFU 2scBK7xdULnLzLc3XnXweYWTIeVUkR/X/q4MfZLR+U9h59wKtdxYJu7hhR9ROXW7USqm J3FU6qQFqiwSrsBO+n/YqSGZku6djr5FRONvsBnEi6z8fsfZdEwvu341BPP0ap/atnO4 VHd304etANP5IT7h00O7VvxYiyG+cuT8sseyfz97Qvn9O/2L9FCSPlEL4GMgwrWUxQaD 3u4A== X-Forwarded-Encrypted: i=1; AJvYcCUTM3ziA/p1zDRJYWI1xM7vNn1fyVJAlJBZ4RqKxgZf8o4RUccQ7Kw1P90frgrmxj+r7D/fIHkLZy3FNRw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0PXj5D12l77HBfJVsiWzeZCSgF/NblMuT6E04lMAqMzn/ZKEd bJDbo7XxREE7XfR82uPnjsWHfcBD4DuJq3l9gsVL1YDEPxxHZmwlvNP2z/cXu1mVnpG+1qJtuE4 +Ss/QOurbUQ== X-Google-Smtp-Source: AGHT+IEr+61enQIXyJ6lmMhSQMQenMiFghJUQnyrvrvjfSmsiJ4rnAvPxNH3vjvYqPAxjr6fms1GSZsQ8X1V X-Received: from dlbbk31.prod.google.com ([2002:a05:7022:429f:b0:11d:cf4c:62ab]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6b85:b0:11b:a3a7:65be with SMTP id a92af1059eb24-11e0325ef2emr2716987c88.16.1765074228814; Sat, 06 Dec 2025 18:23:48 -0800 (PST) Date: Sat, 6 Dec 2025 18:23:45 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.52.0.223.gf5cc29aaa4-goog Message-ID: <20251207022345.909535-1-irogers@google.com> Subject: [PATCH v1] perf symbol: Fix ENOENT case for filename__read_build_id From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Stephen Brennan , Haibo Xu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some callers of filename__read_build_id assume the error value must be -1, fix by making them handle all < 0 values. If is_regular_file fails in filename__read_build_id then it could be the file is missing (ENOENT) and it would be wrong to return -EWOULDBLOCK in that case. Fix the logic so -EWOULDBLOCK is only reported if other errors with stat haven't occurred. Fixes: 834ebb5678d7 ("perf tools: Don't read build-ids from non-regular fil= es") Signed-off-by: Ian Rogers Reviewed-by: James Clark --- Note, a shorter version of this patch appeared in a series cleaning/refactoring the build id reading code: https://lore.kernel.org/lkml/20251201205509.195451-11-irogers@google.com/ It is sent without the refactor for the sake of fixing the bug in an earlier release. --- tools/perf/builtin-buildid-cache.c | 6 ++++-- tools/perf/util/libbfd.c | 4 +++- tools/perf/util/symbol-elf.c | 4 +++- tools/perf/util/symbol-minimal.c | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildi= d-cache.c index c98104481c8a..539e779e3268 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c @@ -276,12 +276,14 @@ static bool dso__missing_buildid_cache(struct dso *ds= o, int parm __maybe_unused) { char filename[PATH_MAX]; struct build_id bid =3D { .size =3D 0, }; + int err; =20 if (!dso__build_id_filename(dso, filename, sizeof(filename), false)) return true; =20 - if (filename__read_build_id(filename, &bid) =3D=3D -1) { - if (errno =3D=3D ENOENT) + err =3D filename__read_build_id(filename, &bid); + if (err < 0) { + if (err =3D=3D -ENOENT) return false; =20 pr_warning("Problems with %s file, consider removing it from the cache\n= ", diff --git a/tools/perf/util/libbfd.c b/tools/perf/util/libbfd.c index 0099b415decc..edf0829e9635 100644 --- a/tools/perf/util/libbfd.c +++ b/tools/perf/util/libbfd.c @@ -391,8 +391,10 @@ int libbfd__read_build_id(const char *filename, struct= build_id *bid) =20 if (!filename) return -EFAULT; + + errno =3D 0; if (!is_regular_file(filename)) - return -EWOULDBLOCK; + return errno =3D=3D 0 ? -EWOULDBLOCK : -errno; =20 fd =3D open(filename, O_RDONLY); if (fd < 0) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 957143fbf8a0..d1dcafa4b3b8 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -902,8 +902,10 @@ int filename__read_build_id(const char *filename, stru= ct build_id *bid) =20 if (!filename) return -EFAULT; + + errno =3D 0; if (!is_regular_file(filename)) - return -EWOULDBLOCK; + return errno =3D=3D 0 ? -EWOULDBLOCK : -errno; =20 err =3D kmod_path__parse(&m, filename); if (err) diff --git a/tools/perf/util/symbol-minimal.c b/tools/perf/util/symbol-mini= mal.c index c6b17c14a2e9..8221dc9868f7 100644 --- a/tools/perf/util/symbol-minimal.c +++ b/tools/perf/util/symbol-minimal.c @@ -104,8 +104,10 @@ int filename__read_build_id(const char *filename, stru= ct build_id *bid) =20 if (!filename) return -EFAULT; + + errno =3D 0; if (!is_regular_file(filename)) - return -EWOULDBLOCK; + return errno =3D=3D 0 ? -EWOULDBLOCK : -errno; =20 fd =3D open(filename, O_RDONLY); if (fd < 0) --=20 2.52.0.223.gf5cc29aaa4-goog