From patchwork Sun Jun 17 11:23:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10468823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 97F756028E for ; Sun, 17 Jun 2018 11:46:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F717286FD for ; Sun, 17 Jun 2018 11:46:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6253928899; Sun, 17 Jun 2018 11:46:19 +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=-0.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, SORTED_RECIPS autolearn=no 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 EF714286FD for ; Sun, 17 Jun 2018 11:46:18 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:From:To: Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=13CtfCKC2meamPP3o3MB7jrQbog5o8tj/aoB5WgIJKM=; b=Stlne+36T8SZCC dFUYdqgq/eXQNA7vixybBtcPyV1zjzCP5RDalOM0R6woerdVJrd9Lj0cVdcVXNxv3H+4EjDVR9jjq XoDVL7ULPiXMHn/lqYCm8HfjxbmFsOjGGhMzXUXyGZApp2P7N/bFNSyCoQA2KYTTr9IFPXJhiyCpQ 55Jq53aCGqLeTKNcPg/xz6Eo1W3TRSToZft1mrRK48TYrOsqc81kRlFYIwUfA7Mh5lsN4cI62BpbO LXG1xpocOX/fmOLQSv/or6RoFQaAliKvHmOmW49pXBBrZpVRwFZyhPwC7aYwolSpSSuqdxxh1N8nx f2w7bItxFglbmTBcjLbQ==; 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 1fUW8J-00066A-8w; Sun, 17 Jun 2018 11:46:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUW8F-00064i-Ij for linux-arm-kernel@lists.infradead.org; Sun, 17 Jun 2018 11:46:09 +0000 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (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 56BA1208E1; Sun, 17 Jun 2018 11:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1529235956; bh=UmuCiHsf2CzHSMLiRJI5a6jO6H92v928SZY6Lxlr68g=; h=Subject:To:Cc:From:Date:From; b=uBJ1FX8XvLOlH9CnWR3nQKR+KF0mRLwlhlLzk2M/4PfHIEpMsL8DXdBXKK/tUuOBC 4EHS8drWOV8+mCz1WHhVXee5IW8k/Yu3J4qHFfbAbeu8GNX1dmH7KMa5RK1lbA59WR 79qyl4cpvsNChijIWP0PTJbMQzC1LRGm8XZUVVAE= Subject: Patch "perf cs-etm: Support unknown_thread in cs_etm_auxtrace" has been added to the 4.16-stable tree To: 1525924920-4381-1-git-send-email-leo.yan@linaro.org, acme@redhat.com, alexander.levin@microsoft.com, alexander.shishkin@linux.intel.com, gregkh@linuxfoundation.org, jolsa@redhat.com, leo.yan@linaro.org, linux-arm-kernel@lists.infradead.org, mathieu.poirier@linaro.org, namhyung@kernel.org, peterz@infradead.org From: Date: Sun, 17 Jun 2018 13:23:47 +0200 Message-ID: <1529234627163178@kroah.com> MIME-Version: 1.0 X-stable: commit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180617_044607_659469_97E05113 X-CRM114-Status: GOOD ( 14.03 ) 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: stable-commits@vger.kernel.org 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 This is a note to let you know that I've just added the patch titled perf cs-etm: Support unknown_thread in cs_etm_auxtrace to the 4.16-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-cs-etm-support-unknown_thread-in-cs_etm_auxtrace.patch and it can be found in the queue-4.16 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. From foo@baz Sun Jun 17 12:07:34 CEST 2018 From: Leo Yan Date: Thu, 10 May 2018 12:01:59 +0800 Subject: perf cs-etm: Support unknown_thread in cs_etm_auxtrace From: Leo Yan [ Upstream commit 46d53620044f7b574c0f3216f8b4f2ce3559ce31 ] CoreSight doesn't allocate thread structure for unknown_thread in ETM auxtrace, so unknown_thread is NULL pointer. If the perf data doesn't contain valid tid and then cs_etm__mem_access() uses unknown_thread instead as thread handler, this results in a segmentation fault when thread__find_addr_map() accesses the thread handler. This commit creates a new thread data which is used by unknown_thread, so CoreSight tracing can roll back to use unknown_thread if perf data doesn't include valid thread info. This commit also releases thread data for initialization failure case and for normal auxtrace free flow. Signed-off-by: Leo Yan Acked-by: Mathieu Poirier Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1525924920-4381-1-git-send-email-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/cs-etm.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) Patches currently in stable-queue which might be from leo.yan@linaro.org are queue-4.16/perf-cs-etm-support-unknown_thread-in-cs_etm_auxtrace.patch --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -212,6 +212,7 @@ static void cs_etm__free(struct perf_ses for (i = 0; i < aux->num_cpu; i++) zfree(&aux->metadata[i]); + thread__zput(aux->unknown_thread); zfree(&aux->metadata); zfree(&aux); } @@ -980,6 +981,23 @@ int cs_etm__process_auxtrace_info(union etm->auxtrace.free = cs_etm__free; session->auxtrace = &etm->auxtrace; + etm->unknown_thread = thread__new(999999999, 999999999); + if (!etm->unknown_thread) + goto err_free_queues; + + /* + * Initialize list node so that at thread__zput() we can avoid + * segmentation fault at list_del_init(). + */ + INIT_LIST_HEAD(&etm->unknown_thread->node); + + err = thread__set_comm(etm->unknown_thread, "unknown", 0); + if (err) + goto err_delete_thread; + + if (thread__init_map_groups(etm->unknown_thread, etm->machine)) + goto err_delete_thread; + if (dump_trace) { cs_etm__print_auxtrace_info(auxtrace_info->priv, num_cpu); return 0; @@ -994,16 +1012,18 @@ int cs_etm__process_auxtrace_info(union err = cs_etm__synth_events(etm, session); if (err) - goto err_free_queues; + goto err_delete_thread; err = auxtrace_queues__process_index(&etm->queues, session); if (err) - goto err_free_queues; + goto err_delete_thread; etm->data_queued = etm->queues.populated; return 0; +err_delete_thread: + thread__zput(etm->unknown_thread); err_free_queues: auxtrace_queues__free(&etm->queues); session->auxtrace = NULL;