| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID:
<GV1PR08MB105214E9BE2F298AA2F656BB6FB692@GV1PR08MB10521.eurprd08.prod.outlook.com>
Date: Wed, 25 Sep 2024 10:38:35 +0000
From: Yeo Reum Yun <YeoReum.Yun@....com>
To: Namhyung Kim <namhyung@...nel.org>
CC: "peterz@...radead.org" <peterz@...radead.org>, "mingo@...hat.com"
<mingo@...hat.com>, "acme@...nel.org" <acme@...nel.org>, Mark Rutland
<Mark.Rutland@....com>, "alexander.shishkin@...ux.intel.com"
<alexander.shishkin@...ux.intel.com>, "jolsa@...nel.org" <jolsa@...nel.org>,
"irogers@...gle.com" <irogers@...gle.com>, "james.clark@...aro.org"
<james.clark@...aro.org>, "asmadeus@...ewreck.org" <asmadeus@...ewreck.org>,
"linux-perf-users@...r.kernel.org" <linux-perf-users@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, nd
<nd@....com>
Subject: Re: [PATCH v4 1/2] perf stat: Close cork_fd when
create_perf_stat_counter() failed
Hello,
> I don't think you covered all the places it can return before starting
> the workload. You'd better have an error handling code at the end with
> a label and then goto there.
Right. I'll change it.
Thanks
________________________________________
From: Namhyung Kim <namhyung@...nel.org>
Sent: 24 September 2024 20:29
To: Yeo Reum Yun
Cc: peterz@...radead.org; mingo@...hat.com; acme@...nel.org; Mark Rutland; alexander.shishkin@...ux.intel.com; jolsa@...nel.org; irogers@...gle.com; james.clark@...aro.org; asmadeus@...ewreck.org; linux-perf-users@...r.kernel.org; linux-kernel@...r.kernel.org; nd
Subject: Re: [PATCH v4 1/2] perf stat: Close cork_fd when create_perf_stat_counter() failed
Hello,
On Fri, Sep 13, 2024 at 02:59:06PM +0100, Levi Yun wrote:
> 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 with COUNTER_FATAL.
>
> Signed-off-by: Levi Yun <yeoreum.yun@....com>
> Reviewed-by: James Clark <james.clark@...aro.org>
> ---
> tools/perf/builtin-stat.c | 4 ++++
> tools/perf/util/evlist.c | 14 +++++++++++++-
> tools/perf/util/evlist.h | 1 +
> 3 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 661832756a24..954eb37ce7b8 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -763,6 +763,8 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
>
> switch (stat_handle_error(counter)) {
> case COUNTER_FATAL:
> + if (forks)
> + evlist__cancel_workload(evsel_list);
> return -1;
> case COUNTER_RETRY:
> goto try_again;
> @@ -804,6 +806,8 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
>
> switch (stat_handle_error(counter)) {
> case COUNTER_FATAL:
> + if (forks)
> + evlist__cancel_workload(evsel_list);
> return -1;
I don't think you covered all the places it can return before starting
the workload. You'd better have an error handling code at the end with
a label and then goto there.
Thanks,
Namhyung
> case COUNTER_RETRY:
> goto try_again_reset;
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 3a719edafc7a..51a221679c92 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -46,6 +46,7 @@
> #include <sys/mman.h>
> #include <sys/prctl.h>
> #include <sys/timerfd.h>
> +#include <sys/wait.h>
>
> #include <linux/bitops.h>
> #include <linux/hash.h>
> @@ -1465,7 +1466,7 @@ int evlist__prepare_workload(struct evlist *evlist, struct 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 != 1) {
> if (ret == -1)
> @@ -1546,6 +1547,17 @@ int evlist__start_workload(struct evlist *evlist)
> return 0;
> }
>
> +void evlist__cancel_workload(struct evlist *evlist)
> +{
> + int status;
> +
> + if (evlist->workload.cork_fd > 0) {
> + close(evlist->workload.cork_fd);
> + evlist->workload.cork_fd = -1;
> + waitpid(evlist->workload.pid, &status, WNOHANG);
> + }
> +}
> +
> int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
> {
> struct evsel *evsel = evlist__event2evsel(evlist, event);
> diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
> index cb91dc9117a2..12f929ffdf92 100644
> --- a/tools/perf/util/evlist.h
> +++ b/tools/perf/util/evlist.h
> @@ -184,6 +184,7 @@ int evlist__prepare_workload(struct evlist *evlist, struct 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}
>
Powered by blists - more mailing lists