From patchwork Sat Aug 29 04:21:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52844 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 1543420503 for ; Sat, 29 Aug 2015 04:29:49 +0000 (UTC) Received: by lbbpd10 with SMTP id pd10sf22515181lbb.3 for ; Fri, 28 Aug 2015 21:29:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=uCTuHB8n9mONOch4S00A3Xu91/5X5J+YSWvx7zLXFxg=; b=BW1/BprSOINfDzJ2u2YhXDSoZuSH9X/+EG1ZW91k9+36dtPKV9qYNhVFY2A1k0CqNd iNYfk23x0fdOqJVZrMO27Y7If5NyrGD19yMXCq8RBRsmKVZNvclZ36zmrFFvi0RdGq0S 40+IuqXQTxOb25cMsXlG5qICOjjK//mPQqNC814KR3KVCmZb58gVM978d2Fdjj0KZB6C BDxp8nffux1JAvwi25rRswFKTQ8F8GS1snxYIACgrlOl2Ml+idUOWtUoMXgJGmGBPRZ8 dRw43OJf+HERrJBDtJcmQBvW+QVpNjsECycG5C362gS8brwpFydrsVte9DCcgws2dio/ Z3TQ== X-Gm-Message-State: ALoCoQkWvkVes+4Y+IZYeu2vfztaXpIRajb/LnK+ujklX4Df8kWlBWcidN0ZWbG7PRrUrGe5Jb3l X-Received: by 10.112.54.166 with SMTP id k6mr3627863lbp.0.1440822588074; Fri, 28 Aug 2015 21:29:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.108 with SMTP id db12ls272082lad.70.gmail; Fri, 28 Aug 2015 21:29:47 -0700 (PDT) X-Received: by 10.152.45.97 with SMTP id l1mr6189112lam.113.1440822587724; Fri, 28 Aug 2015 21:29:47 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id z12si7660522lby.131.2015.08.28.21.29.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:29:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbsx3 with SMTP id sx3so39542774lbb.0 for ; Fri, 28 Aug 2015 21:29:47 -0700 (PDT) X-Received: by 10.112.77.10 with SMTP id o10mr6296397lbw.73.1440822587594; Fri, 28 Aug 2015 21:29:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.151.194 with SMTP id us2csp269189lbb; Fri, 28 Aug 2015 21:29:46 -0700 (PDT) X-Received: by 10.67.15.131 with SMTP id fo3mr21402088pad.30.1440822586513; Fri, 28 Aug 2015 21:29:46 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uv1si13343718pbc.94.2015.08.28.21.29.45; Fri, 28 Aug 2015 21:29:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753040AbbH2E33 (ORCPT + 28 others); Sat, 29 Aug 2015 00:29:29 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:3681 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752459AbbH2EXn (ORCPT ); Sat, 29 Aug 2015 00:23:43 -0400 Received: from 172.24.1.50 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.50]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BLW04286; Sat, 29 Aug 2015 12:23:03 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Sat, 29 Aug 2015 12:22:53 +0800 From: Wang Nan To: , , CC: , , , Wang Nan , Masami Hiramatsu , Namhyung Kim Subject: [PATCH 02/31] perf tools: Don't set cmdline_group_boundary if no evsel is collected Date: Sat, 29 Aug 2015 04:21:36 +0000 Message-ID: <1440822125-52691-3-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> References: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.55E133A7.008D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 2ad64dd4cd20fce2f7e99782cd202d57 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , If parse_events__scanner() collects no entry, perf_evlist__last(evlist) is invalid. Then setting of cmdline_group_boundary touches invalid. It could happend in currect BPF implementation. See [1]. Although it can be fixed, for safety reason it whould be better to introduce this check. Instead of checking number of entries, check data.list instead, so we can add dummy evsel here. [1]: http://lkml.kernel.org/n/1436445342-1402-19-git-send-email-wangnan0@huawei.com Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Cc: Arnaldo Carvalho de Melo Link: http://lkml.kernel.org/r/1440742821-44548-3-git-send-email-wangnan0@huawei.com --- tools/perf/util/parse-events.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index d826e6f..14cd7e3 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1143,10 +1143,14 @@ int parse_events(struct perf_evlist *evlist, const char *str, int entries = data.idx - evlist->nr_entries; struct perf_evsel *last; + if (!list_empty(&data.list)) { + last = list_entry(data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + } + perf_evlist__splice_list_tail(evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last = perf_evlist__last(evlist); - last->cmdline_group_boundary = true; return 0; }