linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Yuzhuo Jing <yuzhuo@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Liang Kan <kan.liang@linux.intel.com>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <nick.desaulniers+lkml@gmail.com>,
	Bill Wendling <morbo@google.com>,
	Justin Stitt <justinstitt@google.com>,
	"Steven Rostedt (Google)" <rostedt@goodmis.org>,
	James Clark <james.clark@linaro.org>,
	Tomas Glozar <tglozar@redhat.com>, Leo Yan <leo.yan@arm.com>,
	Guilherme Amadio <amadio@gentoo.org>,
	Yang Jihong <yangjihong@bytedance.com>,
	"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
	Adhemerval Zanella <adhemerval.zanella@linaro.org>,
	Wei Yang <richard.weiyang@gmail.com>,
	Ard Biesheuvel <ardb@kernel.org>,
	"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
	Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
	Kajol Jain <kjain@linux.ibm.com>,
	Aditya Gupta <adityag@linux.ibm.com>,
	Charlie Jenkins <charlie@rivosinc.com>,
	"Steinar H. Gunderson" <sesse@google.com>,
	"Dr. David Alan Gilbert" <linux@treblig.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	Jeff Johnson <jeff.johnson@oss.qualcomm.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	llvm@lists.linux.dev
Subject: Re: [PATCH v1 4/4] tools: Remove libcrypto dependency
Date: Thu, 22 May 2025 14:30:00 -0300	[thread overview]
Message-ID: <aC9fGPZ2qb2dje0x@x1> (raw)
In-Reply-To: <20250521225307.743726-5-yuzhuo@google.com>

On Wed, May 21, 2025 at 03:53:07PM -0700, Yuzhuo Jing wrote:
> Remove all occurrence of libcrypto in the build system.

and that was so far used only by tools/perf, good:

⬢ [acme@toolbx perf-tools-next]$ git grep -w feature-libcrypto tools/

As there are some other features that are tested/used by other tools/
living code.

⬢ [acme@toolbx perf-tools-next]$ git grep -w feature-libbfd tools/
tools/bpf/bpftool/Makefile:  ifeq ($(feature-libbfd),1)
tools/bpf/bpftool/Makefile:  else ifeq ($(feature-libbfd-liberty),1)
tools/bpf/bpftool/Makefile:  else ifeq ($(feature-libbfd-liberty-z),1)
tools/perf/Makefile.config:  ifeq ($(feature-libbfd), 1)
tools/perf/Makefile.config:    ifeq ($(feature-libbfd-liberty), 1)
tools/perf/Makefile.config:      ifeq ($(feature-libbfd-liberty-z), 1)
tools/perf/Makefile.config:  ifeq ($(feature-libbfd-buildid), 1)
⬢ [acme@toolbx perf-tools-next]$

- Arnaldo
 
> Signed-off-by: Yuzhuo Jing <yuzhuo@google.com>
> ---
>  tools/build/Makefile.feature            |  2 --
>  tools/build/feature/Makefile            |  4 ----
>  tools/build/feature/test-all.c          |  5 -----
>  tools/build/feature/test-libcrypto.c    | 25 -------------------------
>  tools/perf/Documentation/perf-check.txt |  1 -
>  tools/perf/Makefile.config              | 13 -------------
>  tools/perf/Makefile.perf                |  3 ---
>  tools/perf/builtin-check.c              |  1 -
>  tools/perf/tests/make                   |  4 +---
>  9 files changed, 1 insertion(+), 57 deletions(-)
>  delete mode 100644 tools/build/feature/test-libcrypto.c
> 
> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
> index 57bd995ce6af..bbadfb5568eb 100644
> --- a/tools/build/Makefile.feature
> +++ b/tools/build/Makefile.feature
> @@ -86,7 +86,6 @@ FEATURE_TESTS_BASIC :=                  \
>          libtraceevent                   \
>          libtracefs                      \
>          libcpupower                     \
> -        libcrypto                       \
>          pthread-attr-setaffinity-np     \
>          pthread-barrier     		\
>          reallocarray                    \
> @@ -152,7 +151,6 @@ FEATURE_DISPLAY ?=              \
>           numa_num_possible_cpus \
>           libperl                \
>           libpython              \
> -         libcrypto              \
>           libcapstone            \
>           llvm-perf              \
>           zlib                   \
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index b8b5fb183dd4..04a4aa0341aa 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -38,7 +38,6 @@ FILES=                                          \
>           test-libtraceevent.bin                 \
>           test-libcpupower.bin                   \
>           test-libtracefs.bin                    \
> -         test-libcrypto.bin                     \
>           test-libunwind.bin                     \
>           test-libunwind-debug-frame.bin         \
>           test-libunwind-x86.bin                 \
> @@ -246,9 +245,6 @@ $(OUTPUT)test-libcpupower.bin:
>  $(OUTPUT)test-libtracefs.bin:
>  	 $(BUILD) $(shell $(PKG_CONFIG) --cflags libtracefs 2>/dev/null) -ltracefs
>  
> -$(OUTPUT)test-libcrypto.bin:
> -	$(BUILD) -lcrypto
> -
>  $(OUTPUT)test-gtk2.bin:
>  	$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
>  
> diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
> index 03ddaac6f4c4..ce72e2061ac0 100644
> --- a/tools/build/feature/test-all.c
> +++ b/tools/build/feature/test-all.c
> @@ -138,10 +138,6 @@
>  # include "test-bpf.c"
>  #undef main
>  
> -#define main main_test_libcrypto
> -# include "test-libcrypto.c"
> -#undef main
> -
>  #define main main_test_sdt
>  # include "test-sdt.c"
>  #undef main
> @@ -206,7 +202,6 @@ int main(int argc, char *argv[])
>  	main_test_lzma();
>  	main_test_get_cpuid();
>  	main_test_bpf();
> -	main_test_libcrypto();
>  	main_test_scandirat();
>  	main_test_sched_getcpu();
>  	main_test_sdt();
> diff --git a/tools/build/feature/test-libcrypto.c b/tools/build/feature/test-libcrypto.c
> deleted file mode 100644
> index bc34a5bbb504..000000000000
> --- a/tools/build/feature/test-libcrypto.c
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -#include <openssl/evp.h>
> -#include <openssl/sha.h>
> -#include <openssl/md5.h>
> -
> -int main(void)
> -{
> -	EVP_MD_CTX *mdctx;
> -	unsigned char md[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
> -	unsigned char dat[] = "12345";
> -	unsigned int digest_len;
> -
> -	mdctx = EVP_MD_CTX_new();
> -	if (!mdctx)
> -		return 0;
> -
> -	EVP_DigestInit_ex(mdctx, EVP_md5(), NULL);
> -	EVP_DigestUpdate(mdctx, &dat[0], sizeof(dat));
> -	EVP_DigestFinal_ex(mdctx, &md[0], &digest_len);
> -	EVP_MD_CTX_free(mdctx);
> -
> -	SHA1(&dat[0], sizeof(dat), &md[0]);
> -
> -	return 0;
> -}
> diff --git a/tools/perf/Documentation/perf-check.txt b/tools/perf/Documentation/perf-check.txt
> index a764a4629220..2b96cb578658 100644
> --- a/tools/perf/Documentation/perf-check.txt
> +++ b/tools/perf/Documentation/perf-check.txt
> @@ -53,7 +53,6 @@ feature::
>                  auxtrace                /  HAVE_AUXTRACE_SUPPORT
>                  libbfd                  /  HAVE_LIBBFD_SUPPORT
>                  libcapstone             /  HAVE_LIBCAPSTONE_SUPPORT
> -                libcrypto               /  HAVE_LIBCRYPTO_SUPPORT
>                  libdw-dwarf-unwind      /  HAVE_LIBDW_SUPPORT
>                  libelf                  /  HAVE_LIBELF_SUPPORT
>                  libnuma                 /  HAVE_LIBNUMA_SUPPORT
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index d1ea7bf44964..d19d1f132726 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -130,8 +130,6 @@ ifndef NO_LIBUNWIND
>    FEATURE_CHECK_LDFLAGS-libunwind-x86_64 += -lunwind -llzma -lunwind-x86_64
>  endif
>  
> -FEATURE_CHECK_LDFLAGS-libcrypto = -lcrypto
> -
>  ifdef CSINCLUDES
>    LIBOPENCSD_CFLAGS := -I$(CSINCLUDES)
>  endif
> @@ -772,17 +770,6 @@ ifneq ($(NO_LIBTRACEEVENT),1)
>    $(call detected,CONFIG_TRACE)
>  endif
>  
> -ifndef NO_LIBCRYPTO
> -  ifneq ($(feature-libcrypto), 1)
> -    $(warning No libcrypto.h found, disables jitted code injection, please install openssl-devel or libssl-dev)
> -    NO_LIBCRYPTO := 1
> -  else
> -    CFLAGS += -DHAVE_LIBCRYPTO_SUPPORT
> -    EXTLIBS += -lcrypto
> -    $(call detected,CONFIG_CRYPTO)
> -  endif
> -endif
> -
>  ifndef NO_SLANG
>    ifneq ($(feature-libslang), 1)
>      ifneq ($(feature-libslang-include-subdir), 1)
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index d4c7031b01a7..9246c94656e0 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -61,9 +61,6 @@ include ../scripts/utilities.mak
>  #
>  # Define NO_LIBBIONIC if you do not want bionic support
>  #
> -# Define NO_LIBCRYPTO if you do not want libcrypto (openssl) support
> -# used for generating build-ids for ELFs generated by jitdump.
> -#
>  # Define NO_LIBDW_DWARF_UNWIND if you do not want libdw support
>  # for dwarf backtrace post unwind.
>  #
> diff --git a/tools/perf/builtin-check.c b/tools/perf/builtin-check.c
> index 9a509cb3bb9a..ad49f2564aae 100644
> --- a/tools/perf/builtin-check.c
> +++ b/tools/perf/builtin-check.c
> @@ -44,7 +44,6 @@ struct feature_status supported_features[] = {
>  	FEATURE_STATUS("auxtrace", HAVE_AUXTRACE_SUPPORT),
>  	FEATURE_STATUS_TIP("libbfd", HAVE_LIBBFD_SUPPORT, "Deprecated, license incompatibility, use BUILD_NONDISTRO=1 and install binutils-dev[el]"),
>  	FEATURE_STATUS("libcapstone", HAVE_LIBCAPSTONE_SUPPORT),
> -	FEATURE_STATUS("libcrypto", HAVE_LIBCRYPTO_SUPPORT),
>  	FEATURE_STATUS("libdw-dwarf-unwind", HAVE_LIBDW_SUPPORT),
>  	FEATURE_STATUS("libelf", HAVE_LIBELF_SUPPORT),
>  	FEATURE_STATUS("libnuma", HAVE_LIBNUMA_SUPPORT),
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index 0ee94caf9ec1..e3651e5b195a 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -91,7 +91,6 @@ make_no_auxtrace    := NO_AUXTRACE=1
>  make_no_libbpf	    := NO_LIBBPF=1
>  make_libbpf_dynamic := LIBBPF_DYNAMIC=1
>  make_no_libbpf_DEBUG := NO_LIBBPF=1 DEBUG=1
> -make_no_libcrypto   := NO_LIBCRYPTO=1
>  make_no_libllvm     := NO_LIBLLVM=1
>  make_with_babeltrace:= LIBBABELTRACE=1
>  make_with_coresight := CORESIGHT=1
> @@ -122,7 +121,7 @@ make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_GTK2=1
>  make_minimal        += NO_DEMANGLE=1 NO_LIBELF=1 NO_BACKTRACE=1
>  make_minimal        += NO_LIBNUMA=1 NO_LIBBIONIC=1
>  make_minimal        += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
> -make_minimal        += NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1
> +make_minimal        += NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1
>  make_minimal        += NO_LIBCAP=1 NO_CAPSTONE=1
>  
>  # $(run) contains all available tests
> @@ -160,7 +159,6 @@ run += make_no_libbionic
>  run += make_no_auxtrace
>  run += make_no_libbpf
>  run += make_no_libbpf_DEBUG
> -run += make_no_libcrypto
>  run += make_no_libllvm
>  run += make_no_sdt
>  run += make_no_syscall_tbl
> -- 
> 2.49.0.1164.gab81da1b16-goog

  reply	other threads:[~2025-05-22 17:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-21 22:53 [PATCH v1 0/4] perf: Remove libcrypto dependency Yuzhuo Jing
2025-05-21 22:53 ` [PATCH v1 1/4] perf utils: Add support functions for sha1 utils Yuzhuo Jing
2025-05-21 22:53 ` [PATCH v1 2/4] perf tools: Add " Yuzhuo Jing
2025-05-22 17:03   ` Arnaldo Carvalho de Melo
2025-05-22 17:56   ` Arnaldo Carvalho de Melo
2025-06-04 18:17     ` Yuzhuo Jing
2025-06-06 18:27       ` Ian Rogers
2025-06-06 20:17         ` Arnaldo Carvalho de Melo
2025-05-21 22:53 ` [PATCH v1 3/4] perf genelf: Remove libcrypto dependency and use " Yuzhuo Jing
2025-05-22 17:05   ` Arnaldo Carvalho de Melo
2025-05-22 17:23     ` Arnaldo Carvalho de Melo
2025-05-21 22:53 ` [PATCH v1 4/4] tools: Remove libcrypto dependency Yuzhuo Jing
2025-05-22 17:30   ` Arnaldo Carvalho de Melo [this message]
2025-05-29 19:31 ` [PATCH v1 0/4] perf: " Ian Rogers
2025-05-29 20:24   ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aC9fGPZ2qb2dje0x@x1 \
    --to=acme@kernel.org \
    --cc=adhemerval.zanella@linaro.org \
    --cc=adityag@linux.ibm.com \
    --cc=adrian.hunter@intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=amadio@gentoo.org \
    --cc=ardb@kernel.org \
    --cc=atrajeev@linux.vnet.ibm.com \
    --cc=charlie@rivosinc.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=irogers@google.com \
    --cc=james.clark@linaro.org \
    --cc=jeff.johnson@oss.qualcomm.com \
    --cc=jolsa@kernel.org \
    --cc=justinstitt@google.com \
    --cc=kan.liang@linux.intel.com \
    --cc=kjain@linux.ibm.com \
    --cc=leo.yan@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=linux@treblig.org \
    --cc=llvm@lists.linux.dev \
    --cc=mark.rutland@arm.com \
    --cc=mhiramat@kernel.org \
    --cc=mingo@redhat.com \
    --cc=morbo@google.com \
    --cc=namhyung@kernel.org \
    --cc=nathan@kernel.org \
    --cc=nick.desaulniers+lkml@gmail.com \
    --cc=peterz@infradead.org \
    --cc=richard.weiyang@gmail.com \
    --cc=rostedt@goodmis.org \
    --cc=rppt@kernel.org \
    --cc=sesse@google.com \
    --cc=tglozar@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=yangjihong@bytedance.com \
    --cc=yuzhuo@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).