From nobody Fri Nov 29 02:39:04 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3AE0173466; Wed, 25 Sep 2024 13:20:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727270434; cv=none; b=BCgXGJycSHrQI4mm6+AQZqVRVVVLHJJ7thuFuYx91DlzYB1fNFkEDipG3jsTzuqV3ExjB25DHC3o9KsxCsAhXT5lkEXpkIoRvf0fEpk5X/UFfyzurEzby1mS7yGwPvJuI7sGAlhLTuQRadjFd460mPN6Yl+qyAPsE1F786o7OHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727270434; c=relaxed/simple; bh=lH8o3ejLRxnuXK1blY67pCW/PmcZL0kXGp0km/+Zizo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BUMqASOlz4ZSlXYY3IQbzhhooL2Tl4cBSKT88OHZPuqfiKaKio/5Oq5ALG0yhbu1dlhrInsxP+1USXq+FfbYm3ICLxOCv5L0jyTtSK683QFCU+ZByd6aJ1jZHnBUrOxQ7c957FKzPtXbaWZOpOhZtWSwbPWwS70+E0TH726EXGc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F3C6C1576; Wed, 25 Sep 2024 06:21:00 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9B6BB3F64C; Wed, 25 Sep 2024 06:20:29 -0700 (PDT) From: Levi Yun To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, james.clark@linaro.org, howardchu95@gmail.com Cc: nd@arm.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Levi Yun , Andi Kleen Subject: [PATCH v6 1/2] perf stat: Close cork_fd when create_perf_stat_counter() failed Date: Wed, 25 Sep 2024 14:20:21 +0100 Message-Id: <20240925132022.2650180-2-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925132022.2650180-1-yeoreum.yun@arm.com> References: <20240925132022.2650180-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When create_perf_stat_counter() failed, it doesn't close workload.cork_fd open in evlist__prepare_workload(). This could make too many open file error while __run_perf_stat() repeats. Introduce evlist__cancel_workload to close workload.cork_fd and wait workload.child_pid until exit to clear child process when create_perf_stat_counter() is failed. Signed-off-by: Levi Yun Reviewed-by: James Clark Reviewed-by: Andi Kleen --- tools/perf/builtin-stat.c | 50 +++++++++++++++++++++++++++------------ tools/perf/util/evlist.c | 19 +++++++++++++-- tools/perf/util/evlist.h | 1 + 3 files changed, 53 insertions(+), 17 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 689a3d43c258..2c46bdbd9914 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -716,15 +716,19 @@ static int __run_perf_stat(int argc, const char **arg= v, int run_idx) } if (!cpu_map__is_dummy(evsel_list->core.user_requested_cpus)) { - if (affinity__setup(&saved_affinity) < 0) - return -1; + if (affinity__setup(&saved_affinity) < 0) { + err =3D -1; + goto err_out; + } affinity =3D &saved_affinity; } evlist__for_each_entry(evsel_list, counter) { counter->reset_group =3D false; - if (bpf_counter__load(counter, &target)) - return -1; + if (bpf_counter__load(counter, &target)) { + err =3D -1; + goto err_out; + } if (!(evsel__is_bperf(counter))) all_counters_use_bpf =3D false; } @@ -767,7 +771,8 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) switch (stat_handle_error(counter)) { case COUNTER_FATAL: - return -1; + err =3D -1; + goto err_out; case COUNTER_RETRY: goto try_again; case COUNTER_SKIP: @@ -808,7 +813,8 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) switch (stat_handle_error(counter)) { case COUNTER_FATAL: - return -1; + err =3D -1; + goto err_out; case COUNTER_RETRY: goto try_again_reset; case COUNTER_SKIP: @@ -833,8 +839,10 @@ static int __run_perf_stat(int argc, const char **argv= , int run_idx) stat_config.unit_width =3D l; if (evsel__should_store_id(counter) && - evsel__store_ids(counter, evsel_list)) - return -1; + evsel__store_ids(counter, evsel_list)) { + err =3D -1; + goto err_out; + } } if (evlist__apply_filters(evsel_list, &counter, &target)) { @@ -855,20 +863,23 @@ static int __run_perf_stat(int argc, const char **arg= v, int run_idx) } if (err < 0) - return err; + goto err_out; err =3D perf_event__synthesize_stat_events(&stat_config, NULL, evsel_lis= t, process_synthesized_event, is_pipe); if (err < 0) - return err; + goto err_out; + } if (target.initial_delay) { pr_info(EVLIST_DISABLED_MSG); } else { err =3D enable_counters(); - if (err) - return -1; + if (err) { + err =3D -1; + goto err_out; + } } /* Exec the command, if any */ @@ -878,8 +889,10 @@ static int __run_perf_stat(int argc, const char **argv= , int run_idx) if (target.initial_delay > 0) { usleep(target.initial_delay * USEC_PER_MSEC); err =3D enable_counters(); - if (err) - return -1; + if (err) { + err =3D -1; + goto err_out; + } pr_info(EVLIST_ENABLED_MSG); } @@ -899,7 +912,8 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) if (workload_exec_errno) { const char *emsg =3D str_error_r(workload_exec_errno, msg, sizeof(msg)); pr_err("Workload failed: %s\n", emsg); - return -1; + err =3D -1; + goto err_out; } if (WIFSIGNALED(status)) @@ -946,6 +960,12 @@ static int __run_perf_stat(int argc, const char **argv= , int run_idx) evlist__close(evsel_list); return WEXITSTATUS(status); + +err_out: + if (forks) + evlist__cancel_workload(evsel_list); + + return err; } static int run_perf_stat(int argc, const char **argv, int run_idx) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index f14b7e6ff1dc..a9df84692d4a 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -1484,6 +1485,8 @@ int evlist__prepare_workload(struct evlist *evlist, s= truct target *target, const int child_ready_pipe[2], go_pipe[2]; char bf; + evlist->workload.cork_fd =3D -1; + if (pipe(child_ready_pipe) < 0) { perror("failed to create 'ready' pipe"); return -1; @@ -1536,7 +1539,7 @@ int evlist__prepare_workload(struct evlist *evlist, s= truct target *target, const * For cancelling the workload without actually running it, * the parent will just close workload.cork_fd, without writing * anything, i.e. read will return zero and we just exit() - * here. + * here (See evlist__cancel_workload()). */ if (ret !=3D 1) { if (ret =3D=3D -1) @@ -1600,7 +1603,7 @@ int evlist__prepare_workload(struct evlist *evlist, s= truct target *target, const int evlist__start_workload(struct evlist *evlist) { - if (evlist->workload.cork_fd > 0) { + if (evlist->workload.cork_fd >=3D 0) { char bf =3D 0; int ret; /* @@ -1611,12 +1614,24 @@ int evlist__start_workload(struct evlist *evlist) perror("unable to write to pipe"); close(evlist->workload.cork_fd); + evlist->workload.cork_fd =3D -1; return ret; } return 0; } +void evlist__cancel_workload(struct evlist *evlist) +{ + int status; + + if (evlist->workload.cork_fd >=3D 0) { + close(evlist->workload.cork_fd); + evlist->workload.cork_fd =3D -1; + waitpid(evlist->workload.pid, &status, WNOHANG); + } +} + int evlist__parse_sample(struct evlist *evlist, union perf_event *event, s= truct perf_sample *sample) { struct evsel *evsel =3D evlist__event2evsel(evlist, event); diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index bcc1c6984bb5..888fda751e1a 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -186,6 +186,7 @@ int evlist__prepare_workload(struct evlist *evlist, str= uct target *target, const char *argv[], bool pipe_output, void (*exec_error)(int signo, siginfo_t *info, void *ucontext)); int evlist__start_workload(struct evlist *evlist); +void evlist__cancel_workload(struct evlist *evlist); struct option; -- LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7} From nobody Fri Nov 29 02:39:04 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 15706126F0A; Wed, 25 Sep 2024 13:20:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727270436; cv=none; b=hrYYo8+GYYKEsPsDluSpyBLrFSP4ulll/ZLouNQ9Taw5GhGNnhmEO4/zcjqQ3wuWaVR0c1oMVqke5rW4i5XGmFBS7AAvgcBo8fQ2ZZ1BS0pU9eqM0lpcckc23Z6KIsQWdo0FVpSaa2lB+0RvrzMYULyDBjzQuv1S0TswUS3DneY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727270436; c=relaxed/simple; bh=VWkCCMmt+SSlKeFVFSzuMOqde4LRaApjaJXEOTiXnew=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hcwCqD0xSyLLp6KA1lE0hK372mJdXhiHdbEKrvGqBNVyvDCo2+MQKOS5JOpicH0/dMh6CS3eomhTmbv3QII2kn7i61jFFFdb7RLNW6Y2ma1wgUtGY9pcyVmTCAitKXHxslus8zHRNr5sAFZAeWJwcGPJqCkRuOcHgf4qqJ9OBcY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C1B9C150C; Wed, 25 Sep 2024 06:21:03 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 83E723F64C; Wed, 25 Sep 2024 06:20:32 -0700 (PDT) From: Levi Yun To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, james.clark@linaro.org, howardchu95@gmail.com Cc: nd@arm.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Levi Yun Subject: [PATCH v6 2/2] perf stat: Stop repeating when ref_perf_stat() returns -1 Date: Wed, 25 Sep 2024 14:20:22 +0100 Message-Id: <20240925132022.2650180-3-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925132022.2650180-1-yeoreum.yun@arm.com> References: <20240925132022.2650180-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Exit when run_perf_stat() returns an error to avoid continuously repeating the same error message. It's not expected that COUNTER_FATAL or internal errors are recoverable so there's no point in retrying. This fixes the following flood of error messages for permission issues, for example when perf_event_paranoid=3D=3D3: perf stat -r 1044 -- false Error: Access to performance monitoring and observability operations is limited. ... Error: Access to performance monitoring and observability operations is limited. ... (repeating for 1044 times). Signed-off-by: Levi Yun Reviewed-by: James Clark --- tools/perf/builtin-stat.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 2c46bdbd9914..6cad3435b198 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -968,6 +968,14 @@ static int __run_perf_stat(int argc, const char **argv= , int run_idx) return err; } +/* + * Returns -1 for fatal errors which signifies to not continue + * when in repeat mode. + * + * Returns < -1 error codes when stat record is used. These + * result in the stat information being displayed, but writing + * to the file fails and is non fatal. + */ static int run_perf_stat(int argc, const char **argv, int run_idx) { int ret; @@ -2899,7 +2907,10 @@ int cmd_stat(int argc, const char **argv) evlist__reset_prev_raw_counts(evsel_list); status =3D run_perf_stat(argc, argv, run_idx); - if (forever && status !=3D -1 && !interval) { + if (status =3D=3D -1) + break; + + if (forever && !interval) { print_counters(NULL, argc, argv); perf_stat__reset_stats(); } -- LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}