From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Song Liu <songliubraving@fb.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] perf header: Fix lock/unlock imbalances
Date: Mon, 8 Apr 2019 13:26:09 -0500 [thread overview]
Message-ID: <3867ffda-5d01-412b-ed55-e39ee9db2ceb@embeddedor.com> (raw)
In-Reply-To: <B581617C-53AD-435A-8352-5E5A74B76B34@fb.com>
On 4/8/19 1:22 PM, Song Liu wrote:
>
>
>> On Apr 8, 2019, at 10:33 AM, Gustavo A. R. Silva <gustavo@embeddedor.com> wrote:
>>
>> Fix lock/unlock imbalances by refactoring the code a bit and adding
>> calls to up_write() before return.
>>
>> Addresses-Coverity-ID: 1444315 ("Missing unlock")
>> Addresses-Coverity-ID: 1444316 ("Missing unlock")
>> Fixes: a70a1123174a ("perf bpf: Save BTF information as headers to perf.data")
>> Fixes: 606f972b1361 ("perf bpf: Save bpf_prog_info information as headers to perf.data")
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>
> Acked-by: Song Liu <songliubraving@fb.com>
>
> Thanks for the fix!
>
Glad to help. :)
Thanks
--
Gustavo
>> ---
>> tools/perf/util/header.c | 21 +++++++++++++--------
>> 1 file changed, 13 insertions(+), 8 deletions(-)
>>
>> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
>> index b9e693825873..06028e0ee06a 100644
>> --- a/tools/perf/util/header.c
>> +++ b/tools/perf/util/header.c
>> @@ -2606,6 +2606,7 @@ static int process_bpf_prog_info(struct feat_fd *ff, void *data __maybe_unused)
>> perf_env__insert_bpf_prog_info(env, info_node);
>> }
>>
>> + up_write(&env->bpf_progs.lock);
>> return 0;
>> out:
>> free(info_linear);
>> @@ -2623,7 +2624,9 @@ static int process_bpf_prog_info(struct feat_fd *ff __maybe_unused, void *data _
>> static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused)
>> {
>> struct perf_env *env = &ff->ph->env;
>> + struct btf_node *node;
>> u32 count, i;
>> + int err = -1;
>>
>> if (ff->ph->needs_swap) {
>> pr_warning("interpreting btf from systems with endianity is not yet supported\n");
>> @@ -2636,31 +2639,33 @@ static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused)
>> down_write(&env->bpf_progs.lock);
>>
>> for (i = 0; i < count; ++i) {
>> - struct btf_node *node;
>> u32 id, data_size;
>>
>> + node = NULL;
>> if (do_read_u32(ff, &id))
>> - return -1;
>> + goto out;
>> if (do_read_u32(ff, &data_size))
>> - return -1;
>> + goto out;
>>
>> node = malloc(sizeof(struct btf_node) + data_size);
>> if (!node)
>> - return -1;
>> + goto out;
>>
>> node->id = id;
>> node->data_size = data_size;
>>
>> - if (__do_read(ff, node->data, data_size)) {
>> - free(node);
>> - return -1;
>> - }
>> + if (__do_read(ff, node->data, data_size))
>> + goto out;
>>
>> perf_env__insert_btf(env, node);
>> }
>>
>> up_write(&env->bpf_progs.lock);
>> return 0;
>> +out:
>> + up_write(&env->bpf_progs.lock);
>> + free(node);
>> + return err;
>> }
>>
>> struct feature_ops {
>> --
>> 2.21.0
>>
>
next prev parent reply other threads:[~2019-04-08 18:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-08 17:33 [PATCH] perf header: Fix lock/unlock imbalances Gustavo A. R. Silva
2019-04-08 18:22 ` Song Liu
2019-04-08 18:26 ` Gustavo A. R. Silva [this message]
2019-04-08 19:35 ` Arnaldo Carvalho de Melo
2019-04-08 19:52 ` Gustavo A. R. Silva
2019-04-08 20:00 ` Arnaldo Carvalho de Melo
2019-04-08 20:08 ` Gustavo A. R. Silva
2019-04-12 16:37 ` [tip:perf/urgent] perf header: Fix lock/unlock imbalances when processing BPF/BTF info tip-bot for Gustavo A. R. Silva
2019-04-16 15:28 ` tip-bot for Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3867ffda-5d01-412b-ed55-e39ee9db2ceb@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).