From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA394C04A94 for ; Tue, 15 Aug 2023 18:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237800AbjHOSEZ (ORCPT ); Tue, 15 Aug 2023 14:04:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238054AbjHOSEM (ORCPT ); Tue, 15 Aug 2023 14:04:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35DF61987 for ; Tue, 15 Aug 2023 11:04:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AD4A263D55 for ; Tue, 15 Aug 2023 18:04:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63711C433C7; Tue, 15 Aug 2023 18:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692122650; bh=u64U3hAW4sCoobVSpD032U+KL4qVapduZ/9IcdBRZdc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SW8K2I34E1LZX1dXuvDDUWgHNwAKF+DPCnSVWHSKmplVqyQsTE9raL9UNGdjW5Ma2 Z22TCWZVHUbIR5XoSFsAcZwuNXCvYFRJfp4apQ9Ob0FJJs01woaKWcGM0sT7UVeMP8 e6x//O5hlmP6KeIIREl+2Rks+XefRjnALGD0WeXRv/yyDRxbSWxW7rwFcQ9ZED3Bvf qkt75Gqr8kPl8u3fR5/HJSdcnqymunCS4W8+bccc/21zPuQTvwNm1jUyBCZCFMJrk6 qkafDsM/wTS66W61jK2fUZs+iPeEL+pS/wDveQ9EdrvktaKUTg+UhU94FgiOSC4qFo SnMIV6bpyr7lQ== From: acme@kernel.org To: stable@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Jesper Dangaard Brouer , Artem Savkov , Andrii Nakryiko , Namhyung Kim , Adrian Hunter , Alexander Shishkin , Ian Rogers , Ingo Molnar , Jiri Olsa , Mark Rutland , Masami Hiramatsu , Milian Wolff , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 6.4.y 1/1] Revert "perf report: Append inlines to non-DWARF callchains" Date: Tue, 15 Aug 2023 15:03:42 -0300 Message-ID: <20230815180342.274263-1-acme@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <2023081251-conceal-stool-53f1@gregkh> References: <2023081251-conceal-stool-53f1@gregkh> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnaldo Carvalho de Melo This reverts commit 46d21ec067490ab9cdcc89b9de5aae28786a8b8e. The tests were made with a specific workload, further tests on a recently updated fedora 38 system with a system wide perf.data file shows 'perf report' taking excessive time resolving inlines in vmlinux, so lets revert this until a full investigation and improvement on the addr2line support code is made. Reported-by: Jesper Dangaard Brouer Acked-by: Artem Savkov Tested-by: Jesper Dangaard Brouer Cc: Andrii Nakryiko Cc: Namhyung Kim Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ian Rogers Cc: Ingo Molnar Cc: Jiri Olsa Cc: Mark Rutland Cc: Masami Hiramatsu Cc: Milian Wolff Cc: Peter Zijlstra Link: https://lore.kernel.org/r/ZMl8VyhdwhClTM5g@kernel.org Signed-off-by: Arnaldo Carvalho de Melo (cherry picked from commit c0b067588a4836b762cfc6a4c83f122ca1dbb93a) Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 9e02e19c1b7a9ab6..4d564e0698dfc466 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -44,7 +44,6 @@ #include static void __machine__remove_thread(struct machine *machine, struct thread *th, bool lock); -static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms, u64 ip); static struct dso *machine__kernel_dso(struct machine *machine) { @@ -2371,10 +2370,6 @@ static int add_callchain_ip(struct thread *thread, ms.maps = al.maps; ms.map = al.map; ms.sym = al.sym; - - if (!branch && append_inlines(cursor, &ms, ip) == 0) - return 0; - srcline = callchain_srcline(&ms, al.addr); err = callchain_cursor_append(cursor, ip, &ms, branch, flags, nr_loop_iter, -- 2.41.0