From nobody Sun Sep 14 16:23:30 2025 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 B37E5C27C76 for ; Fri, 20 Jan 2023 12:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229640AbjATMf1 (ORCPT ); Fri, 20 Jan 2023 07:35:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbjATMfV (ORCPT ); Fri, 20 Jan 2023 07:35:21 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4057FBC8B9; Fri, 20 Jan 2023 04:35:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674218119; x=1705754119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sAcMYB+GjPlCo4U+0MPqIgbgUDFTYLliCdjAF9kowCQ=; b=OOyQsNNu/VS+Yi5cftaFnpLGNsHcxAK3l0QnzYLrBEx94dveAsGqlm7A mALLQT4HpRz7rUWRRude/tf564MhUUPFk2DX+dYiN0SmlWrp0y/3T+BdY 6wgb82z3HD78hsSCguqUv2+OewGk+dcHmThm3jIGsKWiKG+sF23i+r/He Y/1KrWNyEUJc7z6LesqjrDJFAGiKH1UozO/TQTfMPLs4OAkr0u3VPSxHv YiRW1/2fkHVm2l+CRB8r6rHEPbpMbzwgrh18E/UOUX/CrpGCZxRAwNqm9 8WZEJbxBu+cK9hGcqQlF6r05x7LUqjCR9UsIppuCUEu0GiTY5kr0o6xK7 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="387935170" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="387935170" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 04:35:18 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="692847420" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="692847420" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.251.223.163]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 04:35:16 -0800 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH 02/10] perf symbols: Factor out get_plt_sizes() Date: Fri, 20 Jan 2023 14:34:48 +0200 Message-Id: <20230120123456.12449-3-adrian.hunter@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120123456.12449-1-adrian.hunter@intel.com> References: <20230120123456.12449-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Factor out get_plt_sizes() to make the code more readable and further changes to dso__synthesize_plt_symbols() easier to follow. Signed-off-by: Adrian Hunter --- tools/perf/util/symbol-elf.c | 54 +++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 96767d1b3f1c..4605680a22a3 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -323,6 +323,33 @@ static char *demangle_sym(struct dso *dso, int kmodule= , const char *elf_name) return demangled; } =20 +static void get_plt_sizes(GElf_Ehdr *ehdr, GElf_Shdr *shdr_plt, + u64 *plt_header_size, u64 *plt_entry_size) +{ + switch (ehdr->e_machine) { + case EM_ARM: + *plt_header_size =3D 20; + *plt_entry_size =3D 12; + return; + case EM_AARCH64: + *plt_header_size =3D 32; + *plt_entry_size =3D 16; + return; + case EM_SPARC: + *plt_header_size =3D 48; + *plt_entry_size =3D 12; + return; + case EM_SPARCV9: + *plt_header_size =3D 128; + *plt_entry_size =3D 32; + return; + default: /* FIXME: s390/alpha/mips/parisc/poperpc/sh/xtensa need to be ch= ecked */ + *plt_header_size =3D shdr_plt->sh_entsize; + *plt_entry_size =3D shdr_plt->sh_entsize; + return; + } +} + #define elf_section__for_each_rel(reldata, pos, pos_mem, idx, nr_entries) \ for (idx =3D 0, pos =3D gelf_getrel(reldata, 0, &pos_mem); \ idx < nr_entries; \ @@ -411,32 +438,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struc= t symsrc *ss) =20 nr_rel_entries =3D shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize; plt_offset =3D shdr_plt.sh_offset; - switch (ehdr.e_machine) { - case EM_ARM: - plt_header_size =3D 20; - plt_entry_size =3D 12; - break; - - case EM_AARCH64: - plt_header_size =3D 32; - plt_entry_size =3D 16; - break; - - case EM_SPARC: - plt_header_size =3D 48; - plt_entry_size =3D 12; - break; - - case EM_SPARCV9: - plt_header_size =3D 128; - plt_entry_size =3D 32; - break; - - default: /* FIXME: s390/alpha/mips/parisc/poperpc/sh/xtensa need to be c= hecked */ - plt_header_size =3D shdr_plt.sh_entsize; - plt_entry_size =3D shdr_plt.sh_entsize; - break; - } + get_plt_sizes(&ehdr, &shdr_plt, &plt_header_size, &plt_entry_size); plt_offset +=3D plt_header_size; =20 if (shdr_rel_plt.sh_type =3D=3D SHT_RELA) { --=20 2.34.1