linux-kernel - Re: [PATCH] perf tools: Fix build errors on tsc functions for archs other than x86

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <56FE1FA5.4060206@intel.com>
Date:	Fri, 1 Apr 2016 10:13:41 +0300
From:	Adrian Hunter <adrian.hunter@...el.com>
To:	He Kuang <hekuang@...wei.com>, acme@...nel.org
Cc:	peterz@...radead.org, mingo@...hat.com,
	alexander.shishkin@...ux.intel.com, jolsa@...hat.com,
	jpoimboe@...hat.com, sukadev@...ux.vnet.ibm.com,
	eranian@...gle.com, wangnan0@...wei.com,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] perf tools: Fix build errors on tsc functions for archs
 other than x86

On 01/04/16 06:49, He Kuang wrote:
> Build errors on aarch64:
> 
>   libperf.a(libperf-in.o): In function `convert_timestamp':
>   util/jitdump.c:356: undefined reference to `tsc_to_perf_time'
>   collect2: error: ld returned 1 exit status
>   Makefile.perf:347: recipe for target 'perf' failed
>   make[1]: *** [perf] Error 1
>   Makefile:68: recipe for target 'all' failed
>   make: *** [all] Error 2

Sorry about that :-(

> 
> Since tsc conversion functions were moved out from arch dir, move
> 'tsc.h' out from x86 dir to make it possible to compile for other archs.

So this is the case where data can be collected on x86 and then processed on
another arch.

Originally, it wasn't wanted to be compiled in:

	http://marc.info/?l=linux-kernel&m=142445842131011

But that has been causing problems:

	http://marc.info/?l=linux-kernel&m=144109627003194

So this seems better.

> 
> Signed-off-by: He Kuang <hekuang@...wei.com>

Acked-by: Adrian Hunter <adrian.hunter@...el.com>

> ---
>  tools/perf/arch/x86/util/tsc.c |  1 -
>  tools/perf/arch/x86/util/tsc.h | 17 -----------------
>  tools/perf/util/Build          |  3 +--
>  tools/perf/util/tsc.h          | 11 ++++++++++-
>  4 files changed, 11 insertions(+), 21 deletions(-)
>  delete mode 100644 tools/perf/arch/x86/util/tsc.h
> 
> diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c
> index 70ff7c1..357f1b1 100644
> --- a/tools/perf/arch/x86/util/tsc.c
> +++ b/tools/perf/arch/x86/util/tsc.c
> @@ -7,7 +7,6 @@
>  #include <linux/types.h>
>  #include "../../util/debug.h"
>  #include "../../util/tsc.h"
> -#include "tsc.h"
>  
>  int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
>  			     struct perf_tsc_conversion *tc)
> diff --git a/tools/perf/arch/x86/util/tsc.h b/tools/perf/arch/x86/util/tsc.h
> deleted file mode 100644
> index 2edc4d3..0000000
> --- a/tools/perf/arch/x86/util/tsc.h
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#ifndef TOOLS_PERF_ARCH_X86_UTIL_TSC_H__
> -#define TOOLS_PERF_ARCH_X86_UTIL_TSC_H__
> -
> -#include <linux/types.h>
> -
> -struct perf_tsc_conversion {
> -	u16 time_shift;
> -	u32 time_mult;
> -	u64 time_zero;
> -};
> -
> -struct perf_event_mmap_page;
> -
> -int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
> -			     struct perf_tsc_conversion *tc);
> -
> -#endif /* TOOLS_PERF_ARCH_X86_UTIL_TSC_H__ */
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index da48fd8..85ceff3 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -69,8 +69,7 @@ libperf-y += stat-shadow.o
>  libperf-y += record.o
>  libperf-y += srcline.o
>  libperf-y += data.o
> -libperf-$(CONFIG_X86) += tsc.o
> -libperf-$(CONFIG_AUXTRACE) += tsc.o
> +libperf-y += tsc.o
>  libperf-y += cloexec.o
>  libperf-y += thread-stack.o
>  libperf-$(CONFIG_AUXTRACE) += auxtrace.o
> diff --git a/tools/perf/util/tsc.h b/tools/perf/util/tsc.h
> index 280ddc0..d5b11e2 100644
> --- a/tools/perf/util/tsc.h
> +++ b/tools/perf/util/tsc.h
> @@ -4,7 +4,16 @@
>  #include <linux/types.h>
>  
>  #include "event.h"
> -#include "../arch/x86/util/tsc.h"
> +
> +struct perf_tsc_conversion {
> +	u16 time_shift;
> +	u32 time_mult;
> +	u64 time_zero;
> +};
> +struct perf_event_mmap_page;
> +
> +int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,
> +			     struct perf_tsc_conversion *tc);
>  
>  u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc);
>  u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc);
>