Merge pull request #27 from IBM/jo5ta/dev

Fix kernel module build warnings

Author: Jo5ta

VERSION.md

@@ -1,6 +1,8 @@
-1.2.61
+1.2.62
 
 # Change log
+## 1.2.62
+- fix: kernel module build warnings
 ## 1.2.61
 - fix: release workflow copies SRPM to workspace before creating checksums
 ## 1.2.60

kernel_tracing_library/src/abstraction/error.c

@@ -3,13 +3,14 @@
 
 #include "abstraction/error.h"
 #include <linux/kernel.h>
+#include <linux/objtool.h>
 #include <linux/printk.h>
 
 __attribute__((noreturn)) static void
 default_unrecoverbale_error_callback(const char *const message)
 {
 	pr_emerg("%s", message);
-	panic(message);
+	panic("%s", message);
 	while (1)
 		; // panic will never return.
 		  // To fix a error reported by objtool this loop is necessary
@@ -18,7 +19,8 @@ default_unrecoverbale_error_callback(const char *const message)
 void clltk_unrecoverbale_error_callback(const char *const)
 	__attribute__((weak, noreturn, alias("default_unrecoverbale_error_callback")));
 
-void unrecoverable_error(const char *file, size_t line, const char *func, const char *format, ...)
+__attribute__((noreturn)) void unrecoverable_error(const char *file, size_t line, const char *func,
+												   const char *format, ...)
 {
 	char clltk_format[1024];
 	char clltk_message[512];
@@ -36,7 +38,9 @@ void unrecoverable_error(const char *file, size_t line, const char *func, const
 	va_end(args);
 
 	clltk_unrecoverbale_error_callback(clltk_message);
+	__builtin_unreachable();
 }
+STACK_FRAME_NON_STANDARD(unrecoverable_error);
 
 void recoverable_error(const char *file, size_t line, const char *func, const char *format, ...)
 {

kernel_tracing_library/src/initialization.c

@@ -1,17 +1,21 @@
 // Copyright (c) 2024, International Business Machines
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 
-#include "CommonLowLevelTracingKit/tracing/tracing.h"
-
-#include "abstraction/memory.h"
-#include <c-vector/vec.h>
-
 #include <linux/elf.h>
 #include <linux/kallsyms.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 
+// Forward declarations for functions exported by this module
+void _clltk_init_tracing_for_this_module(const struct mod_kallsyms *const allsyms);
+void _clltk_deinit_tracing_for_this_module(const struct mod_kallsyms *const allsyms);
+
+#include "CommonLowLevelTracingKit/tracing/tracing.h"
+
+#include "abstraction/memory.h"
+#include <c-vector/vec.h>
+
 typedef struct {
 	const char *name;
 	_clltk_tracebuffer_handler_t **tracebuffers;

kernel_tracing_library/src/module.c

@@ -20,3 +20,4 @@ static void __exit exit_clltk_kf(void) {}
 module_init(init_clltk_kf);
 module_exit(exit_clltk_kf);
 MODULE_LICENSE("Dual BSD/GPL");
+MODULE_DESCRIPTION("Common Low Level Tracing Kit (CLLTK) kernel tracing module");

tracing_library/source/tracepoint.c

@@ -46,8 +46,8 @@ void _clltk_static_tracepoint_with_args(_clltk_tracebuffer_handler_t *handler,
 										...)
 {
 	if (unlikely(false == _CLLTK_FILE_OFFSET_IS_STATIC(in_file_offset))) {
-		ERROR_LOG("invalid in_file_offset(%lu) at %s:%d for %s", in_file_offset, file, line,
-				  handler->definition.name);
+		ERROR_LOG("invalid in_file_offset(%llu) at %s:%d for %s",
+				  (unsigned long long)in_file_offset, file, line, handler->definition.name);
 		return;
 	}
 
@@ -111,8 +111,8 @@ void _clltk_static_tracepoint_with_dump(_clltk_tracebuffer_handler_t *handler,
 										const void *address, uint32_t size_in_bytes)
 {
 	if (unlikely(false == _CLLTK_FILE_OFFSET_IS_STATIC(in_file_offset))) {
-		ERROR_LOG("invalid in_file_offset(%lu) at %s:%d for %s", in_file_offset, file, line,
-				  handler->definition.name);
+		ERROR_LOG("invalid in_file_offset(%llu) at %s:%d for %s",
+				  (unsigned long long)in_file_offset, file, line, handler->definition.name);
 		return;
 	}