Commit 57480d2c authored by Yann Droneaud's avatar Yann Droneaud Committed by Jiri Olsa
Browse files

perf tools: Enable close-on-exec flag on perf file descriptor 



In commit a21b0b35 ('perf: Introduce a flag to enable
close-on-exec in perf_event_open()'), flag PERF_FLAG_FD_CLOEXEC
was added to perf_event_open(2) syscall to allows userspace
to atomically enable close-on-exec behavor when creating
the file descriptor.

This patch makes perf tools use the new flag if supported
by the kernel, so that the event file descriptors got
automatically closed if perf tool exec a sub-command.

Signed-off-by: default avatarYann Droneaud <ydroneaud@opteya.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/1404160127-7475-1-git-send-email-ydroneaud@opteya.com


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent ec6dbcb7

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/bp_signal.c

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "tests.h"

#include "debug.h"

#include "perf.h"

#include "cloexec.h"



static int fd1;

static int fd2;
@@ -78,7 +79,8 @@ static int bp_event(void *fn, int setup_signal) 
	pe.exclude_kernel = 1;

	pe.exclude_hv = 1;



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

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

				 perf_event_open_cloexec_flag());

	if (fd < 0) {

		pr_debug("failed opening event %llx\n", pe.config);

		return TEST_FAIL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE