Commit 9d645033 authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

perf auxtrace: Remove auxtrace_mmap__read_snapshot_head() 



Since the function auxtrace_mmap__read_snapshot_head() is exactly same
with auxtrace_mmap__read_head(), whether the session is in snapshot mode
or not, it's unified to use function auxtrace_mmap__read_head() for
reading AUX buffer head.

And the function auxtrace_mmap__read_snapshot_head() is unused so this
patch removes it.

Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrii Nakryiko <andriin@fb.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Daniel Díaz <daniel.diaz@linaro.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: coresight@lists.linaro.org
Cc: x86@kernel.org
Link: http://lore.kernel.org/lkml/20210809111407.596077-8-leo.yan@linaro.org


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

tools/perf/util/auxtrace.c

+5 −8
Original line number Diff line number Diff line
@@ -1686,14 +1686,11 @@ static int __auxtrace_mmap__read(struct mmap *map, 
	union perf_event ev;

	void *data1, *data2;



	if (snapshot) {

		head = auxtrace_mmap__read_snapshot_head(mm);

		if (auxtrace_record__find_snapshot(itr, mm->idx, mm, data,

						   &head, &old))

			return -1;

	} else {

	head = auxtrace_mmap__read_head(mm);

	}



	if (snapshot &&

	    auxtrace_record__find_snapshot(itr, mm->idx, mm, data, &head, &old))

		return -1;



	if (old == head)

		return 0;

tools/perf/util/auxtrace.h

+0 −10
Original line number Diff line number Diff line
@@ -440,16 +440,6 @@ struct auxtrace_cache; 


#ifdef HAVE_AUXTRACE_SUPPORT



static inline u64 auxtrace_mmap__read_snapshot_head(struct auxtrace_mmap *mm)

{

	struct perf_event_mmap_page *pc = mm->userpg;

	u64 head = READ_ONCE(pc->aux_head);



	/* Ensure all reads are done after we read the head */

	smp_rmb();

	return head;

}



static inline u64 auxtrace_mmap__read_head(struct auxtrace_mmap *mm)

{

	struct perf_event_mmap_page *pc = mm->userpg;