Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
Subsystems (4)
PATCH 1/1 Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
This reverts commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream. (but only from 4.19.y)
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--- tools/perf/util/cs-etm.c | 3 --- tools/perf/util/cs-etm.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/cs-etm.c +0 -3
@@ -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_);
tools/perf/util/cs-etm.h +3 -0
@@ -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)
Signature · 1 line
2.29.2
Greg Kroah-Hartman
maintainerQuoted 2 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (but only from 4.19.y)
Thanks for this, now queued up.
greg k-h
Patch "Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"" has been added to the 4.19-stable tree
In reply to Salvatore BonaccorsoThis is a note to let you know that I've just added the patch titled
Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
to the 4.19-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:
revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Nov 20 09:33:00 2020
From: Salvatore Bonaccorso <[email protected]>
Date: Fri, 20 Nov 2020 08:39:09 +0100
Subject: Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
To: [email protected]
Cc: Salvatore Bonaccorso <[email protected]>, Leo Yan <[email protected]>, Alexander Shishkin <[email protected]>, Jiri Olsa <[email protected]>, Mark Rutland <[email protected]>, Namhyung Kim <[email protected]>, Peter Zijlstra <[email protected]>, Suzuki Poulouse <[email protected]>, Tor Jeremiassen <[email protected]>, [email protected], Arnaldo Carvalho de Melo <[email protected]>, Guenter Roeck <[email protected]>, Greg Kroah-Hartman <[email protected]>
Message-ID: <[email protected]>
From: Salvatore Bonaccorso <[email protected]>
This reverts commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream. (but only from 4.19.y)
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--- tools/perf/util/cs-etm.c | 3 --- tools/perf/util/cs-etm.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/cs-etm.c +0 -3
@@ -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_);
tools/perf/util/cs-etm.h +3 -0
@@ -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)
Patches currently in stable-queue which might be from [email protected] are
queue-4.19/revert-perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.patch
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
Quoted 75 lines
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 2Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mark Rutland <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Suzuki Poulouse <[email protected]>Cc Tor Jeremiassen <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Guenter Roeck <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc <[email protected]> # 4.19.ySigned-off-by Salvatore Bonaccorso <[email protected]>--- tools/perf/util/cs-etm.c | 3 --- tools/perf/util/cs-etm.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)tools/perf/util/cs-etm.c +0
-3@@ -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_);tools/perf/util/cs-etm.h +3
-1@@ -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
Signature · 2 lines
Regards, Andrey.
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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
Quoted 79 lines
Quoted 74 lines
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 2Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mark Rutland <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Suzuki Poulouse <[email protected]>Cc Tor Jeremiassen <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Guenter Roeck <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc <[email protected]> # 4.19.ySigned-off-by Salvatore Bonaccorso <[email protected]>--- tools/perf/util/cs-etm.c | 3 --- tools/perf/util/cs-etm.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)tools/perf/util/cs-etm.c +0
-3@@ -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_);tools/perf/util/cs-etm.h +3
-1@@ -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
Signature · 2 lines
Regards, Andrey.
Quoted 12 lines · Leo Yan
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
Quoted 4 lines
The original commit has a dependency for commit
95c6fe970a01("perf
cs-etm: Change tuple from traceID-CPU# to traceID-metadata"). If the commit95c6fe970a01is not backported on v4.19.y, then I think reverting in this patch is the right way to do.
Commit 95c6fe970a01 (perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata) did not change a definition of traceid_list in tools/perf/util/cs-etm.h header file rather a comment above it.
Definition of traceid_list in tools/perf/util/cs-etm.h header file was done in commit cd8bfd8c973ea (perf tools: Add processing of coresight metadata) which appears in all branches starting from linux-4.16.y.
The issue with this definition of traceid_list in header file would break perf builds with newer gcc versions if this commit would be reverted, so I believe that than rather reverting - commit 95c6fe970a01 ("perf
cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should be backported onto 4.19.y instead.
Or am I missing something else here?
Quoted 83 lines
Thanks,
LeoQuoted 79 lines
Quoted 72 lines
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 2Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mark Rutland <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Suzuki Poulouse <[email protected]>Cc Tor Jeremiassen <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Guenter Roeck <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc <[email protected]> # 4.19.ySigned-off-by Salvatore Bonaccorso <[email protected]>--- tools/perf/util/cs-etm.c | 3 --- tools/perf/util/cs-etm.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)tools/perf/util/cs-etm.c +0
-3@@ -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_);tools/perf/util/cs-etm.h +3
-1@@ -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) --Quoted 2 lines
2.29.2
--
Regards,
Andrey.
--
Regards,
Andrey.
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have cff20b3151cc ("perf tests bp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
Regards,
Salvatore
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hello Salvatore,
Quoted 20 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have
cff20b3151cc("perf testsbp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.
Quoted 6 lines
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
I guess (and from what I understand in Leo's reply), porting of 95c6fe970a01 ("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should solve the issue for both older and newer gcc versions.
The breakage is now in [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] file (which uses traceid_list inside). This is solved with the above commit, which concealed traceid_list internally inside [tools/perf/util/cs-etm.c] file and exposed to [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] via cs_etm__get_cpu() call.
Can you try out to port that commit to see if that would solve your regression?
Quoted 3 lines
Regards,
Salvatore
Signature · 2 lines
Regards, Andrey.
Salvatore Bonaccorso
Reviewed-by Mathieu PoirierHi Andrey,
Quoted 42 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 20 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have
cff20b3151cc("perf testsbp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.Quoted 6 lines
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
I guess (and from what I understand in Leo's reply), porting of
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should solve the issue for both older and newer gcc versions.The breakage is now in [
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] file (which usestraceid_listinside). This is solved with the above commit, which concealedtraceid_listinternally inside [tools/perf/util/cs-etm.c] file and exposed to [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] viacs_etm__get_cpu()call.
Quoted 2 lines
Can you try out to port that commit to see if that would solve your regression?
So something like the following will compile as well with the older gcc version.
I realize: I mainline the order of the commits was:
95c6fe970a01 ("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") 168200b6d6ea ("perf cs-etm: Move definition of 'traceid_list' global variable from header f ile")
But to v4.19.y only 168200b6d6ea was backported, and while that was done I now realize the comment was also changed including the change fom 95c6fe970a01.
Thus the proposed backported patch would drop the change in tools/perf/util/cs-etm.c to the comment as this was already done. Thecnically currently the comment would be wrong, because it reads:
/* RB tree for quick conversion between traceID and metadata pointers */
but backport of 95c6fe970a01 is not included.
Would the right thing to do thus be:
- Revert b801d568c7d8 "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
- Backport 95c6fe970a01 ("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")
- Backport 168200b6d6ea ("perf cs-etm: Move definition of 'traceid_list' global variable from header file")
?
Leo ist that what you were proposing?
Regards,
Salvatore
From 7d6b3668d8ae5d3aea8827670ade8ac43b92db4a Mon Sep 17 00:00:00 2001
From: Leo Yan <[email protected]>
Date: Tue, 29 Jan 2019 20:28:39 +0800
Subject: [PATCH] perf cs-etm: Change tuple from traceID-CPU# to
traceID-metadata
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.
[Salvatore Bonaccorso: Drop comment change in tools/perf/util/cs-etm.h which was already changed with b801d568c7d8 ("perf cs-etm: Move definition of 'traceid_list' global variable from header file")]
--- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +++--- tools/perf/util/cs-etm.c | 26 ++++++++++++++----- tools/perf/util/cs-etm.h | 7 +++++ 3 files changed, 30 insertions(+), 11 deletions(-)
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +3 -5
@@ -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 ;
tools/perf/util/cs-etm.c +20 -6
@@ -94,6 +94,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 ;
@@ -233,7 +247,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 */
@@ -1319,9 +1333,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) {
@@ -1387,8 +1401,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]; }/*
tools/perf/util/cs-etm.h +7 -0
@@ -66,6 +66,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,
@@ -73,6 +74,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
Signature · 1 line
2.29.2
Hello Salvatore,
Quoted 68 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 42 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 20 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have
cff20b3151cc("perf testsbp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.Quoted 6 lines
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
I guess (and from what I understand in Leo's reply), porting of
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should solve the issue for both older and newer gcc versions.The breakage is now in [
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] file (which usestraceid_listinside). This is solved with the above commit, which concealedtraceid_listinternally inside [tools/perf/util/cs-etm.c] file and exposed to [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] viacs_etm__get_cpu()call.Quoted 2 lines
Can you try out to port that commit to see if that would solve your regression?
So something like the following will compile as well with the older gcc version.
I realize: I mainline the order of the commits was:
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header f ile")But to v4.19.y only
168200b6d6eawas backported, and while that was done I now realize the comment was also changed including the change fom95c6fe970a01.Thus the proposed backported patch would drop the change in
tools/perf/util/cs-etm.cto the comment as this was already done. Thecnically currently the comment would be wrong, because it reads:/* RB tree for quick conversion between traceID and metadata pointers */
Quoted 7 lines
but backport of
95c6fe970a01is not included.Would the right thing to do thus be:
- Revert
b801d568c7d8"perf cs-etm: Move definition of 'traceid_list' global variable from header file"
- Backport95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")
- Backport168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header file")
Yes, I believe this would be the correct course of action here; this should cover the regression you've encountered and should ensure that perf builds on both the "old" and "new" gcc versions.
Quoted 171 lines
?
Leo ist that what you were proposing?
Regards,
SalvatoreFrom
7d6b3668d8ae5d3aea8827670ade8ac43b92db4aMon Sep 17 00:00:00 2001
From: Leo Yan <[email protected]>
Date: Tue, 29 Jan 2019 20:28:39 +0800
Subject: [PATCH] perf cs-etm: Change tuple from traceID-CPU# to
traceID-metadatacommit
95c6fe970a0160cb770c5dce9f80311b42d030c0upstream.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 <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mike Leach <[email protected]>Cc Namhyung Kim <[email protected]>Cc Robert Walker <[email protected]>Cc Suzuki K Poulouse <[email protected]>Cc coresight ml <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>[Salvatore Bonaccorso: Drop comment change in
tools/perf/util/cs-etm.hwhich was already changed withb801d568c7d8("perf cs-etm: Move definition of 'traceid_list' global variable from header file")]Signed-off-by Salvatore Bonaccorso <[email protected]>--- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 8 +++--- tools/perf/util/cs-etm.c | 26 ++++++++++++++----- tools/perf/util/cs-etm.h | 7 +++++ 3 files changed, 30 insertions(+), 11 deletions(-)tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +3
-5@@ -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 ;tools/perf/util/cs-etm.c +20
-6@@ -94,6 +94,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 ;@@ -233,7 +247,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 */ @@ -1319,9 +1333,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) {@@ -1387,8 +1401,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]; }/* tools/perf/util/cs-etm.h +7
-1@@ -66,6 +66,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,@@ -73,6 +74,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 --2.29.2
Signature · 2 lines
Regards, Andrey.
Hi Andrey,
Quoted 75 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 72 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 42 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 20 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have
cff20b3151cc("perf testsbp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.Quoted 6 lines
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
I guess (and from what I understand in Leo's reply), porting of
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should solve the issue for both older and newer gcc versions.The breakage is now in [
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] file (which usestraceid_listinside). This is solved with the above commit, which concealedtraceid_listinternally inside [tools/perf/util/cs-etm.c] file and exposed to [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] viacs_etm__get_cpu()call.Quoted 2 lines
Can you try out to port that commit to see if that would solve your regression?
So something like the following will compile as well with the older gcc version.
I realize: I mainline the order of the commits was:
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header f ile")But to v4.19.y only
168200b6d6eawas backported, and while that was done I now realize the comment was also changed including the change fom95c6fe970a01.Thus the proposed backported patch would drop the change in
tools/perf/util/cs-etm.cto the comment as this was already done. Thecnically currently the comment would be wrong, because it reads:/* RB tree for quick conversion between traceID and metadata pointers */
but backport of
95c6fe970a01is not included.Would the right thing to do thus be:
Quoted 7 lines
Quoted 3 lines
- Revert
b801d568c7d8"perf cs-etm: Move definition of 'traceid_list' global variable from header file"
- Backport95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")
- Backport168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header file")Yes, I believe this would be the correct course of action here; this should cover the regression you've encountered and should ensure that perf builds on both the "old" and "new" gcc versions.
Although perf tools in v4.19.y won't compile with recent GCCs.
Greg did already queued up the first part of it, so the revert. I think we can pick the later two commits again up after the v4.19.159 release?
Regards,
Salvatore
Hello Salvatore,
Quoted 87 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 75 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 72 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 42 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 20 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have
cff20b3151cc("perf testsbp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.Quoted 6 lines
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
I guess (and from what I understand in Leo's reply), porting of
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should solve the issue for both older and newer gcc versions.The breakage is now in [
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] file (which usestraceid_listinside). This is solved with the above commit, which concealedtraceid_listinternally inside [tools/perf/util/cs-etm.c] file and exposed to [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] viacs_etm__get_cpu()call.Quoted 2 lines
Can you try out to port that commit to see if that would solve your regression?
So something like the following will compile as well with the older gcc version.
I realize: I mainline the order of the commits was:
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header f ile")But to v4.19.y only
168200b6d6eawas backported, and while that was done I now realize the comment was also changed including the change fom95c6fe970a01.Thus the proposed backported patch would drop the change in
tools/perf/util/cs-etm.cto the comment as this was already done. Thecnically currently the comment would be wrong, because it reads:/* RB tree for quick conversion between traceID and metadata pointers */
but backport of
95c6fe970a01is not included.Would the right thing to do thus be:
Quoted 7 lines
Quoted 3 lines
- Revert
b801d568c7d8"perf cs-etm: Move definition of 'traceid_list' global variable from header file"
- Backport95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")
- Backport168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header file")Yes, I believe this would be the correct course of action here; this should cover the regression you've encountered and should ensure that perf builds on both the "old" and "new" gcc versions.
Quoted 5 lines
Although perf tools in v4.19.y won't compile with recent GCCs.
Greg did already queued up the first part of it, so the revert. I think we can pick the later two commits again up after the v4.19.159 release?
Sounds reasonable to me.
Quoted 3 lines
Regards,
Salvatore
Signature · 2 lines
Regards, Andrey.
Hi Salvatore, Andrey,
Quoted 71 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 42 lines · Andrey Zhizhikin
Hello Salvatore,
Quoted 20 lines · Salvatore Bonaccorso
Hi Andrey,
Quoted 9 lines · Andrey Zhizhikin
Quoted 3 lines · Salvatore Bonaccorso
This reverts commit
168200b6d6ea0cb5765943ec5da5b8149701f36aupstream. (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.
TTBOMK, this would not regress the build for newer gcc (specifically gcc10) as 4.19.158 is failing perf tool builds there as well (without the above commit reverted). Just as an example v4.19.y does not have
cff20b3151cc("perf testsbp_account: Make global variable static") which is there in v5.6-rc6 to fix build failures with 10.0.1.Quoted 6 lines
But it did regress builds with older gcc's as for instance used in Debian buster (gcc 8.3.0) since 4.19.152.
Do I possibly miss something? If there is a solution to make it build with newer GCCs and *not* regress previously working GCC versions then this is surely the best outcome though.
I guess (and from what I understand in Leo's reply), porting of
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata") should solve the issue for both older and newer gcc versions.The breakage is now in [
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] file (which usestraceid_listinside). This is solved with the above commit, which concealedtraceid_listinternally inside [tools/perf/util/cs-etm.c] file and exposed to [tools/perf/util/cs-etm-decoder/cs-etm-decoder.c] viacs_etm__get_cpu()call.Quoted 2 lines
Can you try out to port that commit to see if that would solve your regression?
So something like the following will compile as well with the older gcc version.
I realize: I mainline the order of the commits was:
95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header f ile")But to v4.19.y only
168200b6d6eawas backported, and while that was done I now realize the comment was also changed including the change fom95c6fe970a01.Thus the proposed backported patch would drop the change in
tools/perf/util/cs-etm.cto the comment as this was already done. Thecnically currently the comment would be wrong, because it reads:/* RB tree for quick conversion between traceID and metadata pointers */
but backport of
95c6fe970a01is not included.Would the right thing to do thus be:
Quoted 7 lines
- Revert
b801d568c7d8"perf cs-etm: Move definition of 'traceid_list' global variable from header file"
- Backport95c6fe970a01("perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata")
- Backport168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header file")?
Leo ist that what you were proposing?
Though this isn't my proposing, I totally agree with this :)
Just some notes: prior to apply the commit 95c6fe970a01, tools/perf/util/cs-etm-decoder/cs-etm-decoder.c is the only source file which uses the variable "traceid_list"; after applied the commit 95c6fe970a01, the code for using the variable "traceid_list" has been moved out from tools/perf/util/cs-etm-decoder/cs-etm-decoder.c and moved in tools/perf/util/cs-etm.c.
So the commit 168200b6d6ea moves the definition of "traceid_list" from the header file to the source file tools/perf/util/cs-etm.c and it defines the variable as "static".
As you mentioned, backporting 95c6fe970a01 and 168200b6d6ea can fix both for the older (8.3.0) and new GCC (10.0.1). And I confirmed this should not cause logic issue.
Thanks for looking at this issue.
Leo
PATCH 1/2 perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata
From: Leo Yan <[email protected]>
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.
[Salvatore Bonaccorso: Adjust for context changes in tools/perf/util/cs-etm-decoder/cs-etm-decoder.c]
--- .../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(-)
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +3 -5
@@ -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 ;
tools/perf/util/cs-etm.c +20 -6
@@ -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]; }/*
tools/perf/util/cs-etm.h +8 -1
@@ -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
Signature · 1 line
2.29.2
PATCH 2/2 perf cs-etm: Move definition of 'traceid_list' global variable from header file
From: Leo Yan <[email protected]>
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.
--- tools/perf/util/cs-etm.c | 3 +++ tools/perf/util/cs-etm.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/cs-etm.c +3 -0
@@ -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_);
tools/perf/util/cs-etm.h +0 -3
@@ -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)
Signature · 1 line
2.29.2
Re: [PATCH 1/2] perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata
In reply to Salvatore BonaccorsoQuoted 33 lines · Salvatore Bonaccorso
From: Leo Yan <[email protected]>
commit
95c6fe970a0160cb770c5dce9f80311b42d030c0upstream.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 <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mike Leach <[email protected]>Cc Namhyung Kim <[email protected]>Cc Robert Walker <[email protected]>Cc Suzuki K Poulouse <[email protected]>Cc coresight ml <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Quoted 3 lines
[Salvatore Bonaccorso: Adjust for context changes in
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c]Signed-off-by Salvatore Bonaccorso <[email protected]>
That's a fallout on my end. Should have said: This is for 4.19 specifically to be queued.
Background: in
https://lore.kernel.org/stable/[email protected]/168200b6d6ea0cb5765943ec5da5b8149701f36a was queued up for v4.19.y but the prerequeisite commit was not included and so resulted in build failures with gcc 8.3.0.
The commit was later on reverted but in this thread it was asked to actually make it possible to compile the file as well with more recent gcc versions.
Those two patches to be applied in 4.19.y only pick up a backport of the rerequisite commit 95c6fe970a0160cb770c5dce9f80311b42d030c0 (PATCH
1) followed up by the cherry-pick of 168200b6d6ea0cb5765943ec5da5b8149701f36a again.
Regards,
Salvatore
Re: [PATCH 1/2] perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata
Quoted 4 lines · Salvatore Bonaccorso
Quoted 3 lines · Salvatore Bonaccorso
From: Leo Yan <[email protected]>
commit
95c6fe970a0160cb770c5dce9f80311b42d030c0upstream.
[...]
Quoted 9 lines
That's a fallout on my end. Should have said: This is for 4.19 specifically to be queued.
Background: in
https://lore.kernel.org/stable/[email protected]/168200b6d6ea0cb5765943ec5da5b8149701f36awas queued up for v4.19.y but the prerequeisite commit was not included and so resulted in build failures with gcc 8.3.0.
Quoted 8 lines
The commit was later on reverted but in this thread it was asked to actually make it possible to compile the file as well with more recent gcc versions.
Those two patches to be applied in 4.19.y only pick up a backport of the rerequisite commit
95c6fe970a0160cb770c5dce9f80311b42d030c0(PATCH
1) followed up by the cherry-pick of168200b6d6ea0cb5765943ec5da5b8149701f36aagain.
Since the patch 01 is minor tweaked due to context difference, I manually compared it with original patch and looks good to me.
Thank you for the back porting,
Leo
Re: [PATCH 1/2] perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata
Hi Leo,
Quoted 26 lines · Leo Yan
Quoted 4 lines · Salvatore Bonaccorso
Quoted 3 lines · Salvatore Bonaccorso
From: Leo Yan <[email protected]>
commit
95c6fe970a0160cb770c5dce9f80311b42d030c0upstream.[...]
Quoted 9 lines
That's a fallout on my end. Should have said: This is for 4.19 specifically to be queued.
Background: in
https://lore.kernel.org/stable/[email protected]/168200b6d6ea0cb5765943ec5da5b8149701f36awas queued up for v4.19.y but the prerequeisite commit was not included and so resulted in build failures with gcc 8.3.0.Quoted 8 lines
The commit was later on reverted but in this thread it was asked to actually make it possible to compile the file as well with more recent gcc versions.
Those two patches to be applied in 4.19.y only pick up a backport of the rerequisite commit
95c6fe970a0160cb770c5dce9f80311b42d030c0(PATCH
1) followed up by the cherry-pick of168200b6d6ea0cb5765943ec5da5b8149701f36aagain.
Quoted 4 lines
Since the patch 01 is minor tweaked due to context difference, I manually compared it with original patch and looks good to me.
Thank you for the back porting,
Welcome, given I'm unfamiliar with the codebasis for perf the explicit acknowledgement nothing looks wrong was appreciated.
Regards,
Salvatore