From patchwork Wed Nov 25 20:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Bonaccorso X-Patchwork-Id: 332385 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp737146ilb; Wed, 25 Nov 2020 12:13:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPuGxmXZSZcd9MTrxLFM4aBG7oLoCacia26J098EXorxtCRnak6zTBexx/6C4GBPgiP37O X-Received: by 2002:aa7:dccd:: with SMTP id w13mr5238634edu.385.1606335234713; Wed, 25 Nov 2020 12:13:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606335234; cv=none; d=google.com; s=arc-20160816; b=SGa26VWU52h3OJvwXbleXyGVNIIxNUMghE5eROIjVOmMqUAGhcGQ2EJLKS8+0Y3gNK 0st+jpB/c9tRPYLU6tqVwXnaUYJV49wlArywDrmu25DBhOpOi0igBGc5+wChN1HWRF0Z 01Tt880wm1++VEEyySi03MljG9u+duyYy3kY10MYAlwLRsVE+A7fI5yILuoFaYPDpgYS zxBbxUeoi4nTiD0KPQ00XNPLtq6UM+xZJmP6epGZ6SCbEd0AzjbtnmAYCmaqk5Ojy1nG 1m5bv79Wpyd2XVmKPQC6ZxuxeVXssH0gxSyI4YrVJZXOD6lsJDmZ7KH3i9eegFez4j5v ZgTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=rLckGLeAjtT46XUjHrEQu8vj1VogMulqErUOW937k/E=; b=AdGupzNiMgEsGvoYZQ4qzTXlr6Yd4w0YmNYk6ZhD+RMuSW9nDboYeFFybjRRtFJYa1 17caUjsZsUHKm/Ivm5g7rs+pms2Ntc/I2jaGihwdZNpBzhch3GfvFvnOGU20IwRPPmi4 5s/366yKDAcgMZGEUj7Rb6IfVUzQqx7zw92wrN2R/5k3MRSEVvOOKXIEb2YiLWHL9UYQ cBIXLjXYaATMhL4uBqcOjsFFx3dbmLk2BFxoh/SMi+UywOZYw55MjE5x6TBU/m8CF6IG 5rf4xEZr5vB63HapknBp+poyK9fZov3MBo8uYn4QLGij5oPfcsQKycVE/nmykbm4mQIJ jFhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jtU3KcwF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r18si1822628edm.82.2020.11.25.12.13.54; Wed, 25 Nov 2020 12:13:54 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jtU3KcwF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728714AbgKYUMn (ORCPT + 14 others); Wed, 25 Nov 2020 15:12:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726009AbgKYUMn (ORCPT ); Wed, 25 Nov 2020 15:12:43 -0500 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23E16C0613D4 for ; Wed, 25 Nov 2020 12:12:43 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id a186so3079914wme.1 for ; Wed, 25 Nov 2020 12:12:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rLckGLeAjtT46XUjHrEQu8vj1VogMulqErUOW937k/E=; b=jtU3KcwF1Mnu7AgK7efH/4quGOGthUudAMFT6C7bgj6SkPZ1kfAmKIqjp7pA4UdMdL rrW1jWVawXBut8QpU1u4r0CYGtLhSbrLdu9QP+uXM9+Is8jW6yM/hqIF0NhdsfPtA3f+ VNqjQ0kYCVuwcpSe2pTGJitRblFR+GRZCgKSDOBwQI1jm5wjbbOC6zBbbcwcYlUidaeM N3i53QHHmeuZfAZ1akLOhgzGQk2rWg8hcAPrKRdqAW3vCfGxh+yicW7skdV9DSKn2OCg YSQYg6rDW1GBtsk4QsEFQaL+Ovp311YmxXo9or+QNTED74MvVtkYsafsWG/oT3W2J7LT O4Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rLckGLeAjtT46XUjHrEQu8vj1VogMulqErUOW937k/E=; b=F4TGMPA19YGS2zNdVWWdLGoXP524l7NdV7fKuH92JxC51nwy16ESLVyM53U/3HNttI tDwwv0WdRrARlS9ezViaN9FyMwg3wlozZUtK8ZeSkChkKhXuGOFGBK5eERzTbcUknbXt SEUh9mtk04wuDK55stdMPZzVyT7Z8pvf4rYBXcYSWteA+sAj697n3Yl6sZuj6Ss39i4u iTbk80PNaqdeSCcZwuLfNMe0F5xNfad8ysxeP9lq7psAaT9zIaG/VUDrHX1W6Myx0QuL HL+TtuYE7Bfku3rEn3/FiQ6kqiBcGRbbXn/E0X7mj/jQAHwBU6nIFjPZgKbSdhMdkOUk TWXQ== X-Gm-Message-State: AOAM532UDwNPPgUNGsUJYiHFrnbI/jIDCsfX5/mQKnwiwp6VjmYhKqhx 6/1gDXu6PKNK41uT4Vy2weA= X-Received: by 2002:a1c:4e06:: with SMTP id g6mr5657483wmh.119.1606335161741; Wed, 25 Nov 2020 12:12:41 -0800 (PST) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id d17sm5767415wro.62.2020.11.25.12.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 12:12:39 -0800 (PST) Sender: Salvatore Bonaccorso From: Salvatore Bonaccorso To: stable@vger.kernel.org Cc: Andrey Zhizhikin , Leo Yan , Mathieu Poirier , Alexander Shishkin , Jiri Olsa , Mike Leach , Namhyung Kim , Robert Walker , Suzuki K Poulouse , coresight ml , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Salvatore Bonaccorso Subject: [PATCH 1/2] perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata Date: Wed, 25 Nov 2020 21:12:14 +0100 Message-Id: <20201125201215.26455-1-carnil@debian.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201122134339.GA6071@leoy-ThinkPad-X240s> References: <20201122134339.GA6071@leoy-ThinkPad-X240s> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Leo Yan commit 95c6fe970a0160cb770c5dce9f80311b42d030c0 upstream. If packet processing wants to know the packet is bound with which ETM version, it needs to access metadata to decide that based on metadata magic number; but we cannot simply to use CPU logic ID number as index to access metadata sequential array, especially when system have hotplugged off CPUs, the metadata array are only allocated for online CPUs but not offline CPUs, so the CPU logic number doesn't match with its index in the array. This patch is to change tuple from traceID-CPU# to traceID-metadata, thus it can use the tuple to retrieve metadata pointer according to traceID. For safe accessing metadata fields, this patch provides helper function cs_etm__get_cpu() which is used to return CPU number according to traceID; cs_etm_decoder__buffer_packet() is the first consumer for this helper function. Signed-off-by: Leo Yan Reviewed-by: Mathieu Poirier Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mike Leach Cc: Namhyung Kim Cc: Robert Walker Cc: Suzuki K Poulouse Cc: coresight ml Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/20190129122842.32041-6-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo [Salvatore Bonaccorso: Adjust for context changes in tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] Signed-off-by: Salvatore Bonaccorso --- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +++--- tools/perf/util/cs-etm.c | 26 ++++++++++++++----- tools/perf/util/cs-etm.h | 9 ++++++- 3 files changed, 31 insertions(+), 12 deletions(-) -- 2.29.2 diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index 938def6d0bb9..f540037eb705 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -278,14 +278,12 @@ cs_etm_decoder__buffer_packet(struct cs_etm_decoder *decoder, enum cs_etm_sample_type sample_type) { u32 et = 0; - struct int_node *inode = NULL; + int cpu; if (decoder->packet_count >= MAX_BUFFER - 1) return OCSD_RESP_FATAL_SYS_ERR; - /* Search the RB tree for the cpu associated with this traceID */ - inode = intlist__find(traceid_list, trace_chan_id); - if (!inode) + if (cs_etm__get_cpu(trace_chan_id, &cpu) < 0) return OCSD_RESP_FATAL_SYS_ERR; et = decoder->tail; @@ -296,7 +294,7 @@ cs_etm_decoder__buffer_packet(struct cs_etm_decoder *decoder, decoder->packet_buffer[et].sample_type = sample_type; decoder->packet_buffer[et].exc = false; decoder->packet_buffer[et].exc_ret = false; - decoder->packet_buffer[et].cpu = *((int *)inode->priv); + decoder->packet_buffer[et].cpu = cpu; decoder->packet_buffer[et].start_addr = CS_ETM_INVAL_ADDR; decoder->packet_buffer[et].end_addr = CS_ETM_INVAL_ADDR; diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 7b5e15cc6b71..5cde3956e19a 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -91,6 +91,20 @@ static int cs_etm__update_queues(struct cs_etm_auxtrace *etm); static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, pid_t tid, u64 time_); +int cs_etm__get_cpu(u8 trace_chan_id, int *cpu) +{ + struct int_node *inode; + u64 *metadata; + + inode = intlist__find(traceid_list, trace_chan_id); + if (!inode) + return -EINVAL; + + metadata = inode->priv; + *cpu = (int)metadata[CS_ETM_CPU]; + return 0; +} + static void cs_etm__packet_dump(const char *pkt_string) { const char *color = PERF_COLOR_BLUE; @@ -230,7 +244,7 @@ static void cs_etm__free(struct perf_session *session) cs_etm__free_events(session); session->auxtrace = NULL; - /* First remove all traceID/CPU# nodes for the RB tree */ + /* First remove all traceID/metadata nodes for the RB tree */ intlist__for_each_entry_safe(inode, tmp, traceid_list) intlist__remove(traceid_list, inode); /* Then the RB tree itself */ @@ -1316,9 +1330,9 @@ int cs_etm__process_auxtrace_info(union perf_event *event, 0xffffffff); /* - * Create an RB tree for traceID-CPU# tuple. Since the conversion has - * to be made for each packet that gets decoded, optimizing access in - * anything other than a sequential array is worth doing. + * Create an RB tree for traceID-metadata tuple. Since the conversion + * has to be made for each packet that gets decoded, optimizing access + * in anything other than a sequential array is worth doing. */ traceid_list = intlist__new(NULL); if (!traceid_list) { @@ -1384,8 +1398,8 @@ int cs_etm__process_auxtrace_info(union perf_event *event, err = -EINVAL; goto err_free_metadata; } - /* All good, associate the traceID with the CPU# */ - inode->priv = &metadata[j][CS_ETM_CPU]; + /* All good, associate the traceID with the metadata pointer */ + inode->priv = metadata[j]; } /* diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index 37f8d48179ca..fb5fc6538b7f 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -53,7 +53,7 @@ enum { CS_ETMV4_PRIV_MAX, }; -/* RB tree for quick conversion between traceID and CPUs */ +/* RB tree for quick conversion between traceID and metadata pointers */ struct intlist *traceid_list; #define KiB(x) ((x) * 1024) @@ -69,6 +69,7 @@ static const u64 __perf_cs_etmv4_magic = 0x4040404040404040ULL; #ifdef HAVE_CSTRACE_SUPPORT int cs_etm__process_auxtrace_info(union perf_event *event, struct perf_session *session); +int cs_etm__get_cpu(u8 trace_chan_id, int *cpu); #else static inline int cs_etm__process_auxtrace_info(union perf_event *event __maybe_unused, @@ -76,6 +77,12 @@ cs_etm__process_auxtrace_info(union perf_event *event __maybe_unused, { return -1; } + +static inline int cs_etm__get_cpu(u8 trace_chan_id __maybe_unused, + int *cpu __maybe_unused) +{ + return -1; +} #endif #endif From patchwork Wed Nov 25 20:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Bonaccorso X-Patchwork-Id: 332384 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp737153ilb; Wed, 25 Nov 2020 12:13:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQYNp9vGzbHT3xr1X9BVNWsukKbR0sl7yeWWPb5SAOybMZW9obkMYb75836q5n3nDqWJnY X-Received: by 2002:aa7:d7d7:: with SMTP id e23mr5231225eds.78.1606335235179; Wed, 25 Nov 2020 12:13:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606335235; cv=none; d=google.com; s=arc-20160816; b=lXQoQlFINx+qS/EWKfVqEwZsdR5rVRazU0cJ1Ft0VL3TWguZXj/mKApDeu5lOerT/2 vuMEJtIASD+TFI3hQOxQ5eyjuuWfhIpXSv49FqChf5kAqVRnhizar5BcKEEzBa8mRTFK IqrobqJdjh6UMd2M41dN6C9s2rCd8L7wMB8GKS78tBja4OaNq/z/Jkctbvr7RZpFWUwl 5yycUykbf/WiqJgxeRQVnP5eJqtgKnnGEfaSUVjVs4fzyYxi1i9cDkqZzHGhAHT/Q/od Y51l/r5Prl6MKmhbSSBw2SGmnFCu/09KeVYzoCPKnKKjYr1iJYNFfVCCj33Q4dFqyvCR YcZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=Bd7TNLRL/BDcofDOp2zwuHONXhhKrPSzdPi97VTB628=; b=QkHdUi/qnxQiGlmbNQfnfYQ2NPsRwq7UC3K6wSNzf5rZlIOjDJIl1Tv5cQu9jIkHAY 6327jWpYCsGyFRSOJaaIP9r6HrR/lSiuCaGUxUVBunRmfbxEWhiQWdOSDe0b9JeaeFWq IV4Mpz1Z78z/4+vcwp7OHH3Y+OQhV8Td2vCms23aNf2MCxa0LYGP3HqgFJ/anfZFGe01 e+/5sqpmMS4BbRlyAg7z3BPsNxyczMgscJQ9ehm4bUDNxNY4oWORnq4SC5H9VQPB0B0l 6OMCM943Vddfmq6P9Pt5juat4ACO/Eysvy9W5XZAZHIdIKkCTpXFj/F4KLcPxySgEPDe A3jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=VyjQXeUD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r18si1822628edm.82.2020.11.25.12.13.54; Wed, 25 Nov 2020 12:13:55 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=VyjQXeUD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728741AbgKYUMw (ORCPT + 14 others); Wed, 25 Nov 2020 15:12:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726009AbgKYUMw (ORCPT ); Wed, 25 Nov 2020 15:12:52 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C443CC0613D4 for ; Wed, 25 Nov 2020 12:12:51 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id k14so1173138wrn.1 for ; Wed, 25 Nov 2020 12:12:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bd7TNLRL/BDcofDOp2zwuHONXhhKrPSzdPi97VTB628=; b=VyjQXeUDKjyEnnM1Mh+13AHZWixDUhlzBY6lHWkbHPMXguGL6kf4OYZTDRckt6QtUK qWv/ncpAFKCe7eP66N5TGlW5vju7zJkbigivGkdiwNaqeV/gopSST2JhPp9Y8JfOxvH/ Lq1ZZRMmbTeVYZsKNPB8QFej5yV7pwko2IY+fvvntSHp3CGnAwcy29ytJoz6NvwEXp7K 2N95BksHPnv4GrRGqwZRWAhuSo3aib/5lx8IIflUjcEjiiXV50aJ19AcXX3m1BkN+9rZ isCKFgUdS4jslXYziW5nvaGyFtXOV08AJsHi8tnRCr6o3VYh/GbJP25Ywzq8UavRgkLJ cDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Bd7TNLRL/BDcofDOp2zwuHONXhhKrPSzdPi97VTB628=; b=DEZG1blfn8agEnCga6esJBfbNgkEXQINRc7orqQ5xByh3G0AFjrZTmMq6YGfgPBvwt E5Vdx/KPYrs6dZ1i7qTg3drvKm5X4gAmkT6fdRCHmNYNUXYdyHpe1oskGLlBkEkSZo6f xqte4vzh9B1jygI9Vt/+AlJiWYbeplQTCzlBC249X+6esFIU17ljzDUqFsrGOHKtkqoc 8yAnK1MEDGp66FwbC43ot5fed6dOaZPp3ILM1HCg1Ak5JbAZRhWCsbEHjlhdUHc+uLxM CVpAVy9nwEtTG4Mw/cNWor0Yu4ZSRAze6+eFVY5eigU4reReKpRefJ3/2mVYWrEMdM7P YRGQ== X-Gm-Message-State: AOAM532PcebtE7vgUH+/07hrDenFi7lBhJXKY7SFHN99kG4WVnRGeWr+ cXMCF+Kwpyyzvz63OLb//0E= X-Received: by 2002:a5d:530d:: with SMTP id e13mr6134329wrv.92.1606335170564; Wed, 25 Nov 2020 12:12:50 -0800 (PST) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id w1sm5436278wmi.24.2020.11.25.12.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 12:12:49 -0800 (PST) Sender: Salvatore Bonaccorso From: Salvatore Bonaccorso To: stable@vger.kernel.org Cc: Andrey Zhizhikin , Leo Yan , Thomas Backlund , Mathieu Poirier , Mike Leach , Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Suzuki Poulouse , Tor Jeremiassen , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Salvatore Bonaccorso Subject: [PATCH 2/2] perf cs-etm: Move definition of 'traceid_list' global variable from header file Date: Wed, 25 Nov 2020 21:12:15 +0100 Message-Id: <20201125201215.26455-2-carnil@debian.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125201215.26455-1-carnil@debian.org> References: <20201122134339.GA6071@leoy-ThinkPad-X240s> <20201125201215.26455-1-carnil@debian.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Leo Yan commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream. The variable 'traceid_list' is defined in the header file cs-etm.h, if multiple C files include cs-etm.h the compiler might complaint for multiple definition of 'traceid_list'. To fix multiple definition error, move the definition of 'traceid_list' into cs-etm.c. Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata") Reported-by: Thomas Backlund Signed-off-by: Leo Yan Reviewed-by: Mathieu Poirier Reviewed-by: Mike Leach Tested-by: Mike Leach Tested-by: Thomas Backlund Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Suzuki Poulouse Cc: Tor Jeremiassen Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Salvatore Bonaccorso --- tools/perf/util/cs-etm.c | 3 +++ tools/perf/util/cs-etm.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 5cde3956e19a..3275b8dc9344 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -87,6 +87,9 @@ struct cs_etm_queue { struct cs_etm_packet *packet; }; +/* RB tree for quick conversion between traceID and metadata pointers */ +static struct intlist *traceid_list; + static int cs_etm__update_queues(struct cs_etm_auxtrace *etm); static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, pid_t tid, u64 time_); diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index fb5fc6538b7f..97c3152f5bfd 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -53,9 +53,6 @@ enum { CS_ETMV4_PRIV_MAX, }; -/* RB tree for quick conversion between traceID and metadata pointers */ -struct intlist *traceid_list; - #define KiB(x) ((x) * 1024) #define MiB(x) ((x) * 1024 * 1024)