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

Commit 2336ebc3 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/jolsa/perf

 into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

. Update attr test with PERF_FLAG_FD_CLOEXEC flag (Jiri Olsa)

. Enable close-on-exec flag on perf file descriptor (Yann Droneaud)

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ec6dbcb7 fb578179

tools/perf/Makefile.perf

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ LIB_OBJS += $(OUTPUT)util/record.o 
LIB_OBJS += $(OUTPUT)util/srcline.o

LIB_OBJS += $(OUTPUT)util/data.o

LIB_OBJS += $(OUTPUT)util/tsc.o

LIB_OBJS += $(OUTPUT)util/cloexec.o



LIB_OBJS += $(OUTPUT)ui/setup.o

LIB_OBJS += $(OUTPUT)ui/helpline.o

tools/perf/bench/mem-memcpy.c

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "../util/util.h"

#include "../util/parse-options.h"

#include "../util/header.h"

#include "../util/cloexec.h"

#include "bench.h"

#include "mem-memcpy-arch.h"
@@ -83,7 +84,8 @@ static struct perf_event_attr cycle_attr = { 


static void init_cycle(void)

{

	cycle_fd = sys_perf_event_open(&cycle_attr, getpid(), -1, -1, 0);

	cycle_fd = sys_perf_event_open(&cycle_attr, getpid(), -1, -1,

				       perf_event_open_cloexec_flag());



	if (cycle_fd < 0 && errno == ENOSYS)

		die("No CONFIG_PERF_EVENTS=y kernel support configured?\n");

tools/perf/bench/mem-memset.c

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "../util/util.h"

#include "../util/parse-options.h"

#include "../util/header.h"

#include "../util/cloexec.h"

#include "bench.h"

#include "mem-memset-arch.h"
@@ -83,7 +84,8 @@ static struct perf_event_attr cycle_attr = { 


static void init_cycle(void)

{

	cycle_fd = sys_perf_event_open(&cycle_attr, getpid(), -1, -1, 0);

	cycle_fd = sys_perf_event_open(&cycle_attr, getpid(), -1, -1,

				       perf_event_open_cloexec_flag());



	if (cycle_fd < 0 && errno == ENOSYS)

		die("No CONFIG_PERF_EVENTS=y kernel support configured?\n");

tools/perf/builtin-sched.c

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "util/header.h"

#include "util/session.h"

#include "util/tool.h"

#include "util/cloexec.h"



#include "util/parse-options.h"

#include "util/trace-event.h"
@@ -434,7 +435,8 @@ static int self_open_counters(void) 
	attr.type = PERF_TYPE_SOFTWARE;

	attr.config = PERF_COUNT_SW_TASK_CLOCK;



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

	fd = sys_perf_event_open(&attr, 0, -1, -1,

				 perf_event_open_cloexec_flag());



	if (fd < 0)

		pr_err("Error: sys_perf_event_open() syscall returned "

tools/perf/tests/attr/base-record

+2 −1
Original line number Diff line number Diff line 
[event]

fd=1

group_fd=-1

flags=0

# 0 or PERF_FLAG_FD_CLOEXEC flag

flags=0|8

cpu=*

type=0|1

size=96