From patchwork Sun Nov 11 04:59:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 10677481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2239613AD for ; Sun, 11 Nov 2018 05:00:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 105A82B596 for ; Sun, 11 Nov 2018 05:00:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 045D32B5A5; Sun, 11 Nov 2018 05:00:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 809B12B596 for ; Sun, 11 Nov 2018 05:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=fj85dY8W4kn3ALjxXoMAgI8ofrzOXkr6dNuNOBXhRUw=; b=lRCdwUqkzzQlpKJEcw/AnZCLRR 3rZ8/dR4RtGm5C6BFcPyOWXKdAiFSHxhYSMMle+inaNSTst5Ti/XLhhi9E4bRVYhJjBXkJ/Mi4wGW /hYKLjJ/nbY3yqTKiSi2Q2REnUyXGLq5fP2h9Lr3cA7VCx+XwbiKAnXo887qPQ9kRgzTvZ0m5oKx0 C+yogQ0yCD9uGhQiJ8kRLqtpgTisATqcNeVmQBQzFLFC9qemWARV0ukgvtv8dD0ESh13Y+3562xKp D/rSjwavpUIEUIhDzy1fiHK15yX+ABSyj5zNF0T9GdG1uNjKYcyu7UQX12AmurO0HgKHbcb4MqfvG hneQJJPg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLhra-0004GZ-N3; Sun, 11 Nov 2018 05:00:46 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gLhrF-0003po-F2 for linux-arm-kernel@lists.infradead.org; Sun, 11 Nov 2018 05:00:27 +0000 Received: by mail-wm1-x343.google.com with SMTP id r63-v6so5403720wma.4 for ; Sat, 10 Nov 2018 21:00:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GlLVr9yrcWWcrnJ7efExsQPwL3OrlynWDQhaVwy2gkU=; b=Zax5fOHToS2p6UfHN0dl+LYAknkoVGAwHHbiN+XuzZBA9NU/Jwwl2WueViP7g5ivm6 bmZLBHRIzMTUFLo5xhr+tWi5+WmiYf9NkPvozoqidPO6jPYWLcZpGRBf/Oht74u/7teU bvpPmPMEA3aqB/3xKmeQy5s4VhhyAw2Xpd9xQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GlLVr9yrcWWcrnJ7efExsQPwL3OrlynWDQhaVwy2gkU=; b=pJ2Ut4HkpJfreRLZIWu0Kqb1SoFTPKmWAmnFIVxQvg3wFlNn5ZFQaqyUSVu7Z4Zh+7 An8JQGkhTGWFSU9ZsW7EdRuR79ghkFpeUB38Mgbhb+Gwa6nt0KRlnXFyi4Z1XwuSGauL XzPyfyzp+HEX88jEwtNFE0w3Nc0VpP5MP7tX6RVik/TZ/aKh59N7yKSIPjynS0ub8w8S c3XN4JBzWg6IBJdK33Bv51L9hxDY35i6f/i+ot6PpK1uQshIyPKY2WgOisUChh3qYAvw BTutGnAPrVLEvOcj3RswEM6AwPwhJc/hDxHYg9VNHly7xKUMpAZYEwUgqu1bwUvIqWy+ BmqQ== X-Gm-Message-State: AGRZ1gIKkhyf+MwmSQEOg4RUEFYNxbPcO99k3OKzdhgsvgPsF6A525Yn Dpz0ivPkzbEKKAqQxmbQ7Nbi5Q== X-Google-Smtp-Source: AJdET5eFWX8l67VgF9fdPek6j3Q3dd9M6It0EjGMCLZtHQw1rPknB3WCRPp6m/PvqH7d/Na4QrHqmQ== X-Received: by 2002:a1c:87cb:: with SMTP id j194-v6mr3643761wmd.2.1541912417568; Sat, 10 Nov 2018 21:00:17 -0800 (PST) Received: from localhost.localdomain ([209.250.228.18]) by smtp.gmail.com with ESMTPSA id t187-v6sm4463802wmt.45.2018.11.10.21.00.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Nov 2018 21:00:16 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Mathieu Poirier , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mike Leach , Robert Walker , Al Grant , Coresight ML Subject: [PATCH v1 2/5] perf cs-etm: Avoid stale branch samples when flush packet Date: Sun, 11 Nov 2018 12:59:40 +0800 Message-Id: <1541912383-19915-3-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541912383-19915-1-git-send-email-leo.yan@linaro.org> References: <1541912383-19915-1-git-send-email-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181110_210025_500341_2A0A32A6 X-CRM114-Status: GOOD ( 20.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP At the end of trace buffer handling, function cs_etm__flush() is invoked to flush any remaining branch stack entries. As a side effect, it also generates branch sample, because the 'etmq->packet' doesn't contains any new coming packet but point to one stale packet after packets swapping, so it wrongly makes synthesize branch samples with stale packet info. We could review below detailed flow which causes issue: Packet1: start_addr=0xffff000008b1fbf0 end_addr=0xffff000008b1fbfc Packet2: start_addr=0xffff000008b1fb5c end_addr=0xffff000008b1fb6c step 1: cs_etm__sample(): sample: ip=(0xffff000008b1fbfc-4) addr=0xffff000008b1fb5c step 2: flush packet in cs_etm__run_decoder(): cs_etm__run_decoder() `-> err = cs_etm__flush(etmq, false); sample: ip=(0xffff000008b1fb6c-4) addr=0xffff000008b1fbf0 Packet1 and packet2 are two continuous packets, when packet2 is the new coming packet, cs_etm__sample() generates branch sample for these two packets and use [packet1::end_addr - 4 => packet2::start_addr] as branch jump flow, thus we can see the first generated branch sample in step 1. At the end of cs_etm__sample() it swaps packets so 'etm->prev_packet'= packet2 and 'etm->packet'=packet1, so far it's okay for branch sample. If packet2 is the last one packet in trace buffer, even there have no any new coming packet, cs_etm__run_decoder() invokes cs_etm__flush() to flush branch stack entries as expected, but it also generates branch samples by taking 'etm->packet' as a new coming packet, thus the branch jump flow is as [packet2::end_addr - 4 => packet1::start_addr]; this is the second sample which is generated in step 2. So actually the second sample is a stale sample and we should not generate it. This patch is to add new argument 'new_packet' for cs_etm__flush(), we can pass 'true' for this argument if there have a new packet, otherwise it will pass 'false' for the purpose of only flushing branch stack entries and avoid to generate sample for stale packet. Signed-off-by: Leo Yan --- tools/perf/util/cs-etm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index fe18d7b..f4fa877 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -955,7 +955,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq) return 0; } -static int cs_etm__flush(struct cs_etm_queue *etmq) +static int cs_etm__flush(struct cs_etm_queue *etmq, bool new_packet) { int err = 0; struct cs_etm_auxtrace *etm = etmq->etm; @@ -989,6 +989,20 @@ static int cs_etm__flush(struct cs_etm_queue *etmq) } + /* + * If 'new_packet' is false, this time call has no a new packet + * coming and 'etmq->packet' contains the stale packet which is + * set at the previous time with packets swapping. In this case + * this function is invoked only for flushing branch stack at + * the end of buffer handling. + * + * Simply to say, branch samples should be generated when every + * time receive one new packet; otherwise, directly bail out to + * avoid generate branch sample with stale packet. + */ + if (!new_packet) + return 0; + if (etm->sample_branches && etmq->prev_packet->sample_type == CS_ETM_RANGE) { err = cs_etm__synth_branch_sample(etmq); @@ -1075,7 +1089,7 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) * Discontinuity in trace, flush * previous branch stack */ - cs_etm__flush(etmq); + cs_etm__flush(etmq, true); break; case CS_ETM_EMPTY: /* @@ -1092,7 +1106,7 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) if (err == 0) /* Flush any remaining branch stack entries */ - err = cs_etm__flush(etmq); + err = cs_etm__flush(etmq, false); } return err;