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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 80C63C4BA04 for ; Tue, 25 Feb 2020 22:49:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D25721927 for ; Tue, 25 Feb 2020 22:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582670953; bh=ZfqdCsYTZr7xoeF7qxhbOAsyLAOQ43Qip2HR86wzpdM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=MWzLsjEbrC7+9BfuDp20duA0VmbNhoVnPOQuMq+M+wYg8bj32ejnKATU5/V+p5AC9 ilgZAbqQ2DgpcbXhnA/wUzHJlAOrM61ZKnjYrS9SzHOf9eTf5rRC/Q5ZoJlEbil3vg NXAdLnBj0ewAwDODSuOzklhjabOcVxZ0Gv0ngVag= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729189AbgBYWtM (ORCPT ); Tue, 25 Feb 2020 17:49:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:55578 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728865AbgBYWtL (ORCPT ); Tue, 25 Feb 2020 17:49:11 -0500 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4ECEB20732; Tue, 25 Feb 2020 22:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582670950; bh=ZfqdCsYTZr7xoeF7qxhbOAsyLAOQ43Qip2HR86wzpdM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hEkwGucqHchemMDC0fRebVIbxH0hNUIPE+IMikJWCU2No3mbh2Ba52VqquRzIK7pD zbDfzDy0q6ggaxkYnUIfR/+4T4vuqeHFnzTlat9F2PBCpeu+jMdHPM4AUCBb8VVdyg wXqjHNokUroOjfrQvn4D0+rlPeXtrIFd141G/5Ks= Date: Wed, 26 Feb 2020 07:49:06 +0900 From: Masami Hiramatsu To: Cc: , , , , , , , , , Subject: Re: [PATCH 2/2] perf: probe-file: Check return value of strlist__add Message-Id: <20200226074906.0acb08b31d01c96c475da0cb@kernel.org> In-Reply-To: <1582641703-233485-2-git-send-email-zhe.he@windriver.com> References: <1582641703-233485-1-git-send-email-zhe.he@windriver.com> <1582641703-233485-2-git-send-email-zhe.he@windriver.com> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 25 Feb 2020 22:41:43 +0800 wrote: > From: He Zhe > > strlist__add may fail with -ENOMEM or -EEXIST. Check it and give debugging > hint when necessary. > > Signed-off-by: He Zhe > --- > tools/perf/builtin-probe.c | 30 ++++++++++++++++-------------- > tools/perf/util/probe-file.c | 26 +++++++++++++++++++++----- > 2 files changed, 37 insertions(+), 19 deletions(-) > > diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c > index 26bc5923e6b5..8b4511c70fed 100644 > --- a/tools/perf/builtin-probe.c > +++ b/tools/perf/builtin-probe.c > @@ -442,24 +442,26 @@ static int perf_del_probe_events(struct strfilter *filter) > } > > ret = probe_file__get_events(kfd, filter, klist); > - if (ret == 0) { > - strlist__for_each_entry(ent, klist) > - pr_info("Removed event: %s\n", ent->s); > + if (ret < 0) > + goto out; No, this is ignored by design. Since probe_file__get_events() returns -ENOENT when no event is matched, this should be just ignored, and goto uprobe event matching. > > - ret = probe_file__del_strlist(kfd, klist); > - if (ret < 0) > - goto error; > - } > + strlist__for_each_entry(ent, klist) > + pr_info("Removed event: %s\n", ent->s); > + > + ret = probe_file__del_strlist(kfd, klist); > + if (ret < 0) > + goto error; > > ret2 = probe_file__get_events(ufd, filter, ulist); > - if (ret2 == 0) { > - strlist__for_each_entry(ent, ulist) > - pr_info("Removed event: %s\n", ent->s); > + if (ret2 < 0) > + goto out; Ditto. Thank you, > > - ret2 = probe_file__del_strlist(ufd, ulist); > - if (ret2 < 0) > - goto error; > - } > + strlist__for_each_entry(ent, ulist) > + pr_info("Removed event: %s\n", ent->s); > + > + ret2 = probe_file__del_strlist(ufd, ulist); > + if (ret2 < 0) > + goto error; > > if (ret == -ENOENT && ret2 == -ENOENT) > pr_warning("\"%s\" does not hit any event.\n", str); > diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c > index cf44c05f89c1..00f086cba88f 100644 > --- a/tools/perf/util/probe-file.c > +++ b/tools/perf/util/probe-file.c > @@ -307,10 +307,14 @@ int probe_file__get_events(int fd, struct strfilter *filter, > p = strchr(ent->s, ':'); > if ((p && strfilter__compare(filter, p + 1)) || > strfilter__compare(filter, ent->s)) { > - strlist__add(plist, ent->s); > - ret = 0; > + ret = strlist__add(plist, ent->s); > + if (ret < 0) { > + pr_debug("strlist__add failed (%d)\n", ret); > + goto out; > + } > } > } > +out: > strlist__delete(namelist); > > return ret; > @@ -517,7 +521,11 @@ static int probe_cache__load(struct probe_cache *pcache) > ret = -EINVAL; > goto out; > } > - strlist__add(entry->tevlist, buf); > + ret = strlist__add(entry->tevlist, buf); > + if (ret < 0) { > + pr_debug("strlist__add failed (%d)\n", ret); > + goto out; > + } > } > } > out: > @@ -678,7 +686,12 @@ int probe_cache__add_entry(struct probe_cache *pcache, > command = synthesize_probe_trace_command(&tevs[i]); > if (!command) > goto out_err; > - strlist__add(entry->tevlist, command); > + ret = strlist__add(entry->tevlist, command); > + if (ret < 0) { > + pr_debug("strlist__add failed (%d)\n", ret); > + goto out_err; > + } > + > free(command); > } > list_add_tail(&entry->node, &pcache->entries); > @@ -859,7 +872,10 @@ int probe_cache__scan_sdt(struct probe_cache *pcache, const char *pathname) > break; > } > > - strlist__add(entry->tevlist, buf); > + ret = strlist__add(entry->tevlist, buf); > + if (ret < 0) > + pr_debug("strlist__add failed (%d)\n", ret); > + > free(buf); > entry = NULL; > } > -- > 2.24.1 > -- Masami Hiramatsu