From nobody Sun Feb 8 07:21:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 706B43BBF8; Fri, 15 Mar 2024 14:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710512729; cv=none; b=s5KVzNaOrO0OKnc40SQNVRjtKhKv0CAoorPgiVKeadmg04RYLs56nycgSm/Or0j9nl50i+X12/4asBD0bxrGYsV/AcHmevkQ4SJWPo2KOQmNoB4u2QDFmBC+Vrc6/3UApWexdZEsXn3/y2ApBRov0QkbxuQTY0NAvor+HdvCrj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710512729; c=relaxed/simple; bh=spCdXPyAduE0DcQHiqfxpNxoQQ+cPRYp9CjjQg2iIFQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s+V148nWIJDOVTsutfYOdPgaa6PUQi0zj/PkBrc7bQw6oIKgMbEgD/VcCq8aYk/KgisS1Y1Ztbbq21bORemAs4XPEjG27ek9iMoCcfoWZ1Y42EnLcTOBqHujhfUw4bmxggZKv7w9QNruVqWZbKVkPBS4N57P/MaDl6KAUe/Nbic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tflolLaA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tflolLaA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 474EBC43399; Fri, 15 Mar 2024 14:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710512729; bh=spCdXPyAduE0DcQHiqfxpNxoQQ+cPRYp9CjjQg2iIFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tflolLaA1xVDxlY5Y7plAbuV/exgzYI0PW+xkEX5nwJ7nXtTtQroapsaCjUHnsGgo ZsAcoVrYwpsGP2oOex4xkMZpos/0fj74HrmwPf43bcTTOLb9oSGFFeaEY3KbjWhoVA 3yoLZHF1J7PeJGazkTL/XL5t/YGwXMm2RL8h0qpEu5X8vxMj5yVQnkVCy5zItbxnmi z/hqjVEZ+rmMkydb3cYV2RxvhSRkUhP9YyfmnzJJNsZ3gzzFH4DcSy9T3cIgJ9eDbt DpESvey8gWlRSF4ag235p9BVqf9HwvlkxVUh7jl6epWlvuc3wPMr0pr5tp09CTw7Yk 5lCFLZKqx19CA== From: Daniel Bristot de Oliveira To: Linus Torvalds , Steven Rostedt , Arnaldo Carvalho de Melo Cc: Daniel Bristot de Oliveira , Josh Poimboeuf , John Kacur , Namhyung Kim , Jiri Olsa , linux-perf-users@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 3/3] tools/verification: Use tools/build makefiles on rv Date: Fri, 15 Mar 2024 15:25:01 +0100 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use tools/build/ makefiles to build rv, inheriting the benefits of it. For example, having a proper way to handle dependencies. Suggested-by: Linus Torvalds Signed-off-by: Daniel Bristot de Oliveira --- tools/verification/rv/.gitignore | 6 + tools/verification/rv/Build | 1 + tools/verification/rv/Makefile | 207 +++++++++----------------- tools/verification/rv/Makefile.config | 47 ++++++ tools/verification/rv/Makefile.rv | 51 +++++++ tools/verification/rv/src/Build | 4 + 6 files changed, 183 insertions(+), 133 deletions(-) create mode 100644 tools/verification/rv/.gitignore create mode 100644 tools/verification/rv/Build create mode 100644 tools/verification/rv/Makefile.config create mode 100644 tools/verification/rv/Makefile.rv create mode 100644 tools/verification/rv/src/Build diff --git a/tools/verification/rv/.gitignore b/tools/verification/rv/.giti= gnore new file mode 100644 index 000000000000..34a486585a34 --- /dev/null +++ b/tools/verification/rv/.gitignore @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only +rv +rv-static +fixdep +feature +FEATURE-DUMP diff --git a/tools/verification/rv/Build b/tools/verification/rv/Build new file mode 100644 index 000000000000..a44c22349d4b --- /dev/null +++ b/tools/verification/rv/Build @@ -0,0 +1 @@ +rv-y +=3D src/ diff --git a/tools/verification/rv/Makefile b/tools/verification/rv/Makefile index 485f8aeddbe0..411d62b3d8eb 100644 --- a/tools/verification/rv/Makefile +++ b/tools/verification/rv/Makefile @@ -1,146 +1,87 @@ -NAME :=3D rv -# Follow the kernel version -VERSION :=3D $(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelv= ersion | grep -v make) - -# From libtracefs: -# Makefiles suck: This macro sets a default value of $(2) for the -# variable named by $(1), unless the variable has been set by -# environment or command line. This is necessary for CC and AR -# because make sets default values, so the simpler ?=3D approach -# won't work as expected. -define allow-override - $(if $(or $(findstring environment,$(origin $(1))),\ - $(findstring command line,$(origin $(1)))),,\ - $(eval $(1) =3D $(2))) -endef - -# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix. -$(call allow-override,CC,$(CROSS_COMPILE)gcc) -$(call allow-override,AR,$(CROSS_COMPILE)ar) -$(call allow-override,STRIP,$(CROSS_COMPILE)strip) -$(call allow-override,PKG_CONFIG,pkg-config) -$(call allow-override,LD_SO_CONF_PATH,/etc/ld.so.conf.d/) -$(call allow-override,LDCONFIG,ldconfig) - -INSTALL =3D install -MKDIR =3D mkdir -FOPTS :=3D -flto=3Dauto -ffat-lto-objects -fexceptions -fstack-protector-s= trong \ - -fasynchronous-unwind-tables -fstack-clash-protection -WOPTS :=3D -Wall -Werror=3Dformat-security -Wp,-D_FORTIFY_SOURCE=3D2 -Wp,= -D_GLIBCXX_ASSERTIONS -Wno-maybe-uninitialized - -ifeq ($(CC),clang) - FOPTS :=3D $(filter-out -ffat-lto-objects, $(FOPTS)) - WOPTS :=3D $(filter-out -Wno-maybe-uninitialized, $(WOPTS)) +# SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(srctree),) + srctree :=3D $(patsubst %/,%,$(dir $(CURDIR))) + srctree :=3D $(patsubst %/,%,$(dir $(srctree))) + srctree :=3D $(patsubst %/,%,$(dir $(srctree))) endif =20 -TRACEFS_HEADERS :=3D $$($(PKG_CONFIG) --cflags libtracefs) - -CFLAGS :=3D -O -g -DVERSION=3D\"$(VERSION)\" $(FOPTS) $(MOPTS) $(WOPTS) $(= TRACEFS_HEADERS) $(EXTRA_CFLAGS) -I include -LDFLAGS :=3D -flto=3Dauto -ggdb $(EXTRA_LDFLAGS) -LIBS :=3D $$($(PKG_CONFIG) --libs libtracefs) - -SRC :=3D $(wildcard src/*.c) -HDR :=3D $(wildcard src/*.h) -OBJ :=3D $(SRC:.c=3D.o) -DIRS :=3D src -FILES :=3D Makefile README.txt -CEXT :=3D bz2 -TARBALL :=3D $(NAME)-$(VERSION).tar.$(CEXT) -TAROPTS :=3D -cvjf $(TARBALL) -BINDIR :=3D /usr/bin -DATADIR :=3D /usr/share -DOCDIR :=3D $(DATADIR)/doc -MANDIR :=3D $(DATADIR)/man -LICDIR :=3D $(DATADIR)/licenses -SRCTREE :=3D $(or $(BUILD_SRC),$(CURDIR)) - -# If running from the tarball, man pages are stored in the Documentation -# dir. If running from the kernel source, man pages are stored in -# Documentation/tools/rv/. -ifneq ($(wildcard Documentation/.*),) -DOCSRC =3D Documentation/ +include $(srctree)/tools/scripts/Makefile.include + +# O is an alias for OUTPUT +OUTPUT :=3D $(O) + +ifeq ($(OUTPUT),) + OUTPUT :=3D $(CURDIR)/ else -DOCSRC =3D $(SRCTREE)/../../../Documentation/tools/rv/ + # subdir is used by the ../Makefile in $(call descend,) + ifneq ($(subdir),) + OUTPUT :=3D $(OUTPUT)/$(subdir) + endif +endif + +ifneq ($(patsubst %/,,$(lastword $(OUTPUT))),) + OUTPUT :=3D $(OUTPUT)/ endif =20 -LIBTRACEEVENT_MIN_VERSION =3D 1.5 -LIBTRACEFS_MIN_VERSION =3D 1.3 +RV :=3D $(OUTPUT)rv +RV_IN :=3D $(RV)-in.o =20 -.PHONY: all warnings show_warnings -all: warnings rv +VERSION :=3D $(shell sh -c "make -sC ../../.. kernelversion | grep -v mak= e") +DOCSRC :=3D ../../../Documentation/tools/rv/ =20 -TEST_LIBTRACEEVENT =3D $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LI= BTRACEEVENT_MIN_VERSION) libtraceevent > /dev/null 2>&1 || echo n") -ifeq ("$(TEST_LIBTRACEEVENT)", "n") -WARNINGS =3D show_warnings -MISSING_LIBS +=3D echo "** libtraceevent version $(LIBTRACEEVENT_MIN_VER= SION) or higher"; -MISSING_PACKAGES +=3D "libtraceevent-devel" -MISSING_SOURCE +=3D echo "** https://git.kernel.org/pub/scm/libs/libtrace= /libtraceevent.git/ "; +FEATURE_TESTS :=3D libtraceevent +FEATURE_TESTS +=3D libtracefs +FEATURE_DISPLAY :=3D libtraceevent +FEATURE_DISPLAY +=3D libtracefs + +ifeq ($(V),1) + Q =3D +else + Q =3D @ endif =20 -TEST_LIBTRACEFS =3D $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTR= ACEFS_MIN_VERSION) libtracefs > /dev/null 2>&1 || echo n") -ifeq ("$(TEST_LIBTRACEFS)", "n") -WARNINGS =3D show_warnings -MISSING_LIBS +=3D echo "** libtracefs version $(LIBTRACEFS_MIN_VERSION) = or higher"; -MISSING_PACKAGES +=3D "libtracefs-devel" -MISSING_SOURCE +=3D echo "** https://git.kernel.org/pub/scm/libs/libtrace= /libtracefs.git/ "; +all: $(RV) + +include $(srctree)/tools/build/Makefile.include +include Makefile.rv + +# check for dependencies only on required targets +NON_CONFIG_TARGETS :=3D clean install doc doc_clean doc_install + +config :=3D 1 +ifdef MAKECMDGOALS + ifeq ($(filter-out $(NON_CONFIG_TARGETS),$(MAKECMDGOALS)),) + config :=3D 0 +endif endif =20 -define show_dependencies - @echo "********************************************"; \ - echo "** NOTICE: Failed build dependencies"; \ - echo "**"; \ - echo "** Required Libraries:"; \ - $(MISSING_LIBS) \ - echo "**"; \ - echo "** Consider installing the latest libtracefs from your"; \ - echo "** distribution, e.g., 'dnf install $(MISSING_PACKAGES)' on Fedora,= "; \ - echo "** or from source:"; \ - echo "**"; \ - $(MISSING_SOURCE) \ - echo "**"; \ - echo "********************************************" -endef - -show_warnings: - $(call show_dependencies); - -ifneq ("$(WARNINGS)", "") -ERROR_OUT =3D $(error Please add the necessary dependencies) - -warnings: $(WARNINGS) - $(ERROR_OUT) +ifeq ($(config),1) + include $(srctree)/tools/build/Makefile.feature + include Makefile.config endif =20 -rv: $(OBJ) - $(CC) -o rv $(LDFLAGS) $(OBJ) $(LIBS) - -.PHONY: install -install: doc_install - $(MKDIR) -p $(DESTDIR)$(BINDIR) - $(INSTALL) rv -m 755 $(DESTDIR)$(BINDIR) - $(STRIP) $(DESTDIR)$(BINDIR)/rv - -.PHONY: clean tarball -clean: doc_clean - @test ! -f rv || rm rv - @test ! -f $(TARBALL) || rm -f $(TARBALL) - @rm -rf *~ $(OBJ) *.tar.$(CEXT) - -tarball: clean - rm -rf $(NAME)-$(VERSION) && mkdir $(NAME)-$(VERSION) - echo $(VERSION) > $(NAME)-$(VERSION)/VERSION - cp -r $(DIRS) $(FILES) $(NAME)-$(VERSION) - mkdir $(NAME)-$(VERSION)/Documentation/ - cp -rp $(SRCTREE)/../../../Documentation/tools/rv/* $(NAME)-$(VERSION)/Do= cumentation/ - tar $(TAROPTS) --exclude=3D'*~' $(NAME)-$(VERSION) - rm -rf $(NAME)-$(VERSION) - -.PHONY: doc doc_clean doc_install -doc: - $(MAKE) -C $(DOCSRC) - -doc_clean: - $(MAKE) -C $(DOCSRC) clean - -doc_install: - $(MAKE) -C $(DOCSRC) install +CFLAGS +=3D $(INCLUDES) $(LIB_INCLUDES) + +export CFLAGS OUTPUT srctree + +$(RV): $(RV_IN) + $(QUIET_LINK)$(CC) $(LDFLAGS) -o $(RV) $(RV_IN) $(EXTLIBS) + +static: $(RV_IN) + $(eval LDFLAGS +=3D -static) + $(QUIET_LINK)$(CC) $(LDFLAGS) -o $(RV)-static $(RV_IN) $(EXTLIBS) + +rv.%: fixdep FORCE + make -f $(srctree)/tools/build/Makefile.build dir=3D. $@ + +$(RV_IN): fixdep FORCE + make $(build)=3Drv + +clean: doc_clean fixdep-clean + $(call QUIET_CLEAN, rv) + $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d= ' -delete + $(Q)rm -f rv rv-static fixdep FEATURE-DUMP rv-* + $(Q)rm -rf feature + +.PHONY: FORCE clean diff --git a/tools/verification/rv/Makefile.config b/tools/verification/rv/= Makefile.config new file mode 100644 index 000000000000..6d4ba77847b6 --- /dev/null +++ b/tools/verification/rv/Makefile.config @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: GPL-2.0-only + +STOP_ERROR :=3D + +LIBTRACEEVENT_MIN_VERSION =3D 1.5 +LIBTRACEFS_MIN_VERSION =3D 1.3 + +define lib_setup + $(eval LIB_INCLUDES +=3D $(shell sh -c "$(PKG_CONFIG) --cflags lib$(1)")) + $(eval EXTLIBS +=3D -l$(1)) +endef + +$(call feature_check,libtraceevent) +ifeq ($(feature-libtraceevent), 1) + $(call detected,CONFIG_LIBTRACEEVENT) + + TEST =3D $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEEVENT_= MIN_VERSION) libtraceevent > /dev/null 2>&1 && echo y || echo n") + ifeq ($(TEST),n) + $(info libtraceevent version is too low, it must be at least $(LIBTRAC= EEVENT_MIN_VERSION)) + STOP_ERROR :=3D 1 + endif + + $(call lib_setup,traceevent) +else + STOP_ERROR :=3D 1 + $(info libtraceevent is missing. Please install libtraceevent-dev/libtra= ceevent-devel) +endif + +$(call feature_check,libtracefs) +ifeq ($(feature-libtracefs), 1) + $(call detected,CONFIG_LIBTRACEFS) + + TEST =3D $(shell sh -c "$(PKG_CONFIG) --atleast-version $(LIBTRACEFS_MIN= _VERSION) libtracefs > /dev/null 2>&1 && echo y || echo n") + ifeq ($(TEST),n) + $(info libtracefs version is too low, it must be at least $(LIBTRACEFS= _MIN_VERSION)) + STOP_ERROR :=3D 1 + endif + + $(call lib_setup,tracefs) +else + STOP_ERROR :=3D 1 + $(info libtracefs is missing. Please install libtracefs-dev/libtracefs-d= evel) +endif + +ifeq ($(STOP_ERROR),1) + $(error Please, check the errors above.) +endif diff --git a/tools/verification/rv/Makefile.rv b/tools/verification/rv/Make= file.rv new file mode 100644 index 000000000000..161baa29eb86 --- /dev/null +++ b/tools/verification/rv/Makefile.rv @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0-only + +define allow-override + $(if $(or $(findstring environment,$(origin $(1))),\ + $(findstring command line,$(origin $(1)))),,\ + $(eval $(1) =3D $(2))) +endef + +# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix. +$(call allow-override,CC,$(CROSS_COMPILE)gcc) +$(call allow-override,AR,$(CROSS_COMPILE)ar) +$(call allow-override,STRIP,$(CROSS_COMPILE)strip) +$(call allow-override,PKG_CONFIG,pkg-config) +$(call allow-override,LD_SO_CONF_PATH,/etc/ld.so.conf.d/) +$(call allow-override,LDCONFIG,ldconfig) +export CC AR STRIP PKG_CONFIG LD_SO_CONF_PATH LDCONFIG + +FOPTS :=3D-flto=3Dauto -ffat-lto-objects -fexceptions -fstack-protector-s= trong \ + -fasynchronous-unwind-tables -fstack-clash-protection +WOPTS :=3D -O -Wall -Werror=3Dformat-security -Wp,-D_FORTIFY_SOURCE=3D2 \ + -Wp,-D_GLIBCXX_ASSERTIONS -Wno-maybe-uninitialized + +ifeq ($(CC),clang) + FOPTS :=3D $(filter-out -flto=3Dauto -ffat-lto-objects, $(FOPTS)) + WOPTS :=3D $(filter-out -Wno-maybe-uninitialized, $(WOPTS)) +endif + +INCLUDE :=3D -Iinclude/ +CFLAGS :=3D -g -DVERSION=3D\"$(VERSION)\" $(FOPTS) $(WOPTS) $(EXTRA_CFLAG= S) $(INCLUDE) +LDFLAGS :=3D -ggdb $(EXTRA_LDFLAGS) + +INSTALL :=3D install +MKDIR :=3D mkdir +STRIP :=3D strip +BINDIR :=3D /usr/bin + +.PHONY: install +install: doc_install + $(Q)$(MKDIR) -p $(DESTDIR)$(BINDIR) + $(call QUIET_INSTALL,rv)$(INSTALL) $(OUTPUT)rv -m 755 $(DESTDIR)$(BINDIR) + $(Q)@$(STRIP) $(DESTDIR)$(BINDIR)/rv + +.PHONY: doc doc_clean doc_install +doc: + $(MAKE) -C $(DOCSRC) + +doc_clean: + $(MAKE) -C $(DOCSRC) clean + +doc_install: + $(MAKE) -C $(DOCSRC) install diff --git a/tools/verification/rv/src/Build b/tools/verification/rv/src/Bu= ild new file mode 100644 index 000000000000..d781983c1a79 --- /dev/null +++ b/tools/verification/rv/src/Build @@ -0,0 +1,4 @@ +rv-y +=3D trace.o +rv-y +=3D utils.o +rv-y +=3D in_kernel.o +rv-y +=3D rv.o --=20 2.44.0