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

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



It is only used 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/vhost.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 b3ad832d

tools/perf/Makefile.perf

+2 −3
Original line number Diff line number Diff line
@@ -580,11 +580,10 @@ $(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl) 
	$(Q)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > $@



vhost_virtio_ioctl_array := $(beauty_ioctl_outdir)/vhost_virtio_ioctl_array.c

vhost_virtio_hdr_dir := $(srctree)/tools/include/uapi/linux

vhost_virtio_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/vhost_virtio_ioctl.sh



$(vhost_virtio_ioctl_array): $(vhost_virtio_hdr_dir)/vhost.h $(vhost_virtio_ioctl_tbl)

	$(Q)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(vhost_virtio_hdr_dir) > $@

$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virtio_ioctl_tbl)

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



perf_ioctl_array := $(beauty_ioctl_outdir)/perf_ioctl_array.c

perf_hdr_dir := $(srctree)/tools/include/uapi/linux

tools/perf/check-headers.sh

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

  "include/uapi/linux/perf_event.h"

  "include/uapi/linux/seccomp.h"

  "include/uapi/linux/vhost.h"

  "include/linux/bits.h"

  "include/vdso/bits.h"

  "include/linux/const.h"
@@ -96,6 +95,7 @@ BEAUTY_FILES=( 
  "include/uapi/linux/sched.h"

  "include/uapi/linux/stat.h"

  "include/uapi/linux/usbdevice_fs.h"

  "include/uapi/linux/vhost.h"

  "include/uapi/sound/asound.h"

)

tools/perf/trace/beauty/vhost_virtio_ioctl.sh

+3 −3
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: LGPL-2.1



[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/

[ $# -eq 1 ] && beauty_uapi_linux_dir=$1 || beauty_uapi_linux_dir=tools/perf/trace/beauty/include/uapi/linux



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

regex='^#[[:space:]]*define[[:space:]]+VHOST_(\w+)[[:space:]]+_IOW?\([[:space:]]*VHOST_VIRTIO[[:space:]]*,[[:space:]]*(0x[[:xdigit:]]+).*'

grep -E $regex ${header_dir}/vhost.h | \

grep -E $regex ${beauty_uapi_linux_dir}/vhost.h | \

	sed -r "s/$regex/\2 \1/g"	| \

	sort | xargs printf "\t[%s] = \"%s\",\n"

printf "};\n"



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

regex='^#[[:space:]]*define[[:space:]]+VHOST_(\w+)[[:space:]]+_IOW?R\([[:space:]]*VHOST_VIRTIO[[:space:]]*,[[:space:]]*(0x[[:xdigit:]]+).*'

grep -E $regex ${header_dir}/vhost.h | \

grep -E $regex ${beauty_uapi_linux_dir}/vhost.h | \

	sed -r "s/$regex/\2 \1/g"	| \

	sort | xargs printf "\t[%s] = \"%s\",\n"

printf "};\n"