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=-10.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 87C65C5519F for ; Fri, 20 Nov 2020 09:55:13 +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 EC7EF222BA for ; Fri, 20 Nov 2020 09:55:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TPUKYBgl"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S55LSSXQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC7EF222BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AhZdjiY7yURFCabcH5sK26DpOBwdmeIJZfxevrHGzmc=; b=TPUKYBglzVRYGocd+JDGPoR7P JVoGBzSRJGNBaGkAWH2dx6pFvnd4P3+zqeQeqnERNHMbSDbDwDd0otWEn7Uok8GQEEkdf39DzxvHd UeSu8FHLxCtwOCDaeozw0uvugw9pvSBVMrh2GRjXveF9VGF8GozjQHJRaiBntWDUr3j9pNeDCJmSB vY1flgvdHXMjhpDg/l6lX3DIkc2FRvpv4j5V1bDcYPaBVlOR7JAIjOZo1YAgsmAEXdu0qQXnztw7F QrID2bjNkrkgPo4/+w/d10FhepYzdGlWNP4lsvMNxwKlf7zRnrhMTZnlnqXuJl8ntMyLM8Ivl1P5w QUv7o1B3g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg37o-0006Z1-2y; Fri, 20 Nov 2020 09:54:40 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg37l-0006Xx-D5 for linux-arm-kernel@lists.infradead.org; Fri, 20 Nov 2020 09:54:38 +0000 Received: by mail-lf1-x141.google.com with SMTP id f11so12615816lfs.3 for ; Fri, 20 Nov 2020 01:54:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nnr8xWshzVfRjqu1lVD3lA2hqfRThose+MzndLukA5Y=; b=S55LSSXQa9tBayuVd5ZHIYziszlgzXhSSzxIoDEaeIkQLf40s8sfWltKwotACbyZN/ XMlUJWGtbCYaNCKADg4DLa4kxwHK4nAAeR2rX7HD4+bTdTOq+VaYymknfa2R4pQyz810 Be6p2pT6+YE8TmZ1zCOqx7ucBJMbEUpIU2UAXUnMZskn4PpRT5y4OJuKXPqQO8xqjB98 BPDpDaMfMolFrEmcoQXgj74oAQnTNHk5y8nqgxZvqM/ur9MsIvVwjQzTAvBhV+/mes1T /j0fIt5N/F6C1mQESm21fXeA8dgVui5UUOFUBipEcqWXPFUOTcC0FZ/XgyPav/Af8PxR XyiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nnr8xWshzVfRjqu1lVD3lA2hqfRThose+MzndLukA5Y=; b=d7QedR9qxt66VgEBaHuKYb81jSxFNu3meaH6DMKG85ox1E6LsmQa7eevfXyuJBAwAu 72Udxv4b1Mon7hsj2IXo9UPBrzKBFJ47CxzAaCQ1HRd3bYTZBG9cmzVPB6kfjROdYeyv 9XrZzMVNoKHvr6QZw+LvFTTZ2zgYWgv2C8G0o5/QdOjzS/12MAm65/eDxDbL2UXxx9aP ZAUPPzFXHl2bCkreMGIue2ZbUtroYOINqyW6x+wSRID/8vn6d6WaQS9MKqbArc5EQboq i6Mcu0YQ6jeExFmJ3sQF36QXNA1nHrBzPbIz13SjdJlFGJzMB591bsqbgP66JHEV7t1O 4ATg== X-Gm-Message-State: AOAM533j1h8tmhBK7h4oWWd4TrK0q2kzUTnbRumvLrQlTBRXQZtyzFZ9 uXCOFfervbgZAUh1HwtNConq8CDAAjWHqlpMPzs= X-Google-Smtp-Source: ABdhPJy7aroUKAZ9gMHPtCx1laZutVR0g0rWiiItqvOzcRuSiZn2F1jSZLCAURM899b4LzMWe0iYCwDMyXe8CCuT15I= X-Received: by 2002:a05:6512:21c:: with SMTP id a28mr7945973lfo.486.1605866074172; Fri, 20 Nov 2020 01:54:34 -0800 (PST) MIME-Version: 1.0 References: <20201120073909.357536-1-carnil@debian.org> In-Reply-To: <20201120073909.357536-1-carnil@debian.org> From: Andrey Zhizhikin Date: Fri, 20 Nov 2020 10:54:22 +0100 Message-ID: Subject: Re: [PATCH] Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file" To: Salvatore Bonaccorso X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201120_045437_494648_54794E14 X-CRM114-Status: GOOD ( 21.16 ) 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 , Leo Yan , Namhyung Kim , Jiri Olsa , linux-arm-kernel@lists.infradead.org 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 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 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