Commit ab331611 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf beauty: Move uapi/linux/mount.h copy out of the directory used to build perf 



It is mostly used only to generate string tables, not to build perf, so
move it to the tools/perf/trace/beauty/include/ hierarchy, that is used
just for scraping.

This is a something that should've have happened, as happened with the
linux/socket.h scrapper, do it now as Ian suggested while doing an
audit/refactor session in the headers used by perf.

No other tools/ living code uses it, just <linux/mount.h> coming from
either 'make install_headers' or from the system /usr/include/
directory.

Suggested-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/CAP-5=fWZVrpRufO4w-S4EcSi9STXcTAN2ERLwTSN7yrSSA-otQ@mail.gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 22916d2c

tools/perf/Makefile.perf

+10 −11
Original line number Diff line number Diff line
@@ -500,20 +500,20 @@ $(fadvise_advice_array): $(linux_uapi_dir)/in.h $(fadvise_advice_tbl) 
fsmount_arrays := $(beauty_outdir)/fsmount_arrays.c

fsmount_tbls := $(srctree)/tools/perf/trace/beauty/fsmount.sh



$(fsmount_arrays): $(linux_uapi_dir)/mount.h $(fsmount_tbls)

	$(Q)$(SHELL) '$(fsmount_tbls)' $(linux_uapi_dir) > $@

$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls)

	$(Q)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@



fspick_arrays := $(beauty_outdir)/fspick_arrays.c

fspick_tbls := $(srctree)/tools/perf/trace/beauty/fspick.sh



$(fspick_arrays): $(linux_uapi_dir)/mount.h $(fspick_tbls)

	$(Q)$(SHELL) '$(fspick_tbls)' $(linux_uapi_dir) > $@

$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls)

	$(Q)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir) > $@



fsconfig_arrays := $(beauty_outdir)/fsconfig_arrays.c

fsconfig_tbls := $(srctree)/tools/perf/trace/beauty/fsconfig.sh



$(fsconfig_arrays): $(linux_uapi_dir)/mount.h $(fsconfig_tbls)

	$(Q)$(SHELL) '$(fsconfig_tbls)' $(linux_uapi_dir) > $@

$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls)

	$(Q)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_dir) > $@



pkey_alloc_access_rights_array := $(beauty_outdir)/pkey_alloc_access_rights_array.c

asm_generic_hdr_dir := $(srctree)/tools/include/uapi/asm-generic/
@@ -598,15 +598,14 @@ $(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl) 
mount_flags_array := $(beauty_outdir)/mount_flags_array.c

mount_flags_tbl := $(srctree)/tools/perf/trace/beauty/mount_flags.sh



$(mount_flags_array): $(linux_uapi_dir)/mount.h $(mount_flags_tbl)

	$(Q)$(SHELL) '$(mount_flags_tbl)' $(linux_uapi_dir) > $@

$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl)

	$(Q)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@



move_mount_flags_array := $(beauty_outdir)/move_mount_flags_array.c

move_mount_flags_tbl := $(srctree)/tools/perf/trace/beauty/move_mount_flags.sh



$(move_mount_flags_array): $(linux_uapi_dir)/mount.h $(move_mount_flags_tbl)

	$(Q)$(SHELL) '$(move_mount_flags_tbl)' $(linux_uapi_dir) > $@



$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_flags_tbl)

	$(Q)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@



mmap_prot_array := $(beauty_outdir)/mmap_prot_array.c

mmap_prot_tbl := $(srctree)/tools/perf/trace/beauty/mmap_prot.sh

tools/perf/check-headers.sh

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ FILES=( 
  "include/uapi/linux/kcmp.h"

  "include/uapi/linux/kvm.h"

  "include/uapi/linux/in.h"

  "include/uapi/linux/mount.h"

  "include/uapi/linux/openat2.h"

  "include/uapi/linux/perf_event.h"

  "include/uapi/linux/prctl.h"
@@ -98,6 +97,7 @@ declare -a BEAUTY_FILES 
BEAUTY_FILES=(

  "include/linux/socket.h"

  "include/uapi/linux/fs.h"

  "include/uapi/linux/mount.h"

)



declare -a FAILURES

tools/perf/trace/beauty/fsconfig.sh

+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
# SPDX-License-Identifier: LGPL-2.1



if [ $# -ne 1 ] ; then

	linux_header_dir=tools/include/uapi/linux

	beauty_uapi_linux_dir=tools/perf/trace/beauty/include/uapi/linux/

else

	linux_header_dir=$1

	beauty_uapi_linux_dir=$1

fi



linux_mount=${linux_header_dir}/mount.h

linux_mount=${beauty_uapi_linux_dir}/mount.h



printf "static const char *fsconfig_cmds[] = {\n"

ms='[[:space:]]*'

tools/perf/trace/beauty/fsmount.sh

+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
# SPDX-License-Identifier: LGPL-2.1



if [ $# -ne 1 ] ; then

	linux_header_dir=tools/include/uapi/linux

	beauty_uapi_linux_dir=tools/perf/trace/beauty/include/uapi/linux/

else

	linux_header_dir=$1

	beauty_uapi_linux_dir=$1

fi



linux_mount=${linux_header_dir}/mount.h

linux_mount=${beauty_uapi_linux_dir}/mount.h



# Remove MOUNT_ATTR_RELATIME as it is zeros, handle it a special way in the beautifier

# Only handle MOUNT_ATTR_ followed by a capital letter/num as __ is special case

tools/perf/trace/beauty/fspick.sh

+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
# SPDX-License-Identifier: LGPL-2.1



if [ $# -ne 1 ] ; then

	linux_header_dir=tools/include/uapi/linux

	beauty_uapi_linux_dir=tools/perf/trace/beauty/include/uapi/linux/

else

	linux_header_dir=$1

	beauty_uapi_linux_dir=$1

fi



linux_mount=${linux_header_dir}/mount.h

linux_mount=${beauty_uapi_linux_dir}/mount.h



printf "static const char *fspick_flags[] = {\n"

regex='^[[:space:]]*#[[:space:]]*define[[:space:]]+FSPICK_([[:alnum:]_]+)[[:space:]]+(0x[[:xdigit:]]+)[[:space:]]*.*'