Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e8f5b1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  * Fix mmap return address truncation to 32-bit in 'perf trace'. (Chang Hyun Park)

  * Support operations for shared futexes. (Davidlohr Bueso)

  * Fix error message for --filter option not coming after tracepoint. (Arnaldo Carvalho de Melo)

Infrastructure changes:

  * Refactor unit and scale function parameters for PMU parsing routines. (Matt Fleming)

  * Improve DSO long names lookup with rbtree, resulting in great speedup for
    workloads with lots of DSOs. (Waiman Long)

  * Fix build breakage on arm64 targets. (Will Deacon)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 07394b5f 281f92f2

tools/perf/arch/arm64/util/unwind-libunwind.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <libunwind.h>

#include "perf_regs.h"

#include "../../util/unwind.h"

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



int libunwind__arch_reg_id(int regnum)

{

tools/perf/bench/futex-hash.c

+5 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static unsigned int nsecs = 10; 
/* amount of futexes per thread */

static unsigned int nfutexes = 1024;

static bool fshared = false, done = false, silent = false;

static int futex_flag = 0;



struct timeval start, end, runtime;

static pthread_mutex_t thread_lock;
@@ -75,8 +76,7 @@ static void *workerfn(void *arg) 
			 * such as internal waitqueue handling, thus enlarging

			 * the critical region protected by hb->lock.

			 */

			ret = futex_wait(&w->futex[i], 1234, NULL,

					 fshared ? 0 : FUTEX_PRIVATE_FLAG);

			ret = futex_wait(&w->futex[i], 1234, NULL, futex_flag);

			if (!silent &&

			    (!ret || errno != EAGAIN || errno != EWOULDBLOCK))

				warn("Non-expected futex return call");
@@ -135,6 +135,9 @@ int bench_futex_hash(int argc, const char **argv, 
	if (!worker)

		goto errmem;



	if (!fshared)

		futex_flag = FUTEX_PRIVATE_FLAG;



	printf("Run summary [PID %d]: %d threads, each operating on %d [%s] futexes for %d secs.\n\n",

	       getpid(), nthreads, nfutexes, fshared ? "shared":"private", nsecs);

tools/perf/bench/futex-requeue.c

+18 −10
Original line number Diff line number Diff line
@@ -30,16 +30,18 @@ static u_int32_t futex1 = 0, futex2 = 0; 
static unsigned int nrequeue = 1;



static pthread_t *worker;

static bool done = 0, silent = 0;

static bool done = false, silent = false, fshared = false;

static pthread_mutex_t thread_lock;

static pthread_cond_t thread_parent, thread_worker;

static struct stats requeuetime_stats, requeued_stats;

static unsigned int ncpus, threads_starting, nthreads = 0;

static int futex_flag = 0;



static const struct option options[] = {

	OPT_UINTEGER('t', "threads",  &nthreads, "Specify amount of threads"),

	OPT_UINTEGER('q', "nrequeue", &nrequeue, "Specify amount of threads to requeue at once"),

	OPT_BOOLEAN( 's', "silent",   &silent,   "Silent mode: do not display data/details"),

	OPT_BOOLEAN( 'S', "shared",   &fshared,  "Use shared futexes instead of private ones"),

	OPT_END()

};
@@ -70,7 +72,7 @@ static void *workerfn(void *arg __maybe_unused) 
	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);



	futex_wait(&futex1, 0, NULL, FUTEX_PRIVATE_FLAG);

	futex_wait(&futex1, 0, NULL, futex_flag);

	return NULL;

}
@@ -127,9 +129,12 @@ int bench_futex_requeue(int argc, const char **argv, 
	if (!worker)

		err(EXIT_FAILURE, "calloc");



	printf("Run summary [PID %d]: Requeuing %d threads (from %p to %p), "

	       "%d at a time.\n\n",

	       getpid(), nthreads, &futex1, &futex2, nrequeue);

	if (!fshared)

		futex_flag = FUTEX_PRIVATE_FLAG;



	printf("Run summary [PID %d]: Requeuing %d threads (from [%s] %p to %p), "

	       "%d at a time.\n\n",  getpid(), nthreads,

	       fshared ? "shared":"private", &futex1, &futex2, nrequeue);



	init_stats(&requeued_stats);

	init_stats(&requeuetime_stats);
@@ -156,16 +161,20 @@ int bench_futex_requeue(int argc, const char **argv, 


		/* Ok, all threads are patiently blocked, start requeueing */

		gettimeofday(&start, NULL);

		for (nrequeued = 0; nrequeued < nthreads; nrequeued += nrequeue)

		for (nrequeued = 0; nrequeued < nthreads; nrequeued += nrequeue) {

			/*

			 * Do not wakeup any tasks blocked on futex1, allowing

			 * us to really measure futex_wait functionality.

			 */

			futex_cmp_requeue(&futex1, 0, &futex2, 0, nrequeue,

					  FUTEX_PRIVATE_FLAG);

			futex_cmp_requeue(&futex1, 0, &futex2, 0,

					  nrequeue, futex_flag);

		}

		gettimeofday(&end, NULL);

		timersub(&end, &start, &runtime);



		if (nrequeued > nthreads)

			nrequeued = nthreads;



		update_stats(&requeued_stats, nrequeued);

		update_stats(&requeuetime_stats, runtime.tv_usec);
@@ -175,7 +184,7 @@ int bench_futex_requeue(int argc, const char **argv, 
		}



		/* everybody should be blocked on futex2, wake'em up */

		nrequeued = futex_wake(&futex2, nthreads, FUTEX_PRIVATE_FLAG);

		nrequeued = futex_wake(&futex2, nthreads, futex_flag);

		if (nthreads != nrequeued)

			warnx("couldn't wakeup all tasks (%d/%d)", nrequeued, nthreads);
@@ -184,7 +193,6 @@ int bench_futex_requeue(int argc, const char **argv, 
			if (ret)

				err(EXIT_FAILURE, "pthread_join");

		}



	}



	/* cleanup & report results */

tools/perf/bench/futex-wake.c

+10 −5
Original line number Diff line number Diff line
@@ -31,16 +31,18 @@ static u_int32_t futex1 = 0; 
static unsigned int nwakes = 1;



pthread_t *worker;

static bool done = false, silent = false;

static bool done = false, silent = false, fshared = false;

static pthread_mutex_t thread_lock;

static pthread_cond_t thread_parent, thread_worker;

static struct stats waketime_stats, wakeup_stats;

static unsigned int ncpus, threads_starting, nthreads = 0;

static int futex_flag = 0;



static const struct option options[] = {

	OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"),

	OPT_UINTEGER('w', "nwakes",  &nwakes,   "Specify amount of threads to wake at once"),

	OPT_BOOLEAN( 's', "silent",  &silent,   "Silent mode: do not display data/details"),

	OPT_BOOLEAN( 'S', "shared",  &fshared,  "Use shared futexes instead of private ones"),

	OPT_END()

};
@@ -58,7 +60,7 @@ static void *workerfn(void *arg __maybe_unused) 
	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);



	futex_wait(&futex1, 0, NULL, FUTEX_PRIVATE_FLAG);

	futex_wait(&futex1, 0, NULL, futex_flag);

	return NULL;

}
@@ -130,9 +132,12 @@ int bench_futex_wake(int argc, const char **argv, 
	if (!worker)

		err(EXIT_FAILURE, "calloc");



	printf("Run summary [PID %d]: blocking on %d threads (at futex %p), "

	if (!fshared)

		futex_flag = FUTEX_PRIVATE_FLAG;



	printf("Run summary [PID %d]: blocking on %d threads (at [%s] futex %p), "

	       "waking up %d at a time.\n\n",

	       getpid(), nthreads, &futex1, nwakes);

	       getpid(), nthreads, fshared ? "shared":"private",  &futex1, nwakes);



	init_stats(&wakeup_stats);

	init_stats(&waketime_stats);
@@ -160,7 +165,7 @@ int bench_futex_wake(int argc, const char **argv, 
		/* Ok, all threads are patiently blocked, start waking folks up */

		gettimeofday(&start, NULL);

		while (nwoken != nthreads)

			nwoken += futex_wake(&futex1, nwakes, FUTEX_PRIVATE_FLAG);

			nwoken += futex_wake(&futex1, nwakes, futex_flag);

		gettimeofday(&end, NULL);

		timersub(&end, &start, &runtime);

tools/perf/builtin-trace.c

+3 −3
Original line number Diff line number Diff line
@@ -1695,7 +1695,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, 
			   union perf_event *event __maybe_unused,

			   struct perf_sample *sample)

{

	int ret;

	long ret;

	u64 duration = 0;

	struct thread *thread;

	int id = perf_evsel__sc_tp_uint(evsel, id, sample);
@@ -1748,7 +1748,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, 


	if (sc->fmt == NULL) {

signed_print:

		fprintf(trace->output, ") = %d", ret);

		fprintf(trace->output, ") = %ld", ret);

	} else if (ret < 0 && sc->fmt->errmsg) {

		char bf[STRERR_BUFSIZE];

		const char *emsg = strerror_r(-ret, bf, sizeof(bf)),
@@ -1758,7 +1758,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel, 
	} else if (ret == 0 && sc->fmt->timeout)

		fprintf(trace->output, ") = 0 Timeout");

	else if (sc->fmt->hexret)

		fprintf(trace->output, ") = %#x", ret);

		fprintf(trace->output, ") = %#lx", ret);

	else

		goto signed_print;