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

Commit 021f5f12 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - pthread_attr_setaffinity_np() feature detection build fixes (Adrian Hunter, Josh Boyer)

  - Fix probing for PERF_FLAG_FD_CLOEXEC flag (Adrian Hunter)

  - Fix order of arguments to memcpy_alloc_mem in 'perf bench' (Bruce Merry)

  - Sparc64 and Aarch64 build and segfault fixes (David Ahern)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2a6730c8 4861f87c

tools/perf/bench/mem-memcpy.c

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static u64 do_memcpy_cycle(const struct routine *r, size_t len, bool prefault) 
	memcpy_t fn = r->fn.memcpy;

	int i;



	memcpy_alloc_mem(&src, &dst, len);

	memcpy_alloc_mem(&dst, &src, len);



	if (prefault)

		fn(dst, src, len);
@@ -312,7 +312,7 @@ static double do_memcpy_gettimeofday(const struct routine *r, size_t len, 
	void *src = NULL, *dst = NULL;

	int i;



	memcpy_alloc_mem(&src, &dst, len);

	memcpy_alloc_mem(&dst, &src, len);



	if (prefault)

		fn(dst, src, len);

tools/perf/config/Makefile.arch

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ ifeq ($(RAW_ARCH),x86_64) 
  endif

endif



ifeq ($(RAW_ARCH),sparc64)

  ARCH ?= sparc

endif



ARCH ?= $(RAW_ARCH)



LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)

tools/perf/config/feature-checks/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ test-hello.bin: 
	$(BUILD)



test-pthread-attr-setaffinity-np.bin:

	$(BUILD) -Werror -lpthread

	$(BUILD) -D_GNU_SOURCE -Werror -lpthread



test-stackprotector-all.bin:

	$(BUILD) -Werror -fstack-protector-all

tools/perf/config/feature-checks/test-pthread-attr-setaffinity-np.c

+2 −1
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ int main(void) 
{

	int ret = 0;

	pthread_attr_t thread_attr;

	cpu_set_t cs;



	pthread_attr_init(&thread_attr);

	/* don't care abt exact args, just the API itself in libpthread */

	ret = pthread_attr_setaffinity_np(&thread_attr, 0, NULL);

	ret = pthread_attr_setaffinity_np(&thread_attr, sizeof(cs), &cs);



	return ret;

}

tools/perf/util/cloexec.c

+15 −3
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ static int perf_flag_probe(void) 
	if (cpu < 0)

		cpu = 0;



	/*

	 * Using -1 for the pid is a workaround to avoid gratuitous jump label

	 * changes.

	 */

	while (1) {

		/* check cloexec flag */

		fd = sys_perf_event_open(&attr, pid, cpu, -1,
@@ -47,16 +51,24 @@ static int perf_flag_probe(void) 
		  err, strerror_r(err, sbuf, sizeof(sbuf)));



	/* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */

	while (1) {

		fd = sys_perf_event_open(&attr, pid, cpu, -1, 0);

		if (fd < 0 && pid == -1 && errno == EACCES) {

			pid = 0;

			continue;

		}

		break;

	}

	err = errno;



	if (fd >= 0)

		close(fd);



	if (WARN_ONCE(fd < 0 && err != EBUSY,

		      "perf_event_open(..., 0) failed unexpectedly with error %d (%s)\n",

		      err, strerror_r(err, sbuf, sizeof(sbuf))))

		return -1;



	close(fd);



	return 0;

}