Fix perf build failures
Subsystems (4)
cover Fix perf build failures
Hi Greg, Sasha and all,
This is a resubmit of the patches already done in
https://lore.kernel.org/stable/[email protected]/
and
https://lore.kernel.org/stable/[email protected]/
The issue can be explained as this. In
https://lore.kernel.org/stable/[email protected]/
on request 168200b6d6ea ("perf cs-etm: Move definition of 'traceid_list' global variable from header file") was queued back to 4.19.y to fix build failures for perf with more recent GCCs.
But for 4.19.y this was wrong because it missed to pick as well a dependency needed, and in turn it caused build failures with older GCC (8.3.0 as used in Debian stable in that case).
The commit was reverted in a later in 4.19.159.
It as though requested to try to allow as well compilation with more recent GCCs (while obviously not breaking older GCC builds) and found that the cause was just the missing dependency to pick up, namely pick 95c6fe970a01 ("perf
cs-etm: Change tuple from traceID-CPU# to traceID-metadata") before 168200b6d6ea ("perf cs-etm: Move definition of 'traceid_list' global variable from header file").
Regards,
Salvatore
Leo Yan (2):
perf cs-etm: Change tuple from traceID-CPU# to traceID-metadata 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 | 29 +++++++++++++++---- tools/perf/util/cs-etm.h | 10 +++++-- 3 files changed, 33 insertions(+), 14 deletions(-)
Signature · 1 line
2.30.0.rc2
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.30.0.rc2
PATCH 2/2 perf cs-etm: Move definition of 'traceid_list' global variable from header file
In reply to Salvatore BonaccorsoFrom: 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.30.0.rc2
Greg Kroah-Hartman
maintainerQuoted 19 lines · Salvatore Bonaccorso
Hi Greg, Sasha and all,
This is a resubmit of the patches already done in
https://lore.kernel.org/stable/[email protected]/
and
https://lore.kernel.org/stable/[email protected]/The issue can be explained as this. In
https://lore.kernel.org/stable/[email protected]/
on request
168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header file") was queued back to 4.19.y to fix build failures for perf with more recent GCCs.But for 4.19.y this was wrong because it missed to pick as well a dependency needed, and in turn it caused build failures with older GCC (8.3.0 as used in Debian stable in that case).
Quoted 8 lines
The commit was reverted in a later in 4.19.159.
It as though requested to try to allow as well compilation with more recent GCCs (while obviously not breaking older GCC builds) and found that the cause was just the missing dependency to pick up, namely pick
95c6fe970a01("perf
cs-etm: Change tuple from traceID-CPU# to traceID-metadata") before168200b6d6ea("perf cs-etm: Move definition of 'traceid_list' global variable from header file").
Thanks for these, both now queued up.
greg k-h