70cb99
70cb99
Fix the extension trace.so for RHEL7.6, which moved
70cb99
ftrace_event_call.data into an anonymous union, and the
70cb99
previous offset has changed, so the trace.so extension
70cb99
module fails to load, indicating "no commands registered:
70cb99
shared object unloaded".
70cb99
70cb99
--- crash-trace-command-2.0/trace.c.orig
70cb99
+++ crash-trace-command-2.0/trace.c
70cb99
@@ -853,8 +853,18 @@ static int syscall_get_enter_fields(ulon
70cb99
 	inited = 1;
70cb99
 	data_offset = MAX(MEMBER_OFFSET("ftrace_event_call", "data"), 
70cb99
 		MEMBER_OFFSET("trace_event_call", "data"));
70cb99
-	if (data_offset < 0)
70cb99
-		return -1;
70cb99
+	if (data_offset < 0) {
70cb99
+		/*
70cb99
+		 *  rhel-7.6 moved the .data member into an anonymous union.
70cb99
+		 */
70cb99
+		if (MEMBER_EXISTS("ftrace_event_call", "rh_data") &&
70cb99
+		    MEMBER_EXISTS("ftrace_event_data", "data")) {
70cb99
+			data_offset = MEMBER_OFFSET("ftrace_event_call", "rh_data") +
70cb99
+				MEMBER_OFFSET("ftrace_event_data", "data");
70cb99
+			inited = 2;
70cb99
+		} else
70cb99
+			return -1;
70cb99
+	}
70cb99
 
70cb99
 	enter_fields_offset = MEMBER_OFFSET("syscall_metadata", "enter_fields");
70cb99
 	if (enter_fields_offset < 0)
70cb99
@@ -868,6 +878,12 @@ work:
70cb99
 			"read ftrace_event_call data", RETURN_ON_ERROR))
70cb99
 		return -1;
70cb99
 
70cb99
+	if (inited == 2) {
70cb99
+		if (!readmem(metadata, KVADDR, &metadata, sizeof(metadata),
70cb99
+		    "read ftrace_event_call data (indirect rh_data)", RETURN_ON_ERROR))
70cb99
+			return -1;
70cb99
+	}
70cb99
+
70cb99
 	*fields = metadata + enter_fields_offset;
70cb99
 	return 0;
70cb99
 }