From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 1EFE028726E for ; Tue, 9 Dec 2025 09:47:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765273641; cv=none; b=WZHJ9Up2w2Tu/L8/2QfGII9Heph/vdmIdL9plVGL7yFXtNetrj5nLJFr2ujB/yKq6uY2ls9/YesZNVYR6y+zTCrzZfK/sow4+COJjsP2YVUPfZy/cp910019zpCJgOF/dfU4L/srv5xrxzbXo/L5tyjPrIPj/dRZWoaPeZ+dI/s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765273641; c=relaxed/simple; bh=9TslD7xCl7tSVm0C8zQsYurDAQ8KmYQic8s8dVXNOLE=; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From: In-Reply-To:Content-Type; b=ip+8sAcXnliwNEvnf7/iQXx7QMJnl8G3PKqmIvR7/pGvYPTuk2++cabgQizq9JL40tV2JZQG6tE11i0gvInID5G2m0+Bv7CPJCMFmkMeGMBf1rKFY9Nprk/62shEgBljGPlpl5uURvOizpd+QGTfKR3NsL91YnWw6apAqan4l3o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=gMywNWCZ; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="gMywNWCZ" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-477ba2c1ca2so70405775e9.2 for ; Tue, 09 Dec 2025 01:47:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765273638; x=1765878438; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:cc:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=SAXkEChtFVOZf8CYCobgM6VEiPTyXUpeqrCFGBI1jtA=; b=gMywNWCZRV0ed1/fU0g7hPFvnTs9uzgij480b/5GfmJgQ2vo/H/IqW7cJAR7PVZUSV C1j/h64+IPmntPi3XqQ5I0YP6Myg4a5ywuFYsU4M+oPTPl6t2PjtWRF7ipd5UbAPqKjI 3aBAIj6KnLTw8E6Tw0BwylB4sDmG1BxitYzsyNBnLsB68tdeQWyQRUZk1tsFF9awuad+ C70lNQiX6Aao0iiTKRQQnkCbuEPnkKQTg0j/AyQsEYJdlKaNcfKkaXhDsHvC77lgVsQN EnSuFo6WMFZclBIskkNBZ5hxQlvx8KV0EKS/bux7At7BwlMGrcTwiMsvxDOWUVfD8sEb zUHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765273638; x=1765878438; h=content-transfer-encoding:in-reply-to:from:cc:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SAXkEChtFVOZf8CYCobgM6VEiPTyXUpeqrCFGBI1jtA=; b=TL9yfvnIS3YeODlWV/LJKt7OeOj9dR6sv30fr73p5ANLveGyb+4y0us7xxYWSh39XC yuzzjb6eaJ5Tl8N/7uvXaJYjga06als8euu959gQPfQ/0Nk9oZV8ADw/w3szfHqKFOFG RfCMVH6Q12aUphidxB4wGV8aaod7HlUIeloAGI45OJlyjJQdt5/+Tv2oplpHnGkmpbVJ YMr7N9cZUmYR+iEm3jiRIoyjQNHjxEou/l96/0nJK45hwZnwd0qCkIut6ymDZB51q1iZ AVHjV7ZZQnv9JBmPnr0SLzCMeyAEW0g6YFpfyCh5LypJURJdLX5JmA7LAbA4FQDPnYjC TtIw== X-Forwarded-Encrypted: i=1; AJvYcCUj5KTkQ35IUpMM8oC9VSHMmWhUKAzokBiZ+7hNuXOCySTFUjRd7W8tnM6gMuK/eUOsiebgsLxFLn6odWc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxbtyjmb5aQwLQil+2tRyFymqUa2iELqZJZSn0T+UiDUI5KpFzm 0CwznVObWc4na0GU0n49+t+vMayszLfiyCa/WoJBZra9mWfFYFas8LeIfmRzy69ShbI= X-Gm-Gg: ASbGnctxFfPoS74mqXLPOO/4EyBa1UPaR1bC7sSEXxgD7PJOfLFkChqfjWW0YbaoHjd EWKmjqVNwknVeO/OHH2tWm/gQ3aX3GIrbfgRvw4+i16EZPVBL8eJnHmwQBxcOrxu4DVqD03mvWt F+R3QKj+nj2PsaDUHRjhDeVZhTCRPp3hDjTXbkyFM0PZAhtP5thFoB4n3sQMfcLn4JJUdqsFPao Fdvx8Jsxq/SFdhuBGkakQSszqEpn0PuUNqgMv2nXVUiiCbBbL8QAb8Vx9YuUAdTXsCejaiWSDLe RYO9fAkVPBDLrWrAhXsYcFtZ24pZrE7LAZJWkxVhlmS11vBzUYc0Pqb3pdJ2X5207OdWMEJSn6M OmArEU0sqV7j5/Fi/IoKTPQGQ3H8eM1+FkufACDIlhi4uqGx0cluJTFqQXf6C7amHHH8vD83CB2 FOmlGK06ZMvs0Xy6PUjwUP0Cx8pRM= X-Google-Smtp-Source: AGHT+IEyZ8rEBV81FtwtosZhISPa9lLEsQPr8OGMQ2/sDvokQBEAnlNemVfQjOesVjI8iShir2ykag== X-Received: by 2002:a05:600c:468a:b0:477:9814:6882 with SMTP id 5b1f17b1804b1-47939df1517mr83498755e9.5.1765273638400; Tue, 09 Dec 2025 01:47:18 -0800 (PST) Received: from [192.168.1.3] ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42f7d331a4fsm34229370f8f.33.2025.12.09.01.47.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Dec 2025 01:47:18 -0800 (PST) Message-ID: <45aa45d0-3fd6-4073-87b5-80af287ca9ac@linaro.org> Date: Tue, 9 Dec 2025 09:47:17 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] perf symbol: Fix ENOENT case for filename__read_build_id To: Ian Rogers References: <20251207022345.909535-1-irogers@google.com> Content-Language: en-US Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Stephen Brennan , Haibo Xu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org From: James Clark In-Reply-To: <20251207022345.909535-1-irogers@google.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 07/12/2025 2:23 am, Ian Rogers wrote: > 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 files") > Signed-off-by: Ian Rogers > --- > 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. Reviewed-by: James Clark > --- > 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-buildid-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 *dso, int parm __maybe_unused) > { > char filename[PATH_MAX]; > struct build_id bid = { .size = 0, }; > + int err; > > if (!dso__build_id_filename(dso, filename, sizeof(filename), false)) > return true; > > - if (filename__read_build_id(filename, &bid) == -1) { > - if (errno == ENOENT) > + err = filename__read_build_id(filename, &bid); > + if (err < 0) { > + if (err == -ENOENT) > return false; > > 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) > > if (!filename) > return -EFAULT; > + > + errno = 0; > if (!is_regular_file(filename)) > - return -EWOULDBLOCK; > + return errno == 0 ? -EWOULDBLOCK : -errno; > > fd = 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, struct build_id *bid) > > if (!filename) > return -EFAULT; > + > + errno = 0; > if (!is_regular_file(filename)) > - return -EWOULDBLOCK; > + return errno == 0 ? -EWOULDBLOCK : -errno; > > err = kmod_path__parse(&m, filename); > if (err) > diff --git a/tools/perf/util/symbol-minimal.c b/tools/perf/util/symbol-minimal.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, struct build_id *bid) > > if (!filename) > return -EFAULT; > + > + errno = 0; > if (!is_regular_file(filename)) > - return -EWOULDBLOCK; > + return errno == 0 ? -EWOULDBLOCK : -errno; > > fd = open(filename, O_RDONLY); > if (fd < 0)