From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952AbbCIMDx (ORCPT ); Mon, 9 Mar 2015 08:03:53 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:44683 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933AbbCIMDr (ORCPT ); Mon, 9 Mar 2015 08:03:47 -0400 From: Yann Droneaud To: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa Cc: Yann Droneaud , Adrian Hunter , David Ahern , David Ahern , Frederic Weisbecker , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Stephane Eranian , William Cohen , linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] perf tools: report PERF_FLAG_FD_CLOEXEC probing error once Date: Mon, 9 Mar 2015 13:01:16 +0100 Message-Id: <0a9b7889dced5b198b6909fcf427afd99bc43acb.1425901229.git.ydroneaud@opteya.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case of failure, unrelated to PERF_FLAG_FD_CLOEXEC, perf_flag_probe() reports the error twice. For example: $ perf record ls Error: perf_event_open(..., PERF_FLAG_FD_CLOEXEC) failed with unexpected error 16 (Device or resource busy) perf_event_open(..., 0) failed unexpectedly with error 16 (Device or resource busy) There's no need for the second error message, so this patch changes the function to only report a second error message if the two calls to perf_even_open(2) fail with different error codes. Cc: Adrian Hunter Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: William Cohen Link: http://lkml.kernel.org/r/cover.1425901229.git.ydroneaud@opteya.com Reported-by: Jiri Olsa Signed-off-by: Yann Droneaud --- tools/perf/util/cloexec.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c index 2f05f8f8c22e..60bfa8ad45f3 100644 --- a/tools/perf/util/cloexec.c +++ b/tools/perf/util/cloexec.c @@ -16,7 +16,7 @@ static int perf_flag_probe(void) .exclude_kernel = 1, }; int fd; - int err; + int err0, err1; int cpu; pid_t pid = -1; char sbuf[STRERR_BUFSIZE]; @@ -39,7 +39,7 @@ static int perf_flag_probe(void) } break; } - err = errno; + err0 = errno; if (fd >= 0) { close(fd); @@ -47,12 +47,12 @@ static int perf_flag_probe(void) } /* ignore busy errors */ - if (err == EBUSY) + if (err0 == EBUSY) return -1; - WARN_ONCE(err != EINVAL, + WARN_ONCE(err0 != EINVAL, "perf_event_open(..., PERF_FLAG_FD_CLOEXEC) failed with unexpected error %d (%s)\n", - err, strerror_r(err, sbuf, sizeof(sbuf))); + err0, strerror_r(err0, sbuf, sizeof(sbuf))); /* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */ while (1) { @@ -63,17 +63,18 @@ static int perf_flag_probe(void) } break; } - err = errno; + err1 = errno; - if (fd >= 0) + if (fd >= 0) { close(fd); + return 0; + } - if (WARN_ONCE(fd < 0, - "perf_event_open(..., 0) failed unexpectedly with error %d (%s)\n", - err, strerror_r(err, sbuf, sizeof(sbuf)))) - return -1; + WARN_ONCE(err0 != err1, + "perf_event_open(..., 0) failed unexpectedly with error %d (%s)\n", + err1, strerror_r(err1, sbuf, sizeof(sbuf))); - return 0; + return -1; } unsigned long perf_event_open_cloexec_flag(void) -- 2.1.0