Merge tag 'trace-v6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull tracing fix from Steven Rostedt:

- Fix event format field alignments for 32 bit architectures

The fields in the event format files are used to parse the raw binary
buffer data by applications. If they are incorrect, then the
application produces garbage.

On 32 bit architectures, the function graph 64bit calltime and
rettime were off by 4bytes. That's because the actual fields are in a
packed structure but the macros used by the ftrace events did not
mark them as packed, and instead, gave them their natural alignment
which made their offsets off by 4 bytes.

There are macros to have a packed field within an embedded structure
of an event, but there's no macro for normal fields within a packed
structure of the event. The macro __field_packed() was used for the
packed embedded structure field. Rename that to __field_desc_packed()
(to match the non-packed embedded field macro __field_desc()), and
make __field_packed() for fields that are in a packed event structure
(which matches the unpacked __field() macro).

Switch the calltime and rettime fields of the function graph event to
use the new __field_packed() and this makes the offsets correct.

* tag 'trace-v6.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing: Fix ftrace event field alignments

+36 -24
+5 -2
kernel/trace/trace.h
··· 68 68 #undef __field_fn 69 69 #define __field_fn(type, item) type item; 70 70 71 + #undef __field_packed 72 + #define __field_packed(type, item) type item; 73 + 71 74 #undef __field_struct 72 75 #define __field_struct(type, item) __field(type, item) 73 76 74 77 #undef __field_desc 75 78 #define __field_desc(type, container, item) 76 79 77 - #undef __field_packed 78 - #define __field_packed(type, container, item) 80 + #undef __field_desc_packed 81 + #define __field_desc_packed(type, container, item) 79 82 80 83 #undef __array 81 84 #define __array(type, item, size) type item[size];
+16 -16
kernel/trace/trace_entries.h
··· 79 79 80 80 F_STRUCT( 81 81 __field_struct( struct ftrace_graph_ent, graph_ent ) 82 - __field_packed( unsigned long, graph_ent, func ) 83 - __field_packed( unsigned long, graph_ent, depth ) 82 + __field_desc_packed(unsigned long, graph_ent, func ) 83 + __field_desc_packed(unsigned long, graph_ent, depth ) 84 84 __dynamic_array(unsigned long, args ) 85 85 ), 86 86 ··· 96 96 97 97 F_STRUCT( 98 98 __field_struct( struct fgraph_retaddr_ent, graph_rent ) 99 - __field_packed( unsigned long, graph_rent.ent, func ) 100 - __field_packed( unsigned long, graph_rent.ent, depth ) 101 - __field_packed( unsigned long, graph_rent, retaddr ) 99 + __field_desc_packed( unsigned long, graph_rent.ent, func ) 100 + __field_desc_packed( unsigned long, graph_rent.ent, depth ) 101 + __field_desc_packed( unsigned long, graph_rent, retaddr ) 102 102 __dynamic_array(unsigned long, args ) 103 103 ), 104 104 ··· 123 123 124 124 F_STRUCT( 125 125 __field_struct( struct ftrace_graph_ret, ret ) 126 - __field_packed( unsigned long, ret, func ) 127 - __field_packed( unsigned long, ret, retval ) 128 - __field_packed( unsigned int, ret, depth ) 129 - __field_packed( unsigned int, ret, overrun ) 130 - __field(unsigned long long, calltime ) 131 - __field(unsigned long long, rettime ) 126 + __field_desc_packed( unsigned long, ret, func ) 127 + __field_desc_packed( unsigned long, ret, retval ) 128 + __field_desc_packed( unsigned int, ret, depth ) 129 + __field_desc_packed( unsigned int, ret, overrun ) 130 + __field_packed(unsigned long long, calltime) 131 + __field_packed(unsigned long long, rettime ) 132 132 ), 133 133 134 134 F_printk("<-- %ps (%u) (start: %llx end: %llx) over: %u retval: %lx", ··· 146 146 147 147 F_STRUCT( 148 148 __field_struct( struct ftrace_graph_ret, ret ) 149 - __field_packed( unsigned long, ret, func ) 150 - __field_packed( unsigned int, ret, depth ) 151 - __field_packed( unsigned int, ret, overrun ) 152 - __field(unsigned long long, calltime ) 153 - __field(unsigned long long, rettime ) 149 + __field_desc_packed( unsigned long, ret, func ) 150 + __field_desc_packed( unsigned int, ret, depth ) 151 + __field_desc_packed( unsigned int, ret, overrun ) 152 + __field_packed(unsigned long long, calltime ) 153 + __field_packed(unsigned long long, rettime ) 154 154 ), 155 155 156 156 F_printk("<-- %ps (%u) (start: %llx end: %llx) over: %u",
+15 -6
kernel/trace/trace_export.c
··· 42 42 #undef __field_fn 43 43 #define __field_fn(type, item) type item; 44 44 45 + #undef __field_packed 46 + #define __field_packed(type, item) type item; 47 + 45 48 #undef __field_desc 46 49 #define __field_desc(type, container, item) type item; 47 50 48 - #undef __field_packed 49 - #define __field_packed(type, container, item) type item; 51 + #undef __field_desc_packed 52 + #define __field_desc_packed(type, container, item) type item; 50 53 51 54 #undef __array 52 55 #define __array(type, item, size) type item[size]; ··· 107 104 #undef __field_fn 108 105 #define __field_fn(_type, _item) __field_ext(_type, _item, FILTER_TRACE_FN) 109 106 107 + #undef __field_packed 108 + #define __field_packed(_type, _item) __field_ext_packed(_type, _item, FILTER_OTHER) 109 + 110 110 #undef __field_desc 111 111 #define __field_desc(_type, _container, _item) __field_ext(_type, _item, FILTER_OTHER) 112 112 113 - #undef __field_packed 114 - #define __field_packed(_type, _container, _item) __field_ext_packed(_type, _item, FILTER_OTHER) 113 + #undef __field_desc_packed 114 + #define __field_desc_packed(_type, _container, _item) __field_ext_packed(_type, _item, FILTER_OTHER) 115 115 116 116 #undef __array 117 117 #define __array(_type, _item, _len) { \ ··· 152 146 #undef __field_fn 153 147 #define __field_fn(type, item) 154 148 149 + #undef __field_packed 150 + #define __field_packed(type, item) 151 + 155 152 #undef __field_desc 156 153 #define __field_desc(type, container, item) 157 154 158 - #undef __field_packed 159 - #define __field_packed(type, container, item) 155 + #undef __field_desc_packed 156 + #define __field_desc_packed(type, container, item) 160 157 161 158 #undef __array 162 159 #define __array(type, item, len)