Commit 14df9235 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.15-2021-10-07' of... 

Merge tag 'perf-tools-fixes-for-v5.15-2021-10-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix plugin static linking with libopencsd on ARM and ARM64

 - Add missing -lstdc++ when linking with libopencsd

 - Add missing topdown metrics events to 'perf test attr'

 - Plug leak sys_event_tables list after processing JSON vendor events
   entries

 - Sync sound/asound.h copy with the kernel sources

* tag 'perf-tools-fixes-for-v5.15-2021-10-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf tests attr: Add missing topdown metrics events
  tools include UAPI: Sync sound/asound.h copy with the kernel sources
  perf build: Fix plugin static linking with libopencsd on ARM and ARM64
  perf build: Add missing -lstdc++ when linking with libopencsd
  perf jevents: Free the sys_event_tables list after processing entries
parents 4a16df54 0b6c5371

tools/include/uapi/sound/asound.h

+1 −0
Original line number Diff line number Diff line
@@ -784,6 +784,7 @@ struct snd_rawmidi_status { 


#define SNDRV_RAWMIDI_IOCTL_PVERSION	_IOR('W', 0x00, int)

#define SNDRV_RAWMIDI_IOCTL_INFO	_IOR('W', 0x01, struct snd_rawmidi_info)

#define SNDRV_RAWMIDI_IOCTL_USER_PVERSION _IOW('W', 0x02, int)

#define SNDRV_RAWMIDI_IOCTL_PARAMS	_IOWR('W', 0x10, struct snd_rawmidi_params)

#define SNDRV_RAWMIDI_IOCTL_STATUS	_IOWR('W', 0x20, struct snd_rawmidi_status)

#define SNDRV_RAWMIDI_IOCTL_DROP	_IOW('W', 0x30, int)

tools/perf/Makefile.config

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ FEATURE_CHECK_LDFLAGS-libcrypto = -lcrypto 
ifdef CSINCLUDES

  LIBOPENCSD_CFLAGS := -I$(CSINCLUDES)

endif

OPENCSDLIBS := -lopencsd_c_api -lopencsd

OPENCSDLIBS := -lopencsd_c_api -lopencsd -lstdc++

ifdef CSLIBS

  LIBOPENCSD_LDFLAGS := -L$(CSLIBS)

endif

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ endif 


$(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h)



LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 'EXTRA_CFLAGS=$(EXTRA_CFLAGS)' 'LDFLAGS=$(LDFLAGS)'

LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 'EXTRA_CFLAGS=$(EXTRA_CFLAGS)' 'LDFLAGS=$(filter-out -static,$(LDFLAGS))'



$(LIBTRACEEVENT): FORCE

	$(Q)$(MAKE) -C $(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) O=$(OUTPUT) $(OUTPUT)libtraceevent.a

tools/perf/pmu-events/jevents.c

+2 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,7 @@ int main(int argc, char *argv[]) 
	}



	free_arch_std_events();

	free_sys_event_tables();

	free(mapfile);

	return 0;
@@ -1306,6 +1307,7 @@ int main(int argc, char *argv[]) 
		create_empty_mapping(output_file);

err_out:

	free_arch_std_events();

	free_sys_event_tables();

	free(mapfile);

	return ret;

}

tools/perf/tests/attr/test-stat-default

+97 −0
Original line number Diff line number Diff line
@@ -68,3 +68,100 @@ fd=10 
type=0

config=5

optional=1



# PERF_TYPE_RAW / slots (0x400)

[event11:base-stat]

fd=11

group_fd=-1

type=4

config=1024

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-retiring (0x8000)

[event12:base-stat]

fd=12

group_fd=11

type=4

config=32768

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-bad-spec (0x8100)

[event13:base-stat]

fd=13

group_fd=11

type=4

config=33024

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-fe-bound (0x8200)

[event14:base-stat]

fd=14

group_fd=11

type=4

config=33280

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-be-bound (0x8300)

[event15:base-stat]

fd=15

group_fd=11

type=4

config=33536

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-heavy-ops (0x8400)

[event16:base-stat]

fd=16

group_fd=11

type=4

config=33792

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-br-mispredict (0x8500)

[event17:base-stat]

fd=17

group_fd=11

type=4

config=34048

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-fetch-lat (0x8600)

[event18:base-stat]

fd=18

group_fd=11

type=4

config=34304

disabled=0

enable_on_exec=0

read_format=15

optional=1



# PERF_TYPE_RAW / topdown-mem-bound (0x8700)

[event19:base-stat]

fd=19

group_fd=11

type=4

config=34560

disabled=0

enable_on_exec=0

read_format=15

optional=1