Commit 03fca3af authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

perf tsc: Move out common functions from x86 



Functions perf_read_tsc_conversion() and perf_event__synth_time_conv()
should work as common functions rather than x86 specific, so move these
two functions out from arch/x86 folder and place them into util/tsc.c.

Since the function perf_event__synth_time_conv() will be linked in
util/tsc.c, remove its weak version.

Committer testing:

Before/after:

  # perf test tsc
  70: Convert perf time to TSC                                        : Ok
  #
  # perf test -v tsc
  70: Convert perf time to TSC                                        :
  --- start ---
  test child forked, pid 8520
  mmap size 528384B
  1st event perf time 592110439891 tsc 2317172044331
  rdtsc          time 592110441915 tsc 2317172052010
  2nd event perf time 592110442336 tsc 2317172053605
  test child finished with 0
  ---- end ----
  Convert perf time to TSC: Ok
  #

Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kemeng Shi <shikemeng@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Gasson <nick.gasson@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Remi Bernon <rbernon@codeweavers.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Steve Maclean <steve.maclean@microsoft.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zou Wei <zou_wei@huawei.com>
Link: http://lore.kernel.org/lkml/20200914115311.2201-2-leo.yan@linaro.org


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

tools/perf/arch/x86/util/tsc.c

+1 −72
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <stdbool.h>

#include <errno.h>



#include <linux/stddef.h>

#include <linux/perf_event.h>



#include <linux/types.h>

#include <asm/barrier.h>

#include "../../../util/debug.h"

#include "../../../util/event.h"

#include "../../../util/synthetic-events.h"

#include "../../../util/tsc.h"



int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,

			     struct perf_tsc_conversion *tc)

{

	bool cap_user_time_zero;

	u32 seq;

	int i = 0;



	while (1) {

		seq = pc->lock;

		rmb();

		tc->time_mult = pc->time_mult;

		tc->time_shift = pc->time_shift;

		tc->time_zero = pc->time_zero;

		cap_user_time_zero = pc->cap_user_time_zero;

		rmb();

		if (pc->lock == seq && !(seq & 1))

			break;

		if (++i > 10000) {

			pr_debug("failed to get perf_event_mmap_page lock\n");

			return -EINVAL;

		}

	}



	if (!cap_user_time_zero)

		return -EOPNOTSUPP;



	return 0;

}

#include "../../../util/tsc.h"



u64 rdtsc(void)

{
@@ -49,36 +11,3 @@ u64 rdtsc(void) 


	return low | ((u64)high) << 32;

}
 


int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,

				struct perf_tool *tool,

				perf_event__handler_t process,

				struct machine *machine)

{

	union perf_event event = {

		.time_conv = {

			.header = {

				.type = PERF_RECORD_TIME_CONV,

				.size = sizeof(struct perf_record_time_conv),

			},

		},

	};

	struct perf_tsc_conversion tc;

	int err;



	if (!pc)

		return 0;

	err = perf_read_tsc_conversion(pc, &tc);

	if (err == -EOPNOTSUPP)

		return 0;

	if (err)

		return err;



	pr_debug2("Synthesizing TSC conversion information\n");



	event.time_conv.time_mult  = tc.time_mult;

	event.time_conv.time_shift = tc.time_shift;

	event.time_conv.time_zero  = tc.time_zero;



	return process(tool, &event, NULL, machine);

}

tools/perf/util/synthetic-events.c

+0 −8
Original line number Diff line number Diff line
@@ -2006,14 +2006,6 @@ int perf_event__synthesize_stat_events(struct perf_stat_config *config, struct p 
	return 0;

}



int __weak perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused,

				       struct perf_tool *tool __maybe_unused,

				       perf_event__handler_t process __maybe_unused,

				       struct machine *machine __maybe_unused)

{

	return 0;

}



extern const struct perf_header_feature_ops feat_ops[HEADER_LAST_FEATURE];



int perf_event__synthesize_features(struct perf_tool *tool, struct perf_session *session,

tools/perf/util/tsc.c

+71 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>



#include <linux/compiler.h>

#include <linux/perf_event.h>

#include <linux/stddef.h>

#include <linux/types.h>



#include <asm/barrier.h>



#include "event.h"

#include "synthetic-events.h"

#include "debug.h"

#include "tsc.h"



u64 perf_time_to_tsc(u64 ns, struct perf_tsc_conversion *tc)
@@ -25,6 +34,68 @@ u64 tsc_to_perf_time(u64 cyc, struct perf_tsc_conversion *tc) 
	       ((rem * tc->time_mult) >> tc->time_shift);

}



int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc,

			     struct perf_tsc_conversion *tc)

{

	bool cap_user_time_zero;

	u32 seq;

	int i = 0;



	while (1) {

		seq = pc->lock;

		rmb();

		tc->time_mult = pc->time_mult;

		tc->time_shift = pc->time_shift;

		tc->time_zero = pc->time_zero;

		cap_user_time_zero = pc->cap_user_time_zero;

		rmb();

		if (pc->lock == seq && !(seq & 1))

			break;

		if (++i > 10000) {

			pr_debug("failed to get perf_event_mmap_page lock\n");

			return -EINVAL;

		}

	}



	if (!cap_user_time_zero)

		return -EOPNOTSUPP;



	return 0;

}



int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc,

				struct perf_tool *tool,

				perf_event__handler_t process,

				struct machine *machine)

{

	union perf_event event = {

		.time_conv = {

			.header = {

				.type = PERF_RECORD_TIME_CONV,

				.size = sizeof(struct perf_record_time_conv),

			},

		},

	};

	struct perf_tsc_conversion tc;

	int err;



	if (!pc)

		return 0;

	err = perf_read_tsc_conversion(pc, &tc);

	if (err == -EOPNOTSUPP)

		return 0;

	if (err)

		return err;



	pr_debug2("Synthesizing TSC conversion information\n");



	event.time_conv.time_mult  = tc.time_mult;

	event.time_conv.time_shift = tc.time_shift;

	event.time_conv.time_zero  = tc.time_zero;



	return process(tool, &event, NULL, machine);

}



u64 __weak rdtsc(void)

{

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE