From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 5D1D423C8C9 for ; Wed, 21 May 2025 22:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747868058; cv=none; b=AvLDxBdVzCIcwET1E5HwpNyt2kQ5Dacw5e03H+kY/qe9EkV0aKuFNUJuXs+jnRq7OXeb6Etqy0H6Ey/sRoyzXa7qBGD5bJrGY54sq8E0DRm16eeYrSuH1u4vC663WItt04yJTKmdhtJGnCWc9Jc4VOZV8GU2uzEno09x7MM9/bk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747868058; c=relaxed/simple; bh=+AUYSNahAWGf9W1tBYRZu9JyCsHrw3J+A7EkvETxE5o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=L0/zHCqvin6RU4WZ4s1/+utTz3vlfRKeRsee2pbf98isS9xi/8o7qb4SznPhaV+rdZJuwDWmDvCl+43Ge9orJExjmehRUi3EbXiD8nmVXa/dws5jHP1646ziroYP1SyBmya1znHUdLM7P+KyPfTUaEWvaL6FucS8dTBuWGHqTJk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuzhuo.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JsxahsgO; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuzhuo.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JsxahsgO" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b269789425bso7563806a12.0 for ; Wed, 21 May 2025 15:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747868056; x=1748472856; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=y5iEOEtDGQjkBBG8+IR+GBcP08I1z1xCE1eB2Wanmvw=; b=JsxahsgOfZGRPo0TKSfMnIDK1ZGgK5onR9C/yzSk9c/utwEKrEZF0ZuIzCyeuSfTAs qHX+BfCO6EcoIhX6qqeZk43whsI+++H4ikD/SOKIjU0z3fUCWqv93rUtFLSoB737kSPK XOtJ/0lKWdRI14oxB3ZDIWsCNSkBzo9DSJtF8fxRwp+L2XyQDqmSHPxLENuJsfLOX0Bx GDYLr1Q/wlRSx0SSCCGShJEIlt+7bjtGvGL7RU8+zZTRYBWrzLbdqdI1prERanrUE4Zc MEhJYAMJGdtLrJAfjaYA0KlcYCPmYL6pZ6/hqa1sGs04OrZKBT9cQknC5UgsLP5JNZjt EWDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747868056; x=1748472856; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=y5iEOEtDGQjkBBG8+IR+GBcP08I1z1xCE1eB2Wanmvw=; b=rP9g7AaiO/lQ9zAUrO6Phcp3/Ll7ujExEBGdIR9EM1E6K+XxWbjZY24Yu9GVsKDp20 Vwwjr1yAacFeJoCD9ckkThjAzZ9nthqM2HEBkxrYZV5co18iNVg93KuDxEvXBmwTcDhS 9ODsSM+peMiVAXtG8lhmFv0a37R6oMsq94varn7FPWq/ReEUZAiBQjP3mTf+yrqA9k1t EtJ4ilkvERrXqbx01dSefyJ8E5FS2nBE46X7ILOaYEG22gqpvGVCpSOYemdPHWnjJWAg j9XipcidB7gMFeMImqNF7Q6kBy2+9z+1RGABEl/uIZiV1TKK6RNHxNMrqKTME80yrExm +h4g== X-Forwarded-Encrypted: i=1; AJvYcCWIzYkQK12f9XjBVXXLKrviMf1gxwa+TDlf2ftQ6JPm4qwhegOAf3u5EfsogIIrL8Z6M3ZwuSKn5K5wlnSUMAoe@vger.kernel.org X-Gm-Message-State: AOJu0Yw4EQFO2u48dlArl4qpryFnfVTeUA041Bqm+DimzufKzmCjN3EY wgECiS7TZCu+GvAsnEm+WPmtjmrN4FVo9EhzPGUwnlWBveh5XTYDAr5dMifqZRV3c11y5uwreI7 vTXQoXQ== X-Google-Smtp-Source: AGHT+IEK2MKOxh7O7TqCVhedlN7LWirgEvC2NFjssFnsIa6UXUWSiPhGiHliRMQVf82CzHliIwdjxuvaB50= X-Received: from pfbjw12.prod.google.com ([2002:a05:6a00:928c:b0:736:b2a2:5bfe]) (user=yuzhuo job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d12:b0:1f5:59e5:8ada with SMTP id adf61e73a8af0-2162187a945mr31068430637.4.1747868055561; Wed, 21 May 2025 15:54:15 -0700 (PDT) Date: Wed, 21 May 2025 15:53:06 -0700 In-Reply-To: <20250521225307.743726-1-yuzhuo@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250521225307.743726-1-yuzhuo@google.com> X-Mailer: git-send-email 2.49.0.1164.gab81da1b16-goog Message-ID: <20250521225307.743726-4-yuzhuo@google.com> Subject: [PATCH v1 3/4] perf genelf: Remove libcrypto dependency and use sha1 utils From: Yuzhuo Jing To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Liang Kan , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , "Steven Rostedt (Google)" , James Clark , Tomas Glozar , Leo Yan , Guilherme Amadio , Yuzhuo Jing , Yang Jihong , "Masami Hiramatsu (Google)" , Adhemerval Zanella , Wei Yang , Ard Biesheuvel , "Mike Rapoport (Microsoft)" , Athira Rajeev , Kajol Jain , Aditya Gupta , Charlie Jenkins , "Steinar H. Gunderson" , "Dr. David Alan Gilbert" , Herbert Xu , Jeff Johnson , Al Viro , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" genelf is the only file in perf that depends on libcrypto (or openssl) which only calculates a Build ID (SHA1, MD5, or URANDOM). SHA1 was expected to be the default option, but MD5 was used by default due to previous issues when linking against Java. This commit switches genelf to use in-house SHA1 utils, and also removes MD5 and URANDOM options since we have a reliable SHA1 implementation to rely on. It passes the tools/perf/tests/shell/test_java_symbol.sh test. Signed-off-by: Yuzhuo Jing --- tools/perf/util/genelf.c | 72 ++++------------------------------------ 1 file changed, 6 insertions(+), 66 deletions(-) diff --git a/tools/perf/util/genelf.c b/tools/perf/util/genelf.c index cdce7f173d00..cfedb29260ef 100644 --- a/tools/perf/util/genelf.c +++ b/tools/perf/util/genelf.c @@ -28,24 +28,7 @@ #define NT_GNU_BUILD_ID 3 #endif -#define BUILD_ID_URANDOM /* different uuid for each run */ - -#ifdef HAVE_LIBCRYPTO_SUPPORT - -#define BUILD_ID_MD5 -#undef BUILD_ID_SHA /* does not seem to work well when linked with Java */ -#undef BUILD_ID_URANDOM /* different uuid for each run */ - -#ifdef BUILD_ID_SHA -#include -#endif - -#ifdef BUILD_ID_MD5 -#include -#include -#endif -#endif - +#include "sha1_base.h" typedef struct { unsigned int namesz; /* Size of entry's owner string */ @@ -92,64 +75,21 @@ static Elf_Sym symtab[]={ } }; -#ifdef BUILD_ID_URANDOM -static void -gen_build_id(struct buildid_note *note, - unsigned long load_addr __maybe_unused, - const void *code __maybe_unused, - size_t csize __maybe_unused) -{ - int fd; - size_t sz = sizeof(note->build_id); - ssize_t sret; - - fd = open("/dev/urandom", O_RDONLY); - if (fd == -1) - err(1, "cannot access /dev/urandom for buildid"); - - sret = read(fd, note->build_id, sz); - - close(fd); - - if (sret != (ssize_t)sz) - memset(note->build_id, 0, sz); -} -#endif - -#ifdef BUILD_ID_SHA static void gen_build_id(struct buildid_note *note, unsigned long load_addr __maybe_unused, const void *code, size_t csize) { - if (sizeof(note->build_id) < SHA_DIGEST_LENGTH) - errx(1, "build_id too small for SHA1"); - - SHA1(code, csize, (unsigned char *)note->build_id); -} -#endif - -#ifdef BUILD_ID_MD5 -static void -gen_build_id(struct buildid_note *note, unsigned long load_addr, const void *code, size_t csize) -{ - EVP_MD_CTX *mdctx; + struct sha1_state sctx; - if (sizeof(note->build_id) < 16) - errx(1, "build_id too small for MD5"); + if (sizeof(note->build_id) < SHA1_DIGEST_SIZE) + errx(1, "build_id too small for SHA1"); - mdctx = EVP_MD_CTX_new(); - if (!mdctx) - errx(2, "failed to create EVP_MD_CTX"); + sha1_base_init(&sctx); - EVP_DigestInit_ex(mdctx, EVP_md5(), NULL); - EVP_DigestUpdate(mdctx, &load_addr, sizeof(load_addr)); - EVP_DigestUpdate(mdctx, code, csize); - EVP_DigestFinal_ex(mdctx, (unsigned char *)note->build_id, NULL); - EVP_MD_CTX_free(mdctx); + crypto_sha1_finup(&sctx, code, csize, (unsigned char *)note->build_id); } -#endif static int jit_add_eh_frame_info(Elf *e, void* unwinding, uint64_t unwinding_header_size, -- 2.49.0.1164.gab81da1b16-goog