From patchwork Thu May 3 15:18:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 134910 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2053445lji; Thu, 3 May 2018 08:18:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrw+fRREsy6Kq9IRPLoxUiYIVcKs8KUVsdAQdKdAFgopJTtpIRKSOsoBo2XTiBZh9/s/1iS X-Received: by 2002:a17:902:d808:: with SMTP id a8-v6mr24482648plz.177.1525360726954; Thu, 03 May 2018 08:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525360726; cv=none; d=google.com; s=arc-20160816; b=VeucNv778GAUONT1wRfGhrJsOKYKVStcCi9Ug+TPHHQtwTEuLo2daWx+81VDoNp0Oi 4oKj551OEbEcnB9eoSH+pqC5p4nBU8mv5t2Bc8v5wXZgRaBrnarV/Mnr8dfChE1k5c76 ODLwb7Vvuco3M7G4s0GRjdxqM1jJpKw4c5Z1tK0T509iXTVOr62J5MPzygycaaWgGsQH d6mWRdoVaTpqYRzzdhiiOx2JBGxnX9o0l02BS02vyzT2w0vupz3mgJotWzl5uxVQOdQ1 Q8vyoC2g4WG/Gvdiml25xAbLy06iMRlr26z0QSgIWqWNRryAHlsosOm5+V2YeusiAuI2 zkgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=9el/zCbBYWuz7WTle5ZIkHG1G3bV4ZvnWaPs3uJjg28=; b=R9qD11iJAvnuHq2VAttiBanrMDqP78eKvUtW0gJqjc7Cx4G4YzsDqRXfo/gqv83mPS i0Xi2+zamzmNmroqRoVM5KFPmN8kb5u0cdfQuADGweP2yBs+lemsac3nvTZtgSzsK+zW Ce01AoQ5QYKwFxnnWbnkU5tOw0Vs7URNUCWSCcx4apYzgcRAY9v2DwrWbDNaW9tVXI+2 35ehK39CsKCSOpVaY16fciZa4OrHuOQvXdJm+NYtB2tz5gjJGZyWm+SWcAIztc9gNGyd N6sdOJNrZDQOFMaziTQwO2es3eRjx7OSG+yI9+M+vSVmsBLnrLfSSI7/9T80+9V3NCaM h0Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AlQrT77L; 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=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z14-v6si11650123pgc.617.2018.05.03.08.18.46; Thu, 03 May 2018 08:18: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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AlQrT77L; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751271AbeECPSo (ORCPT + 29 others); Thu, 3 May 2018 11:18:44 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:32950 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751088AbeECPSm (ORCPT ); Thu, 3 May 2018 11:18:42 -0400 Received: by mail-pg0-f65.google.com with SMTP id i194-v6so13370022pgd.0 for ; Thu, 03 May 2018 08:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=9el/zCbBYWuz7WTle5ZIkHG1G3bV4ZvnWaPs3uJjg28=; b=AlQrT77LlbCulj3/DNxP/Th1Hef7vzV8/++cAk4y46O0n0Q1YX+EPFJ26jTLl03Ez+ zejqoSL7CpteFsok3hXalFHxJouk3pb2ZIITzHdSkqnjEG2qZkB7Wi4+3W9DkauPonbG 3da3V+6VQ3+sDlTwsE8Z/QDYm06OemlAR7qmk= 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; bh=9el/zCbBYWuz7WTle5ZIkHG1G3bV4ZvnWaPs3uJjg28=; b=V2O+W6+esNnnhCFGqOemXY6zUUaemxDX0+FPzR6nME1LFryjEMvYocoafvBeJ0OrXa Z0WLgLItWARGFJs4bO/OOut+nspNpgNMBb5dIFeOiqtxGPWKrKYH9bZHiziHEvt7Ac9T VbNAY+u1+o6gmp9EOPEZXCq1L/iGb9SfQL+A+fVNZmqceLZ9UUJI+HphGsRIu4HvBzAN LisTZ/RKRfqrv4WaQ3DeRKBui1nKfgkDBlDd3ZoHhsAsc9tM7MwiXO4f91aCj2oQyw7p fTXIR73ErqnPcbOm5hcIKcNspMMbk87WCHCmOLayX0Wd3IQ8ZYjFvipsU7X5ZPe1Mcz1 xXsg== X-Gm-Message-State: ALQs6tAHn7cnwH7WdpITGy6nJ+zzQv73CijpbN449B8sGtg9XuOla1vc VRwQF5C/aFn4J2W01GSmwZsk2k9K5Ao= X-Received: by 2002:a63:7114:: with SMTP id m20-v6mr19653789pgc.144.1525360722217; Thu, 03 May 2018 08:18:42 -0700 (PDT) Received: from localhost.localdomain (li1168-94.members.linode.com. [45.79.69.94]) by smtp.gmail.com with ESMTPSA id x5-v6sm18134192pgv.15.2018.05.03.08.18.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 May 2018 08:18:41 -0700 (PDT) From: Leo Yan To: Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org Cc: Leo Yan Subject: [PATCH 1/2] perf cs-etm: Support unknown_thread in cs_etm_auxtrace Date: Thu, 3 May 2018 23:18:22 +0800 Message-Id: <1525360703-26159-1-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 segmentation fault when thread__find_addr_map() accesses thread handler. This commit creates 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 --- tools/perf/util/cs-etm.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) -- 2.7.4 Acked-by: Mathieu Poirier diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 6533b1a..417302c 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -239,6 +239,7 @@ static void cs_etm__free(struct perf_session *session) for (i = 0; i < aux->num_cpu; i++) zfree(&aux->metadata[i]); + thread__zput(aux->unknown_thread); zfree(&aux->metadata); zfree(&aux); } @@ -266,6 +267,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address, if (!thread) { if (cpumode != PERF_RECORD_MISC_KERNEL) return -EINVAL; + thread = etmq->etm->unknown_thread; } @@ -1355,6 +1357,23 @@ int cs_etm__process_auxtrace_info(union perf_event *event, 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; @@ -1369,16 +1388,18 @@ int cs_etm__process_auxtrace_info(union perf_event *event, 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;