From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3AF8C56202 for ; Fri, 20 Nov 2020 11:20:36 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 379432222F for ; Fri, 20 Nov 2020 11:20:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PWCBrl5n"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yoxSJnMo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 379432222F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tWh+/A37hUi5yNK7aOcMr96nPg7JFStKE+9qim36ojU=; b=PWCBrl5nZ054UI8T4G5nLyCw4 aL58oXY3XFdDWaI3zyam38Hrbwnvfientv5rkk7B3Ful8F4GZaEk4Kzdskej1Nz5GdL83qk0QqCAf JHcE/aKAhniGbGck8DH5j1iKPOnss7NeoeVKs/XfF31fkeFP2ketVNya+nQtVhs99jJbJOts6moqF JbifNhMlEZVjv8+k1gnkTstpBgCzK+pqjE1nqD8kYSXft6p18UXJiAY4Y4sp0XTKH7ECMSUrJQ2pf Ztlb0Br+Q0DI84c+i6hKljYeKhQ85ipnCV4ewzObxjmwpF8y7q3amBnYeqXfKPzm+9NsqQG7zTY50 MjSDW+Vdg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg4SN-0007ww-CJ; Fri, 20 Nov 2020 11:19:59 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg4SK-0007wE-A3 for linux-arm-kernel@lists.infradead.org; Fri, 20 Nov 2020 11:19:58 +0000 Received: by mail-pl1-x644.google.com with SMTP id v21so3446806plo.12 for ; Fri, 20 Nov 2020 03:19:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=jzUvy2GP+Do0ZviqSu559sAr0WjErhNCen33kScI3uU=; b=yoxSJnMofkioQkAOq770pJb98kN/rmkiWky7sBiH4Kktnl8fsnc4rDsNqQS1ETEkQo njmLa0XU5hW8LnmW9hZlhMRALuu+b6vwtze/vDaeIHKf4vD7vTYsVtnJ00WUtAmKRtd0 Fzl7HEYML+k5jJwPL6IzWc526WjaOIIY+eEbthwIrTgPzvPuq2YWV7r4G2p3PEh/WnLO XIdgzM2FD2nAQWDKP2Sm7g8eR5fJBz8seD//r0jQP3D4pYNxQwB7pc/pcPKMtYQ2Ls87 MoKFN3AQX7O6s4umVawBuLZMiGVtWfglD8dhkOlfM/D6TEqw56HotSodFppG96gFqtPX 4iKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=jzUvy2GP+Do0ZviqSu559sAr0WjErhNCen33kScI3uU=; b=WOCsfIghRvtwueBhedaatQNKzgVgy4OHmWyTjT+K+bK0swPJO4WTVHVnl6W4FYzIw9 8Pw4FLKuwwedq5Ji91SSF7suz6a/E7nZHZGd+KZr+/tpIc4A+v9AdNZsvz7/9Pp3jcHa HoBaSp0c/ahPc1CwDcaUGJ8RsB28Ta/45I3HSasXjGKMk2xZ+lvyZFusqiC3taO/YU6q Ded/nKO597+7o+/XfXOGFSIn6pxuIpKBSt5V2I3lzNIS4p0GoR7ElhVfViuCXenohNFv Xh3nF2AKwG2gicvYi4SuT7Rg4u8gsDdHntXVnm8kICxJoVMexbTnhub5EjjEhOzaT5uR 87gg== X-Gm-Message-State: AOAM53300T5L1PtSuqz0STWeXJSaGUbS2G1/FLukaq3yJpd+6IeiR3KA 6L7Rq8kZ94uiXtkQSrW7zkavsQ== X-Google-Smtp-Source: ABdhPJw4xz7zBkSSwoUhsAk5D3z40PXbitBnow5Z1TxuM4r0cUxM+L3uuUFdqwOHtukEdM1iPjVMkQ== X-Received: by 2002:a17:902:c214:b029:d6:9a2d:216c with SMTP id 20-20020a170902c214b02900d69a2d216cmr13533447pll.65.1605871194276; Fri, 20 Nov 2020 03:19:54 -0800 (PST) Received: from leoy-ThinkPad-X240s ([103.127.239.100]) by smtp.gmail.com with ESMTPSA id fh22sm3201556pjb.45.2020.11.20.03.19.50 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Nov 2020 03:19:53 -0800 (PST) Date: Fri, 20 Nov 2020 19:19:48 +0800 From: Leo Yan To: Andrey Zhizhikin Subject: Re: [PATCH] Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file" Message-ID: <20201120111948.GA7077@leoy-ThinkPad-X240s> References: <20201120073909.357536-1-carnil@debian.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201120_061956_699607_2F73C43F X-CRM114-Status: GOOD ( 27.92 ) 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 , Suzuki Poulouse , Alexander Shishkin , Greg Kroah-Hartman , stable@vger.kernel.org, Tor Jeremiassen , Arnaldo Carvalho de Melo , Peter Zijlstra , Guenter Roeck , Namhyung Kim , Jiri Olsa , linux-arm-kernel@lists.infradead.org, Salvatore Bonaccorso Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 20, 2020 at 10:54:22AM +0100, Andrey Zhizhikin wrote: > On Fri, Nov 20, 2020 at 8:39 AM Salvatore Bonaccorso wrote: > > > > This reverts commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream. > > (but only from 4.19.y) > > This revert would fail the build of 4.19.y with gcc10, I believe the > original commit was introduced to address exactly this case. If this > is intended behavior that 4.19.y is not compiled with newer gcc > versions - then this revert is OK. The original commit has a dependency for commit 95c6fe970a01 ("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata"). If the commit 95c6fe970a01 is not backported on v4.19.y, then I think reverting in this patch is the right way to do. Thanks, Leo > > The original commit introduces a build failure as seen on Debian buster > > when compiled with gcc (Debian 8.3.0-6) 8.3.0: > > > > $ LC_ALL=C.UTF-8 ARCH=x86 make perf > > [...] > > Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h' > > CC util/cs-etm-decoder/cs-etm-decoder.o > > CC util/intel-pt.o > > util/cs-etm-decoder/cs-etm-decoder.c: In function 'cs_etm_decoder__buffer_packet': > > util/cs-etm-decoder/cs-etm-decoder.c:287:24: error: 'traceid_list' undeclared (first use in this function); did you mean 'trace_event'? > > inode = intlist__find(traceid_list, trace_chan_id); > > ^~~~~~~~~~~~ > > trace_event > > util/cs-etm-decoder/cs-etm-decoder.c:287:24: note: each undeclared identifier is reported only once for each function it appears in > > make[6]: *** [/build/linux-stable/tools/build/Makefile.build:97: util/cs-etm-decoder/cs-etm-decoder.o] Error 1 > > make[5]: *** [/build/linux-stable/tools/build/Makefile.build:139: cs-etm-decoder] Error 2 > > make[5]: *** Waiting for unfinished jobs.... > > make[4]: *** [/build/linux-stable/tools/build/Makefile.build:139: util] Error 2 > > make[3]: *** [Makefile.perf:633: libperf-in.o] Error 2 > > make[2]: *** [Makefile.perf:206: sub-make] Error 2 > > make[1]: *** [Makefile:70: all] Error 2 > > make: *** [Makefile:77: perf] Error 2 > > > > Link: https://lore.kernel.org/stable/20201114083501.GA468764@eldamar.lan/ > > Cc: Leo Yan > > 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 > > Cc: Arnaldo Carvalho de Melo > > Cc: Guenter Roeck > > Cc: Greg Kroah-Hartman > > Cc: # 4.19.y > > 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(-) > > > > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > > index ad33b99f5d21..7b5e15cc6b71 100644 > > --- a/tools/perf/util/cs-etm.c > > +++ b/tools/perf/util/cs-etm.c > > @@ -87,9 +87,6 @@ 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 c7ef97b198c7..37f8d48179ca 100644 > > --- a/tools/perf/util/cs-etm.h > > +++ b/tools/perf/util/cs-etm.h > > @@ -53,6 +53,9 @@ enum { > > CS_ETMV4_PRIV_MAX, > > }; > > > > +/* RB tree for quick conversion between traceID and CPUs */ > > +struct intlist *traceid_list; > > + > > #define KiB(x) ((x) * 1024) > > #define MiB(x) ((x) * 1024 * 1024) > > > > -- > > 2.29.2 > > > > > -- > Regards, > Andrey. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel