20251126-linuxkm-full-reloc-support

.github/workflows/linuxkm.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         config: [
-          'EXTRA_CPPFLAGS=-Werror --enable-option-checking=fatal --enable-linuxkm --enable-linuxkm-lkcapi-register=all --enable-all --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-experimental --enable-dual-alg-certs --disable-qt --disable-quic --with-sys-crypto-policy=no --disable-opensslextra --disable-testcert --enable-intelasm --disable-sp-asm --enable-crypttests --enable-linuxkm-benchmarks CFLAGS="-DWOLFSSL_LINUXKM_VERBOSE_DEBUG -Wframe-larger-than=2048 -Wstack-usage=4096 -DBENCH_EMBEDDED -DBENCH_MIN_RUNTIME_SEC=0.01 -DBENCH_NTIMES=1 -DBENCH_AGREETIMES=1" --with-max-rsa-bits=16384',
-          'EXTRA_CPPFLAGS=-Werror --enable-option-checking=fatal --enable-linuxkm --enable-linuxkm-pie --enable-reproducible-build --enable-linuxkm-lkcapi-register=all --enable-all-crypto --enable-cryptonly --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-experimental --disable-qt --disable-quic --with-sys-crypto-policy=no --disable-opensslextra --disable-testcert --enable-intelasm --disable-sp-asm --enable-crypttests --enable-linuxkm-benchmarks CFLAGS="-DWOLFSSL_LINUXKM_VERBOSE_DEBUG -Wframe-larger-than=2048 -Wstack-usage=4096 -DBENCH_EMBEDDED -DBENCH_MIN_RUNTIME_SEC=0.01 -DBENCH_NTIMES=1 -DBENCH_AGREETIMES=1" --with-max-rsa-bits=16384'
+          'EXTRA_CPPFLAGS=-Werror --enable-option-checking=fatal --enable-linuxkm --enable-linuxkm-lkcapi-register=all --enable-all --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-experimental --enable-dual-alg-certs --disable-qt --disable-quic --with-sys-crypto-policy=no --disable-testcert --enable-all-asm --enable-crypttests --enable-linuxkm-benchmarks CFLAGS="-Wframe-larger-than=2048 -Wstack-usage=4096 -DBENCH_EMBEDDED -DBENCH_MIN_RUNTIME_SEC=0.01 -DBENCH_NTIMES=1 -DBENCH_AGREETIMES=1" --with-max-rsa-bits=16384',
+          'EXTRA_CPPFLAGS=-Werror --enable-option-checking=fatal --enable-linuxkm --enable-linuxkm-pie --enable-reproducible-build --enable-linuxkm-lkcapi-register=all --enable-all-crypto --enable-cryptonly --enable-kyber=yes,original --enable-lms --enable-xmss --enable-dilithium --enable-experimental --disable-qt --disable-quic --with-sys-crypto-policy=no --disable-opensslextra --disable-testcert --enable-intelasm --disable-sp-asm --enable-crypttests --enable-linuxkm-benchmarks CFLAGS="-DWOLFSSL_LINUXKM_VERBOSE_DEBUG -DDEBUG_LINUXKM_PIE_SUPPORT -Wframe-larger-than=2048 -Wstack-usage=4096 -DBENCH_EMBEDDED -DBENCH_MIN_RUNTIME_SEC=0.01 -DBENCH_NTIMES=1 -DBENCH_AGREETIMES=1" --with-max-rsa-bits=16384'
         ]
     name: build module
     if: github.repository_owner == 'wolfssl'

linuxkm/Makefile

@@ -148,7 +148,7 @@ GENERATE_RELOC_TAB := $(AWK) '								\
 	    bad_relocs=0;								\
 	    print "\#include <wolfssl/wolfcrypt/libwolfssl_sources.h>";			\
 	    printf("%s\n    ",								\
-		"WOLFSSL_LOCAL const unsigned int wc_linuxkm_pie_reloc_tab[] = { ");	\
+		"WOLFSSL_LOCAL const struct wc_linuxkm_pie_reloc_tab_ent wc_linuxkm_pie_reloc_tab[] = { ");	\
 	    if ("SECTION_MAP" in ENVIRON) {						\
 		while (getline <ENVIRON["SECTION_MAP"] > 0)				\
 		    section_map[$$1] = $$2;						\
@@ -177,44 +177,45 @@ GENERATE_RELOC_TAB := $(AWK) '								\
 		if (section) {								\
 		    switch (section) {							\
 		    case ".text_wolfcrypt":						\
-			section_tag = 0;						\
+			section_tag = "WC_R_SEG_TEXT";					\
 			break;								\
 		    case ".rodata_wolfcrypt":						\
-			section_tag = 1;						\
+			section_tag = "WC_R_SEG_RODATA";				\
 			break;								\
 		    case ".data_wolfcrypt":						\
-			section_tag = 2;						\
+			section_tag = "WC_R_SEG_RWDATA";				\
 			break;								\
 		    case ".bss_wolfcrypt":						\
-			section_tag = 3;						\
+			section_tag = "WC_R_SEG_BSS";					\
 			break;								\
 		    default:								\
 			print "Unexpected section:\n" $$0 >"/dev/stderr";		\
 			++bad_relocs;							\
-			section_tag = 4;						\
+			section_tag = "WC_R_SEG_OTHER";					\
 		    }									\
 		} else {								\
 		    print "Unresolvable symbol reference for relocation:\n" $$0 >"/dev/stderr";\
 		    ++bad_relocs;							\
-		    section_tag = 4;							\
+		    section_tag = "WC_R_SEG_OTHER";					\
 		}									\
+		reloc_type = $$3;							\
 		if (strtonum("0x" gensub("^0*","",1,$$1)) >= lshift(1, 29)) {		\
 		    print "Relocation offset overflow:" >"/dev/stderr";			\
 		    print >"/dev/stderr";						\
 		    exit(1);								\
 		}									\
-		printf("0x%xU%s",							\
-		       or(strtonum("0x" gensub("^0*","",1,$$1)),			\
-			  lshift(section_tag, 29)),					\
-		       ((++n%8) ? ", " : ",\n	 "));					\
+		printf("    { .offset = 0x%xU, .dest_segment = %s, .reloc_type = WC_%s },\n", \
+		       strtonum("0x" gensub("^0*","",1,$$1)),				\
+		       section_tag, reloc_type);					\
 	    }										\
 	}										\
 	END {										\
 	    if (bad_relocs) {								\
 		print "Found " bad_relocs " unresolvable relocations." >"/dev/stderr";	\
 		exit(1);								\
 	    }										\
-	    print "~0U };\nWOLFSSL_LOCAL const unsigned long wc_linuxkm_pie_reloc_tab_length = sizeof wc_linuxkm_pie_reloc_tab / sizeof wc_linuxkm_pie_reloc_tab[0];";\
+	    print "    { .offset = ~0U, .dest_segment = WC_R_SEG_NONE, .reloc_type = WC_R_NONE } };"; \
+            print "WOLFSSL_LOCAL const unsigned long wc_linuxkm_pie_reloc_tab_length = sizeof wc_linuxkm_pie_reloc_tab / sizeof wc_linuxkm_pie_reloc_tab[0];"; \
 	}'
 
 ifeq "$(V)" "1"

linuxkm/linuxkm_wc_port.h

@@ -483,7 +483,31 @@
 #ifndef WC_CONTAINERIZE_THIS
     #include <linux/kthread.h>
     #include <linux/net.h>
-#endif
+    #ifndef WOLFCRYPT_ONLY
+        #include <linux/inet.h>
+        static inline int wc_linuxkm_inet_pton(int af, const char *src, void *dst)
+        {
+            int ret;
+
+            if (!src || !dst)
+                return -EFAULT;
+
+            switch (af) {
+            case AF_INET:
+                ret = in4_pton(src, -1, (u8 *)dst, '\0', NULL);
+                return ret == 1 ? 1 : 0;
+
+            case AF_INET6:
+                ret = in6_pton(src, -1, (u8 *)dst, '\0', NULL);
+                return ret == 1 ? 1 : 0;
+
+            default:
+                return -EAFNOSUPPORT;
+            }
+        }
+        #define XINET_PTON(af, src, dst) wc_linuxkm_inet_pton(af, src, dst)
+    #endif /* !WOLFCRYPT_ONLY */
+#endif /* !WC_CONTAINERIZE_THIS */
 
     #include <linux/slab.h>
     #include <linux/sched.h>
@@ -815,7 +839,52 @@
         __wc_bss_start[],
         __wc_bss_end[];
 
-    extern const unsigned int wc_linuxkm_pie_reloc_tab[];
+    struct wc_linuxkm_pie_reloc_tab_ent {
+        unsigned int offset;
+    #define WC_RELOC_DEST_SEGMENT_BITS 3
+        unsigned int dest_segment:WC_RELOC_DEST_SEGMENT_BITS;
+    #define WC_RELOC_TYPE_BITS 5
+        unsigned int reloc_type:WC_RELOC_TYPE_BITS;
+    };
+
+    enum wc_reloc_dest_segment {
+        WC_R_SEG_NONE = 0,
+        WC_R_SEG_TEXT,
+        WC_R_SEG_RODATA,
+        WC_R_SEG_RWDATA,
+        WC_R_SEG_BSS,
+        WC_R_SEG_OTHER
+    };
+
+    enum wc_reloc_type {
+        WC_R_NONE = 0,
+        WC_R_X86_64_32,
+        WC_R_X86_64_32S,
+        WC_R_X86_64_64,
+        WC_R_X86_64_PC32,
+        WC_R_X86_64_PLT32,
+        WC_R_AARCH64_ABS32,
+        WC_R_AARCH64_ABS64,
+        WC_R_AARCH64_ADD_ABS_LO12_NC,
+        WC_R_AARCH64_ADR_PREL_PG_HI21,
+        WC_R_AARCH64_CALL26,
+        WC_R_AARCH64_JUMP26,
+        WC_R_AARCH64_LDST8_ABS_LO12_NC,
+        WC_R_AARCH64_LDST16_ABS_LO12_NC,
+        WC_R_AARCH64_LDST32_ABS_LO12_NC,
+        WC_R_AARCH64_LDST64_ABS_LO12_NC,
+        WC_R_AARCH64_PREL32,
+        WC_R_ARM_ABS32,
+        WC_R_ARM_PREL31,
+        WC_R_ARM_REL32,
+        WC_R_ARM_THM_CALL,
+        WC_R_ARM_THM_JUMP11,
+        WC_R_ARM_THM_JUMP24,
+        WC_R_ARM_THM_MOVT_ABS,
+        WC_R_ARM_THM_MOVW_ABS_NC
+    };
+
+    extern const struct wc_linuxkm_pie_reloc_tab_ent wc_linuxkm_pie_reloc_tab[];
     extern const unsigned long wc_linuxkm_pie_reloc_tab_length;
     extern ssize_t wc_linuxkm_normalize_relocations(
         const u8 *text_in,