Commit 786c8248 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v6.11-2024-07-23' of... 

Merge tag 'perf-tools-fixes-for-v6.11-2024-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools

Pull perf tools fixes from Namhyung Kim:
 "Two fixes for building perf and other tools:

   - Fix breakage in tracing tools due to pkg-config for
     libtrace{event,fs}

   - Fix build of perf when libunwind is used"

* tag 'perf-tools-fixes-for-v6.11-2024-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
  perf dso: Fix build when libunwind is enabled
  tools/latency: Use pkg-config in lib_setup of Makefile.config
  tools/rtla: Use pkg-config in lib_setup of Makefile.config
  tools/verification: Use pkg-config in lib_setup of Makefile.config
  tools: Make pkg-config dependency checks usable by other tools
  perf build: Warn if libtracefs is not found
parents e9e96979 92717bc0

tools/build/Makefile.feature

+18 −0
Original line number Diff line number Diff line
@@ -149,6 +149,24 @@ FEATURE_DISPLAY ?= \ 
#

FEATURE_GROUP_MEMBERS-libbfd = libbfd-liberty libbfd-liberty-z



#

# Declare list of feature dependency packages that provide pkg-config files.

#

FEATURE_PKG_CONFIG ?=           \

         libtraceevent          \

         libtracefs



feature_pkg_config = $(eval $(feature_pkg_config_code))

define feature_pkg_config_code

  FEATURE_CHECK_CFLAGS-$(1) := $(shell $(PKG_CONFIG) --cflags $(1) 2>/dev/null)

  FEATURE_CHECK_LDFLAGS-$(1) := $(shell $(PKG_CONFIG) --libs $(1) 2>/dev/null)

endef



# Set FEATURE_CHECK_(C|LD)FLAGS-$(package) for packages using pkg-config.

ifneq ($(PKG_CONFIG),)

  $(foreach package,$(FEATURE_PKG_CONFIG),$(call feature_pkg_config,$(package)))

endif



# Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.

# If in the future we need per-feature checks/flags for features not

# mentioned in this list we need to refactor this ;-).

tools/perf/Makefile.config

+5 −8
Original line number Diff line number Diff line
@@ -182,20 +182,15 @@ endif 
FEATURE_CHECK_CFLAGS-libzstd := $(LIBZSTD_CFLAGS)

FEATURE_CHECK_LDFLAGS-libzstd := $(LIBZSTD_LDFLAGS)



# for linking with debug library, run like:

# make DEBUG=1 PKG_CONFIG_PATH=/opt/libtraceevent/(lib|lib64)/pkgconfig



ifneq ($(NO_LIBTRACEEVENT),1)

  ifeq ($(call get-executable,$(PKG_CONFIG)),)

    $(error Error: $(PKG_CONFIG) needed by libtraceevent is missing on this system, please install it)

  endif

endif



# for linking with debug library, run like:

# make DEBUG=1 PKG_CONFIG_PATH=/opt/libtraceevent/(lib|lib64)/pkgconfig

FEATURE_CHECK_CFLAGS-libtraceevent := $(shell $(PKG_CONFIG) --cflags libtraceevent 2>/dev/null)

FEATURE_CHECK_LDFLAGS-libtraceevent := $(shell $(PKG_CONFIG) --libs libtraceevent 2>/dev/null)



FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs 2>/dev/null)

FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs 2>/dev/null)



FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi

# include ARCH specific config

-include $(src-perf)/arch/$(SRCARCH)/Makefile
@@ -1206,6 +1201,8 @@ ifneq ($(NO_LIBTRACEEVENT),1) 
    LIBTRACEFS_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEFS_VERSION)))

    LIBTRACEFS_VERSION_CPP := $(shell expr $(LIBTRACEFS_VERSION_1) \* 255 \* 255 + $(LIBTRACEFS_VERSION_2) \* 255 + $(LIBTRACEFS_VERSION_3))

    CFLAGS += -DLIBTRACEFS_VERSION=$(LIBTRACEFS_VERSION_CPP)

  else

    $(warning libtracefs is missing. Please install libtracefs-dev/libtracefs-devel)

  endif

endif

tools/perf/util/dso.c

+1 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ void dso__delete(struct dso *dso) 
	auxtrace_cache__free(RC_CHK_ACCESS(dso)->auxtrace_cache);

	dso_cache__free(dso);

	dso__free_a2l(dso);

	zfree(&RC_CHK_ACCESS(dso)->symsrc_filename);

	dso__free_symsrc_filename(dso);

	nsinfo__zput(RC_CHK_ACCESS(dso)->nsinfo);

	mutex_destroy(dso__lock(dso));

	RC_CHK_FREE(dso);

tools/perf/util/dso.h

+5 −0
Original line number Diff line number Diff line
@@ -602,6 +602,11 @@ static inline void dso__set_symsrc_filename(struct dso *dso, char *val) 
	RC_CHK_ACCESS(dso)->symsrc_filename = val;

}



static inline void dso__free_symsrc_filename(struct dso *dso)

{

	zfree(&RC_CHK_ACCESS(dso)->symsrc_filename);

}



static inline enum dso_binary_type dso__symtab_type(const struct dso *dso)

{

	return RC_CHK_ACCESS(dso)->symtab_type;

tools/perf/util/unwind-libunwind-local.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int read_unwind_spec_debug_frame(struct dso *dso, 
							__func__,

							dso__symsrc_filename(dso),

							debuglink);

					zfree(&dso__symsrc_filename(dso));

					dso__free_symsrc_filename(dso);

				}

				dso__set_symsrc_filename(dso, debuglink);

			} else {