From patchwork Thu Jan 23 16:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 11348591 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3A68139A for ; Thu, 23 Jan 2020 16:10:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C3EA20684 for ; Thu, 23 Jan 2020 16:10:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lVJ/WVjO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C3EA20684 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=0EorGqgnAGudRhcHGhxwhp49mxvfeYuEHxn0dhVAwug=; b=lVJ/WVjOy8PrxJ +gylrwaLBAfg+0DNkX1V2oxZWWCfN3E9hxDxdDVvcndnxRwfbVIaGqWRdRHF2Yi7t5+Y2jRn2SmDd cqrwmizjQrSGP/xQZWjz7zRRa0eBvvdgldrZ8gk/E+WViMdIQt2f5DYGteYNHqzIzqP0ViPbl6rF9 XADquSgxWzo16ixVc+tuVvjkgDJIA0ke5mX/OvA1VEuEzR7OSSF9ZfpxBsxvpTp4Cl6eErqo8IECo UCSF+jydEajQkvmmPgaxbFE4rYjdm/8CL7be2Bz6a1ubtemh6mgY0QwP8eleP6dW6IS9S1GUpp6ZJ uhig9Kqgv/eMtTDvkDpA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iuf3W-0007VW-LQ; Thu, 23 Jan 2020 16:10:06 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iuf2A-00066Y-Op for linux-arm-kernel@lists.infradead.org; Thu, 23 Jan 2020 16:08:44 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2F4C1328; Thu, 23 Jan 2020 08:08:42 -0800 (PST) Received: from e112479-lin.arm.com (unknown [10.37.9.147]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5EDBD3F68E; Thu, 23 Jan 2020 08:08:35 -0800 (PST) From: James Clark To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/7] perf tools: arm-spe: fix record hang after being terminated Date: Thu, 23 Jan 2020 16:07:33 +0000 Message-Id: <20200123160734.3775-7-james.clark@arm.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200123160734.3775-1-james.clark@arm.com> References: <20200123160734.3775-1-james.clark@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200123_080842_898062_E5B32EA9 X-CRM114-Status: GOOD ( 12.29 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.140.110.172 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Al Grant , wxf.wang@hisilicon.com, Peter Zijlstra , Will Deacon , Jiri Olsa , suzuki.poulose@arm.com, Arnaldo Carvalho de Melo , gengdongjiu@huawei.com, linux-perf-users@vger.kernel.org, Alexander Shishkin , Ingo Molnar , liuqi115@hisilicon.com, James Clark , huawei.libin@huawei.com, Namhyung Kim , nd@arm.com, liwei391@huawei.com, Tan Xiaojun Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Wei Li If the spe event is terminated, we don't enable it again here. Signed-off-by: Wei Li Tested-by: Qi Liu Signed-off-by: James Clark Cc: Will Deacon Cc: Mark Rutland Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Tan Xiaojun Cc: Al Grant Cc: Namhyung Kim --- tools/perf/arch/arm64/util/arm-spe.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c index eba6541ec0f1..629badda724d 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -165,9 +165,13 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx) struct evsel *evsel; evlist__for_each_entry(sper->evlist, evsel) { - if (evsel->core.attr.type == sper->arm_spe_pmu->type) - return perf_evlist__enable_event_idx(sper->evlist, - evsel, idx); + if (evsel->core.attr.type == sper->arm_spe_pmu->type) { + if (evsel->terminated) + return 0; + else + return perf_evlist__enable_event_idx( + sper->evlist, evsel, idx); + } } return -EINVAL; }