From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83FBE343D7B; Sat, 28 Feb 2026 17:32:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772299979; cv=none; b=Likia65YzqdDZzDwiwt3hyk9O6riC1d4RHp7q8YMONdAR8CR/ufzb6j+O944dYkLsmIurnMKqFYMi8moTr576mkAuvyk2c4dUYY9RLwcRIrT8SoD0m3uDSB7Btevx1DEU5UWFNJRfB4rYQ5FsGhxlAmDqk/vryGzkfPy3tgHthw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772299979; c=relaxed/simple; bh=JXmZxW8aypecdTK3JC3PR3n01rbBlYd6dg87U+ITZNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XK4OaiUFATde+YmacT6Oj5HQJ9HrMOfaWiOYDFMR1Mt5IAIA3vDJBuQXv8InZ/+BFAb7WN4ufMnchSL7Fwvm/bTI+UH9Qr7VaxGuUjjpEjAxYqXM8lAXgz9igLBoeaZcM78QqFrNBTwHONOahN/Wac1T5fkyM5a2BhTaqWPh368= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HzhBQx2y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HzhBQx2y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7B20C116D0; Sat, 28 Feb 2026 17:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772299979; bh=JXmZxW8aypecdTK3JC3PR3n01rbBlYd6dg87U+ITZNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzhBQx2yELtticJs3v9P1FKRKIFrIHYpBTm9k+2Kdot6KblfAkC50OIBfjZhTnsbh SmKRR5ls9B5IWfoRhJFVNbb+zjjlgQfwJV0PHV2rVK3xWGObEaRErUeWUlGK1lvi63 Q4RgQIHBWoMPlrLVmjdUQLyYE18bzKeEXANwvDd3fcCEM5MB1fEmXqfeDS5TrsH2du SAYk4joMn2btTq/QLvLp/w8xKhCmQD/rQf4hdxU+Uu8AkmyqkiTsnj1FX6Bi/RKfBa y/QkEeTMTAKmDjE4SO5opWFmpVSu6pjQCVXjdVzR9ixn58QJW8g84aXhPt4l6LZMq8 8qeMGkpkEJpRA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , James Clark , Adrian Hunter , Alexander Shishkin , Howard Chu , Ingo Molnar , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Stephen Brennan , Tony Jones , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.19 008/844] perf callchain: Fix srcline printing with inlines Date: Sat, 28 Feb 2026 12:18:41 -0500 Message-ID: <20260228173244.1509663-9-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Ian Rogers [ Upstream commit abec464767b5d26f0612250d511c18f420826ca1 ] sample__fprintf_callchain() was using map__fprintf_srcline() which won't report inline line numbers. Fix by using the srcline from the callchain and falling back to the map variant. Fixes: 25da4fab5f66e659 ("perf evsel: Move fprintf methods to separate source file") Reviewed-by: James Clark Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Howard Chu Cc: Ingo Molnar Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephen Brennan Cc: Tony Jones Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/evsel_fprintf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c index 10f1a03c28601..5521d00bff2c0 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c @@ -185,8 +185,12 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, if (print_dso && (!sym || !sym->inlined)) printed += map__fprintf_dsoname_dsoff(map, print_dsoff, addr, fp); - if (print_srcline) - printed += map__fprintf_srcline(map, addr, "\n ", fp); + if (print_srcline) { + if (node->srcline) + printed += fprintf(fp, "\n %s", node->srcline); + else + printed += map__fprintf_srcline(map, addr, "\n ", fp); + } if (sym && sym->inlined) printed += fprintf(fp, " (inlined)"); -- 2.51.0