From patchwork Fri May 3 00:25:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 163282 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp20179ill; Thu, 2 May 2019 17:26:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqz2ZRP0usUUfBylrLeUJq1KsGZOcS803ujRsnf9wtxXvoQAKUL2D81UWcT++U0tutKMng63 X-Received: by 2002:a65:5009:: with SMTP id f9mr6919895pgo.390.1556843161488; Thu, 02 May 2019 17:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556843161; cv=none; d=google.com; s=arc-20160816; b=R3Qt9vLo3GGOmJ9mLgvWZkiI7DZueWzo/k4NPJzZvdLe/sTDQExP+NABkIq39dCxUw ELRgA0F2NAyARQ6uwJpdQD7Sv97XwLEQzkcoBjVsCep2sTDuQlqVZW7vRcDR+Yu9Kf/f u3RZEjY49Erg7HrOxGqN/IdCT7udfNaX7UIeWq6ryOhpbKBz74bkQ5X4RLOOHHcUBCO3 ILAdEj20X+aXy2u3ck0PPO+SfrlqSKrY8/VYgAWcH1P85pMGBFCstFmNBc1RvCR3fcwx Zbd8fbP1j48ugFcDHLxiuE61daaQ7YfxUmEW9WYppTLYTKBi81n2+KNqsWDey2JV53hW KuIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7EdvDPp+Y1HP5kIqSdLZYUCNMbrsL+lZcFvWhAF09BY=; b=owzOMatFxKYUuDP5VnSM5ZBfFovwml9KotxepYouqrQhfI20GIZhIC1VjWEQsEzyZ9 Z889ObVo+L7GxCWCf+XFfVqdqZebdCLwi1VSCmiJX59miOz4L4Wg0Zy0cc1Dm2Cc7int CELOSgLWOaH0TYc4gTGmJGwXighYRNCVT5i+zPVk+gcwnscB6itSuRnvUEfilbpuqLDK xInRc4BcUVyphbosd5mTsrV320cAcC/pqzP+VctHN43Gj8bFoP3jhDeiCm895v7MbPsr skbuhSUlfNVKH0VdzyJ4jyxeTYYPPoV7BRzW7A4Yze+2wOUhWoTMZzTb0YBdDw7Pq0d+ u/bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=F58Gc31W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1si557164pgj.114.2019.05.02.17.26.01; Thu, 02 May 2019 17:26:01 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=F58Gc31W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726519AbfECA0A (ORCPT + 30 others); Thu, 2 May 2019 20:26:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:43912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726486AbfECAZ6 (ORCPT ); Thu, 2 May 2019 20:25:58 -0400 Received: from quaco.ghostprotocols.net (adsl-173-228-226-134.prtc.net [173.228.226.134]) (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 227532087F; Fri, 3 May 2019 00:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556843157; bh=b9eEv8tb5ZmIOQ5hHJc/agdjrTf1d6CDQxXFTHvdeEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F58Gc31W2vzq9TLvIuE6mODrjbkuFmfb1/mbpI3p8s6Os6yxI4LjnCvoQZxRs/vHp fs7o6BDzVAG3gRzUCbJhIBYRp4N5c+MOAquXds5GNe+R1xPnJYIqbJO+Vk5Bl2+pUW 2XejJ+tEXbfp8lCyPdkhRwQx37EM5FIRVon6ESYc= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Leo Yan , Steven Rostedt , Arnaldo Carvalho de Melo Subject: [PATCH 04/11] tools lib traceevent: Change tag string for error Date: Thu, 2 May 2019 20:25:26 -0400 Message-Id: <20190503002533.29359-5-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190503002533.29359-1-acme@kernel.org> References: <20190503002533.29359-1-acme@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan The traceevent lib is used by the perf tool, and when executing perf test -v 6 it outputs error log on the ARM64 platform: running test 33 '*:*'trace-cmd: No such file or directory [...] trace-cmd: Invalid argument The trace event parsing code originally came from trace-cmd so it keeps the tag string "trace-cmd" for errors, this easily introduces the impression that the perf tool launches trace-cmd command for trace event parsing, but in fact the related parsing is accomplished by the traceevent lib. This patch changes the tag string to "libtraceevent" so that we can avoid confusion and let users to more easily connect the error with traceevent lib. Signed-off-by: Leo Yan Acked-by: Steven Rostedt (VMware) Link: http://lkml.kernel.org/r/20190424013802.27569-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/parse-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/tools/lib/traceevent/parse-utils.c b/tools/lib/traceevent/parse-utils.c index 77e4ec6402dd..e99867111387 100644 --- a/tools/lib/traceevent/parse-utils.c +++ b/tools/lib/traceevent/parse-utils.c @@ -14,7 +14,7 @@ void __vwarning(const char *fmt, va_list ap) { if (errno) - perror("trace-cmd"); + perror("libtraceevent"); errno = 0; fprintf(stderr, " "); From patchwork Fri May 3 00:25:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 163283 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp20577ill; Thu, 2 May 2019 17:26:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOiK+U24EPhgaVJV2kH0cQWyRQaEwyo2WxLazwsfmEzPnV8hz40mkgmEZNfINZ0BSTriwm X-Received: by 2002:a17:902:50ec:: with SMTP id c41mr6970245plj.244.1556843189927; Thu, 02 May 2019 17:26:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556843189; cv=none; d=google.com; s=arc-20160816; b=A8WhmcVp2G7Hg5ZBD/koXxkV+UCZGyesSZFZwJHbpksYvy6arLXj4H9EVoCGAmdEq5 87cTDtsUpHO0+ZgyiJlUcFy09/CFbBVN8sSQFtgAyfQz78U3M2OMAZSRgQB7W7aQxM6Y /V7TSLt1pIYTVwgnfPcX2u8hq8r0Zkwub3bcjBcb1VgPiHpt0L65oW6wNeEE2/Xssvxw RL1d+NWngyU+Rfl29QAED5TFVM4N+Xbmhit8YSeR02ejIB0xb5Rb3OfXjw6AvKfiHZ4Q qvpI1jJKDT9/PK1MMyMxvx9NBk8bnE/RjybAO/oIMl+G9+iWr0Fr2yVfa3b5lUb9Gdhp Xp7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BmHE7yeOoJTrm8lors6q3OhgTGYEgN6Q5Zu3pF76FSc=; b=KNANDmp/dbQR2UAOFitO7ncx1gS4W9WoC2ZvOk/rX+smBbTuX5LJibkkaiJCqzDbpN k9AJWJsm7vvHESzgYzOz7q1ERctE3mxLFo+IAB+i6AB8i4ZWIGCkNvZSa9w8hjUlkReV 1ybRcil7kWLIOrePgInkw2zLw55OXh2mB3RwkcrOGSN53C/tl1J0DRImL7EwMGyEJ6Kx 7F4usHxageKMBR7abRqkva720GeVcoUaGjVkgj2XFaD9f+yY0V9mDyAjb4rMDut9tSQ3 qgS7ySTIZ43BGkDwyDZqNafsFaJvByki+mPpydlrVk0fRUTiH3erB6Wy9qqEHxFPt43a 3JuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KJBrDxZG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9si685984plo.49.2019.05.02.17.26.29; Thu, 02 May 2019 17:26:29 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KJBrDxZG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726586AbfECA0M (ORCPT + 30 others); Thu, 2 May 2019 20:26:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:44072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726544AbfECA0G (ORCPT ); Thu, 2 May 2019 20:26:06 -0400 Received: from quaco.ghostprotocols.net (adsl-173-228-226-134.prtc.net [173.228.226.134]) (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 8098021783; Fri, 3 May 2019 00:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556843166; bh=V6PvajlKKbO94N9tpD0LRZ4MKdSxlJ0h4zbL/CW1ovI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KJBrDxZGikPv7ODXs7raFTmF5MSlSpAqAviVGvOaJnzr8n0btgonB+RtLoHP93SgI 9Kr8WIHeXS9VToq+6sLW/ZUXv7f9Y4ynRWnKXEQ5++0k2UlY7bxKuAD1zgGxfeNJ+4 nDewXMgyCQvWO2SLukjaBWa6J0VDNAbU4cEaeYSM= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Leo Yan , Robert Walker , Alexander Shishkin , Jiri Olsa , Mathieu Poirier , Mike Leach , Suzuki K Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo Subject: [PATCH 07/11] perf cs-etm: Don't check cs_etm_queue::prev_packet validity Date: Thu, 2 May 2019 20:25:29 -0400 Message-Id: <20190503002533.29359-8-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190503002533.29359-1-acme@kernel.org> References: <20190503002533.29359-1-acme@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan Since cs_etm_queue::prev_packet is allocated for all cases, it will never be NULL pointer; now validity checking prev_packet is pointless, remove all of them. Signed-off-by: Leo Yan Tested-by: Robert Walker Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mathieu Poirier Cc: Mike Leach Cc: Namhyung Kim Cc: Suzuki K Poulouse Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20190428083228.20246-2-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cs-etm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.20.1 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 110804936fc3..7777cfc1ad8c 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -981,7 +981,6 @@ static int cs_etm__sample(struct cs_etm_queue *etmq) * PREV_PACKET is a branch. */ if (etm->synth_opts.last_branch && - etmq->prev_packet && etmq->prev_packet->sample_type == CS_ETM_RANGE && etmq->prev_packet->last_instr_taken_branch) cs_etm__update_last_branch_rb(etmq); @@ -1014,7 +1013,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq) etmq->period_instructions = instrs_over; } - if (etm->sample_branches && etmq->prev_packet) { + if (etm->sample_branches) { bool generate_sample = false; /* Generate sample for tracing on packet */ @@ -1071,9 +1070,6 @@ static int cs_etm__flush(struct cs_etm_queue *etmq) struct cs_etm_auxtrace *etm = etmq->etm; struct cs_etm_packet *tmp; - if (!etmq->prev_packet) - return 0; - /* Handle start tracing packet */ if (etmq->prev_packet->sample_type == CS_ETM_EMPTY) goto swap_packet; From patchwork Fri May 3 00:25:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 163284 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp20618ill; Thu, 2 May 2019 17:26:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqypjau4oUvT1Yd4kW5281errGO0kecdOO50jpMcBzAOFfdd564YF68eza4O1s2bALGz355J X-Received: by 2002:a65:484a:: with SMTP id i10mr7015048pgs.408.1556843193438; Thu, 02 May 2019 17:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556843193; cv=none; d=google.com; s=arc-20160816; b=nyb0iojAEgr3dKgnYK31wsDBd0qxBKD3o3hyix6/OjCVKpXNAdP53Fn7aSrUU83MLw Rk8PO5LiGQh1A+htW2LGem2284QypIT9ynyDSQLkteDVB4GUYlLNImrRpE53/J3re4wE JoIz98r9XUz+ajcx8NRi2HoFfRV1NYUvHu9Eqs2BR6QFX+mi8Nq2mTNEvk7uYFNSmMuk 9XpwF9BQWC1UVJebfyPvNS/bncN9pGKQAgcafclHSWD7MnEwPVFWYdEOsc0rekiOvQJx r6ZcZC/tqWX6YQdfHmXHRafrgPkzUjzHFRfPSJw+t4Rs69xWakxq7VM7GBZyGpmlnNQC RQig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AnyZ66sO+ui2p2M6tDSOtXkn/JPM4cS/qOODdOkb0P8=; b=DmrLqagIy0ygb6fAgEs+BsMYxy23Cyij97Zn5hYcF8fcnEA59zh/R0h66dQezmpl7W OZknxJ0pYvQYoA5AjOYMS1HIlx+ft0GQaTRWnoCUIWy32XUgUZpJsPYF7bI2iE4or6bV vNWaAMZfgE32avY3b0mE9X1+NB6CBGsYLR1rQWLXSOkchg6ObzWZ1bUs8hN6Sj6CpIe4 S16kTe6O8eAcoca8tGRB/9O6WxmXLnFGRHZtZ5800hNCvlVaZh/rhEqD6OLybOs7H0TT VfrqQP1t4az5bPNNtvP6yespwlHi2UwdUVNB3TMqxqyJMNgv35p4WsD1CtxT4TUsIZt8 U0gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="VTo6q/l2"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9si685984plo.49.2019.05.02.17.26.33; Thu, 02 May 2019 17:26:33 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="VTo6q/l2"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726571AbfECA0L (ORCPT + 30 others); Thu, 2 May 2019 20:26:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:44136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726528AbfECA0J (ORCPT ); Thu, 2 May 2019 20:26:09 -0400 Received: from quaco.ghostprotocols.net (adsl-173-228-226-134.prtc.net [173.228.226.134]) (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 62D8B217D4; Fri, 3 May 2019 00:26:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556843168; bh=0W/IEo/M2/Xmyn/H5AkhZO7nQPFZLmoXQI5hS0C/M78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VTo6q/l2qk438aHpNfAnJH+BOBJkFvQFuSCy2mO9/y5QOUdX546/hkDlN49DmNTPy MtnXUyP/c2c5SsFnEux+Zj+jm24+0M3lc4emxPL77xyP+Qihg3dzVg8EjSXm3IBby9 dkhpOS5FNKkcqsbb+Xnk/VrNao/9ePm/QPa1gALY= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Leo Yan , Robert Walker , Alexander Shishkin , Jiri Olsa , Mathieu Poirier , Mike Leach , Suzuki K Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo Subject: [PATCH 08/11] perf cs-etm: Always allocate memory for cs_etm_queue::prev_packet Date: Thu, 2 May 2019 20:25:30 -0400 Message-Id: <20190503002533.29359-9-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190503002533.29359-1-acme@kernel.org> References: <20190503002533.29359-1-acme@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan Robert Walker reported a segmentation fault is observed when process CoreSight trace data; this issue can be easily reproduced by the command 'perf report --itrace=i1000i' for decoding tracing data. If neither the 'b' flag (synthesize branches events) nor 'l' flag (synthesize last branch entries) are specified to option '--itrace', cs_etm_queue::prev_packet will not been initialised. After merging the code to support exception packets and sample flags, there introduced a number of uses of cs_etm_queue::prev_packet without checking whether it is valid, for these cases any accessing to uninitialised prev_packet will cause crash. As cs_etm_queue::prev_packet is used more widely now and it's already hard to follow which functions have been called in a context where the validity of cs_etm_queue::prev_packet has been checked, this patch always allocates memory for cs_etm_queue::prev_packet. Reported-by: Robert Walker Suggested-by: Robert Walker Signed-off-by: Leo Yan Tested-by: Robert Walker Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mathieu Poirier Cc: Mike Leach Cc: Namhyung Kim Cc: Suzuki K Poulouse Cc: linux-arm-kernel@lists.infradead.org Fixes: 7100b12cf474 ("perf cs-etm: Generate branch sample for exception packet") Fixes: 24fff5eb2b93 ("perf cs-etm: Avoid stale branch samples when flush packet") Link: http://lkml.kernel.org/r/20190428083228.20246-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cs-etm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 7777cfc1ad8c..de488b43f440 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -422,11 +422,9 @@ static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm) if (!etmq->packet) goto out_free; - if (etm->synth_opts.last_branch || etm->sample_branches) { - etmq->prev_packet = zalloc(szp); - if (!etmq->prev_packet) - goto out_free; - } + etmq->prev_packet = zalloc(szp); + if (!etmq->prev_packet) + goto out_free; if (etm->synth_opts.last_branch) { size_t sz = sizeof(struct branch_stack);