From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 903FECA9EAF for ; Mon, 21 Oct 2019 11:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7031C206C2 for ; Mon, 21 Oct 2019 11:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728258AbfJULvm (ORCPT ); Mon, 21 Oct 2019 07:51:42 -0400 Received: from mail1.windriver.com ([147.11.146.13]:61412 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727962AbfJULvm (ORCPT ); Mon, 21 Oct 2019 07:51:42 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.2) with ESMTPS id x9LBpMpA024188 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 21 Oct 2019 04:51:22 -0700 (PDT) Received: from [128.224.155.112] (128.224.155.112) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.468.0; Mon, 21 Oct 2019 04:51:21 -0700 Subject: Re: [PATCH v4] perf record: Add support for limit perf output file size To: , , , References: <20190925070637.13164-1-jiwei.sun@windriver.com> CC: , , , , , From: Jiwei Sun Message-ID: <5d6e3bba-fb53-14a6-c3c8-3e5aba930f04@windriver.com> Date: Mon, 21 Oct 2019 19:51:17 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20190925070637.13164-1-jiwei.sun@windriver.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [128.224.155.112] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Arnaldo & Jirka, Do you have any other suggestions regarding the patch? Any suggestions are welcome. Thank you very much. Regards, Jiwei On 2019e9409f25f% 15:06, Jiwei Sun wrote: > The patch adds a new option to limit the output file size, then based > on it, we can create a wrapper of the perf command that uses the option > to avoid exhausting the disk space by the unconscious user. > > In order to make the perf.data parsable, we just limit the sample data > size, since the perf.data consists of many headers and sample data and > other data, the actual size of the recorded file will bigger than the > setting value. > > Testing it: > > # ./perf record -a -g --max-size=10M > Couldn't synthesize bpf events. > WARNING: The perf data has already reached the limit, stop recording! > [ perf record: Woken up 30 times to write data ] > [ perf record: Captured and wrote 10.233 MB perf.data (175650 samples) ] > Terminated > > # ls -lh perf.data > -rw------- 1 root root 11M Jul 17 14:01 perf.data > > # ./perf record -a -g --max-size=10K > WARNING: The perf data has already reached the limit, stop recording! > Couldn't synthesize bpf events. > [ perf record: Woken up 0 times to write data ] > [ perf record: Captured and wrote 1.824 MB perf.data (67 samples) ] > Terminated > > # ls -lh perf.data > -rw------- 1 root root 1.9M Jul 17 14:05 perf.data > > Signed-off-by: Jiwei Sun > --- > v4 changes: > - Just show one WARNING message after reached the limit. > > v3 changes: > - add a test result > - add the new option to tools/perf/Documentation/perf-record.txt > > v2 changes: > - make patch based on latest Arnaldo's perf/core, > - display warning message when reached the limit. > --- > tools/perf/Documentation/perf-record.txt | 4 +++ > tools/perf/builtin-record.c | 42 ++++++++++++++++++++++++ > 2 files changed, 46 insertions(+) > > diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt > index c6f9f31b6039..f1c6113fbc82 100644 > --- a/tools/perf/Documentation/perf-record.txt > +++ b/tools/perf/Documentation/perf-record.txt > @@ -571,6 +571,10 @@ config terms. For example: 'cycles/overwrite/' and 'instructions/no-overwrite/'. > > Implies --tail-synthesize. > > +--max-size=:: > +Limit the sample data max size, is expected to be a number with > +appended unit character - B/K/M/G > + > SEE ALSO > -------- > linkperf:perf-stat[1], linkperf:perf-list[1] > diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c > index 48600c90cc7e..30904d2a3407 100644 > --- a/tools/perf/builtin-record.c > +++ b/tools/perf/builtin-record.c > @@ -91,6 +91,7 @@ struct record { > struct switch_output switch_output; > unsigned long long samples; > cpu_set_t affinity_mask; > + unsigned long output_max_size; /* = 0: unlimited */ > }; > > static volatile int auxtrace_record__snapshot_started; > @@ -120,6 +121,12 @@ static bool switch_output_time(struct record *rec) > trigger_is_ready(&switch_output_trigger); > } > > +static bool record__output_max_size_exceeded(struct record *rec) > +{ > + return rec->output_max_size && > + (rec->bytes_written >= rec->output_max_size); > +} > + > static int record__write(struct record *rec, struct mmap *map __maybe_unused, > void *bf, size_t size) > { > @@ -132,6 +139,12 @@ static int record__write(struct record *rec, struct mmap *map __maybe_unused, > > rec->bytes_written += size; > > + if (record__output_max_size_exceeded(rec)) { > + WARN_ONCE(1, "WARNING: The perf data has already reached " > + "the limit, stop recording!\n"); > + raise(SIGTERM); > + } > + > if (switch_output_size(rec)) > trigger_hit(&switch_output_trigger); > > @@ -1936,6 +1949,33 @@ static int record__parse_affinity(const struct option *opt, const char *str, int > return 0; > } > > +static int parse_output_max_size(const struct option *opt, > + const char *str, int unset) > +{ > + unsigned long *s = (unsigned long *)opt->value; > + static struct parse_tag tags_size[] = { > + { .tag = 'B', .mult = 1 }, > + { .tag = 'K', .mult = 1 << 10 }, > + { .tag = 'M', .mult = 1 << 20 }, > + { .tag = 'G', .mult = 1 << 30 }, > + { .tag = 0 }, > + }; > + unsigned long val; > + > + if (unset) { > + *s = 0; > + return 0; > + } > + > + val = parse_tag_value(str, tags_size); > + if (val != (unsigned long) -1) { > + *s = val; > + return 0; > + } > + > + return -1; > +} > + > static int record__parse_mmap_pages(const struct option *opt, > const char *str, > int unset __maybe_unused) > @@ -2262,6 +2302,8 @@ static struct option __record_options[] = { > "n", "Compressed records using specified level (default: 1 - fastest compression, 22 - greatest compression)", > record__parse_comp_level), > #endif > + OPT_CALLBACK(0, "max-size", &record.output_max_size, > + "size", "Limit the maximum size of the output file", parse_output_max_size), > OPT_END() > }; > >