5.15-stable patches

added patches:
	tracing-use-a-struct-alignof-to-determine-trace-event-field-alignment.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index 3a85d470671f4281adffd5e10e986fb9ca90f4a7..e916fa144d106938140f07b6a10674d37f85f15e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -759,3 +759,4 @@ xen-blkback-fix-persistent-grants-negotiation.patch
 xen-blkback-apply-feature_persistent-parameter-when-connect.patch
 xen-blkfront-apply-feature_persistent-parameter-when-connect.patch
 powerpc-fix-eh-field-when-calling-lwarx-on-ppc32.patch
+tracing-use-a-struct-alignof-to-determine-trace-event-field-alignment.patch

diff --git a/queue-5.15/tracing-use-a-struct-alignof-to-determine-trace-event-field-alignment.patch b/queue-5.15/tracing-use-a-struct-alignof-to-determine-trace-event-field-alignment.patch
new file mode 100644 (file)
index 0000000..6e4cf82
--- /dev/null
+++ b/queue-5.15/tracing-use-a-struct-alignof-to-determine-trace-event-field-alignment.patch
@@ -0,0 +1,74 @@
+From 4c3d2f9388d36eb28640a220a6f908328442d873 Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
+Date: Sun, 31 Jul 2022 01:59:28 -0400
+Subject: tracing: Use a struct alignof to determine trace event field alignment
+
+From: Steven Rostedt (Google) <rostedt@goodmis.org>
+
+commit 4c3d2f9388d36eb28640a220a6f908328442d873 upstream.
+
+alignof() gives an alignment of types as they would be as standalone
+variables. But alignment in structures might be different, and when
+building the fields of events, the alignment must be the actual
+alignment otherwise the field offsets may not match what they actually
+are.
+
+This caused trace-cmd to crash, as libtraceevent did not check if the
+field offset was bigger than the event. The write_msr and read_msr
+events on 32 bit had their fields incorrect, because it had a u64 field
+between two ints. alignof(u64) would give 8, but the u64 field was at a
+4 byte alignment.
+
+Define a macro as:
+
+   ALIGN_STRUCTFIELD(type) ((int)(offsetof(struct {char a; type b;}, b)))
+
+which gives the actual alignment of types in a structure.
+
+Link: https://lkml.kernel.org/r/20220731015928.7ab3a154@rorschach.local.home
+
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Masami Hiramatsu <mhiramat@kernel.org>
+Cc: stable@vger.kernel.org
+Fixes: 04ae87a52074e ("ftrace: Rework event_create_dir()")
+Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/trace/trace_events.h |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/include/trace/trace_events.h
++++ b/include/trace/trace_events.h
+@@ -479,16 +479,18 @@ static struct trace_event_functions trac
+ 
+ #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+ 
++#define ALIGN_STRUCTFIELD(type) ((int)(offsetof(struct {char a; type b;}, b)))
++
+ #undef __field_ext
+ #define __field_ext(_type, _item, _filter_type) {                     \
+       .type = #_type, .name = #_item,                                 \
+-      .size = sizeof(_type), .align = __alignof__(_type),             \
++      .size = sizeof(_type), .align = ALIGN_STRUCTFIELD(_type),       \
+       .is_signed = is_signed_type(_type), .filter_type = _filter_type },
+ 
+ #undef __field_struct_ext
+ #define __field_struct_ext(_type, _item, _filter_type) {              \
+       .type = #_type, .name = #_item,                                 \
+-      .size = sizeof(_type), .align = __alignof__(_type),             \
++      .size = sizeof(_type), .align = ALIGN_STRUCTFIELD(_type),       \
+       0, .filter_type = _filter_type },
+ 
+ #undef __field
+@@ -500,7 +502,7 @@ static struct trace_event_functions trac
+ #undef __array
+ #define __array(_type, _item, _len) {                                 \
+       .type = #_type"["__stringify(_len)"]", .name = #_item,          \
+-      .size = sizeof(_type[_len]), .align = __alignof__(_type),       \
++      .size = sizeof(_type[_len]), .align = ALIGN_STRUCTFIELD(_type), \
+       .is_signed = is_signed_type(_type), .filter_type = FILTER_OTHER },
+ 
+ #undef __dynamic_array