From nobody Sun Sep 14 16:08:46 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 18405C05027 for ; Fri, 20 Jan 2023 12:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbjATMgd (ORCPT ); Fri, 20 Jan 2023 07:36:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230283AbjATMgT (ORCPT ); Fri, 20 Jan 2023 07:36:19 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B164BC895; Fri, 20 Jan 2023 04:35:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674218154; x=1705754154; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=usKQ9P+Ke/475dpAvzHSLqve+rQfd02M1v4DhbzDTsE=; b=YMWiOHr2oT+n4EWDUwhX/9KeSFE9aZCWIiS+TBci4MYorF03v1fd8Ycx GAFvJJD5RibI2H/5X58h1mFB5tHvSEev+3aRnSxwjiCJw6YBzgp7V7TbN fPvVp1OWM1J7oh+KaYEosWh7QBMLhWjb5O3GBp3i3Fqukwj8lm58CEumF zTMGgpHtmESF7OuO26nVQaliQs+hUqyc3hoqp0VRnENXUIAOMpTwVKmfu 2B5+V4ThnyXQr7mWCEM9h7rJu4fOEH2BmouBgmSGdw0ZbajZSC4AXoR7V ivV8B4EEPpUPwMNcJf5DuwkBs9pXgILdsDEvmkqdQhNNcie3tPhYeOH9i Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="387935315" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="387935315" 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:38 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="692847463" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="692847463" 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:36 -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 10/10] perf symbols: Check SHT_RELA and SHT_REL type earlier Date: Fri, 20 Jan 2023 14:34:56 +0200 Message-Id: <20230120123456.12449-11-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" Make the code more readable by checking for SHT_RELA and SHT_REL type earlier. Signed-off-by: Adrian Hunter --- tools/perf/util/symbol-elf.c | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index e274f646ac32..aa62735aea7b 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -434,6 +434,10 @@ int dso__synthesize_plt_symbols(struct dso *dso, struc= t symsrc *ss) return 0; } =20 + if (shdr_rel_plt.sh_type !=3D SHT_RELA && + shdr_rel_plt.sh_type !=3D SHT_REL) + return 0; + if (shdr_rel_plt.sh_link !=3D dynsym_idx) goto out_elf_end; =20 @@ -466,34 +470,30 @@ int dso__synthesize_plt_symbols(struct dso *dso, stru= ct symsrc *ss) =20 ri.is_rela =3D shdr_rel_plt.sh_type =3D=3D SHT_RELA; =20 - if (shdr_rel_plt.sh_type =3D=3D SHT_RELA || - shdr_rel_plt.sh_type =3D=3D SHT_REL) { - for (idx =3D 0; idx < nr_rel_entries; idx++) { - const char *elf_name =3D NULL; - char *demangled =3D NULL; - - gelf_getsym(syms, get_rel_symidx(&ri, idx), &sym); - - elf_name =3D elf_sym__name(&sym, symstrs); - demangled =3D demangle_sym(dso, 0, elf_name); - if (demangled !=3D NULL) - elf_name =3D demangled; - if (*elf_name) - snprintf(sympltname, sizeof(sympltname), "%s@plt", elf_name); - else - snprintf(sympltname, sizeof(sympltname), - "offset_%#" PRIx64 "@plt", plt_offset); - free(demangled); - - f =3D symbol__new(plt_offset, plt_entry_size, - STB_GLOBAL, STT_FUNC, sympltname); - if (!f) - goto out_elf_end; + for (idx =3D 0; idx < nr_rel_entries; idx++) { + const char *elf_name =3D NULL; + char *demangled =3D NULL; =20 - plt_offset +=3D plt_entry_size; - symbols__insert(&dso->symbols, f); - ++nr; - } + gelf_getsym(syms, get_rel_symidx(&ri, idx), &sym); + + elf_name =3D elf_sym__name(&sym, symstrs); + demangled =3D demangle_sym(dso, 0, elf_name); + if (demangled) + elf_name =3D demangled; + if (*elf_name) + snprintf(sympltname, sizeof(sympltname), "%s@plt", elf_name); + else + snprintf(sympltname, sizeof(sympltname), + "offset_%#" PRIx64 "@plt", plt_offset); + free(demangled); + + f =3D symbol__new(plt_offset, plt_entry_size, STB_GLOBAL, STT_FUNC, symp= ltname); + if (!f) + goto out_elf_end; + + plt_offset +=3D plt_entry_size; + symbols__insert(&dso->symbols, f); + ++nr; } =20 err =3D 0; --=20 2.34.1