linuxkm: dial in SIMD options in Kbuild; add boilerplate at the top of all files added for linuxkm.

2025-08-01 03:34:39 +02:00 · 2020-08-31 20:53:58 -05:00
parent 4f38fb2f78
commit 5504d9cd4e
6 changed files with 143 additions and 22 deletions
--- a/linuxkm/Kbuild
+++ b/linuxkm/Kbuild
@@ -1,13 +1,31 @@
-# libwolfssl Kbuild
+# Linux kernel-native Makefile ("Kbuild") for libwolfssl.ko
+#
+# Copyright (C) 2006-2020 wolfSSL Inc.
+#
+# This file is part of wolfSSL.
+#
+# wolfSSL is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# wolfSSL is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA

 SHELL=/bin/bash

 ifeq "$(WOLFSSL_OBJ_FILES)" ""
-$(error $$WOLFSSL_OBJ_FILES is unset.)
+    $(error $$WOLFSSL_OBJ_FILES is unset.)
 endif

 ifeq "$(WOLFSSL_CFLAGS)" ""
-$(error $$WOLFSSL_CFLAGS is unset.)
+    $(error $$WOLFSSL_CFLAGS is unset.)
 endif

 WOLFSSL_CFLAGS += -Wframe-larger-than=$(MAX_STACK_FRAME_SIZE) -mpreferred-stack-boundary=4
@@ -33,26 +51,30 @@ MAX_STACK_FRAME_SIZE=$(shell echo $$(( $(KERNEL_THREAD_STACK_SIZE) / 4)))
 libwolfssl-y := $(WOLFSSL_OBJ_FILES) linuxkm/module_hooks.o linuxkm/module_exports.o

 ifeq "$(KERNEL_ARCH)" "x86"
-    WOLFSSL_CFLAGS_NO_VECTOR_INSNS ::= -mno-sse
+    WOLFSSL_CFLAGS_NO_VECTOR_INSNS ::= -mno-sse -mno-80387 -mno-fp-ret-in-387
    ifeq "$(ENABLED_ASM)" "yes"
-        # x86 kernel disables fp and vector insns and register usage with
-        # "-mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx -mno-80387 -mno-fp-ret-in-387".
-        # reenable minimum subset of vector ops needed for compilation,
-	# while explicitly disabling auto-vectorization, and leave fp disabled.
-        # note that including -mavx here is known to introduce unaccommodated
-        # simd register ops, e.g. in integer.c:mp_exch() .
-        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= -msse -mmmx -fno-builtin -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
+        # reenable minimum subset of vector ops needed for compilation of explicitly vectorized
+        # code, while explicitly disabling auto-vectorization, and leave fp disabled.
+        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= -msse -mmmx -msse2 -mavx -mavx2 -mno-80387 -mno-fp-ret-in-387 -fno-builtin -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
    else
-        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::=
+        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= $(WOLFSSL_CFLAGS_NO_VECTOR_INSNS)
    endif
 else ifeq "$(KERNEL_ARCH)" "arm64"
-    WOLFSSL_CFLAGS_NO_VECTOR_INSNS ::=
-    WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::=
-#        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= $AM_CFLAGS -mno-general-regs-only -mno-fpu -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
+    WOLFSSL_CFLAGS_NO_VECTOR_INSNS ::= -mgeneral-regs-only -mno-fpu
+    ifeq "$(ENABLED_ASM)" "yes"
+        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= -mno-general-regs-only -mno-fpu -fno-builtin -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
+    else
+        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= $(WOLFSSL_CFLAGS_NO_VECTOR_INSNS)
+    endif
 else ifeq "$(KERNEL_ARCH)" "arm"
-    WOLFSSL_CFLAGS_NO_VECTOR_INSNS ::=
-    WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::=
-#        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= $AM_CFLAGS -mno-general-regs-only -mno-fpu -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
+    WOLFSSL_CFLAGS_NO_VECTOR_INSNS ::= -mgeneral-regs-only -mno-fpu
+    ifeq "$(ENABLED_ASM)" "yes"
+        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= -mno-general-regs-only -mno-fpu -fno-builtin -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
+    else
+        WOLFSSL_CFLAGS_YES_VECTOR_INSNS ::= $(WOLFSSL_CFLAGS_NO_VECTOR_INSNS)
+    endif
+else
+    $(error Don't know how to target arch $(KERNEL_ARCH).)
 endif

 ccflags-y = $(WOLFSSL_CFLAGS) $(WOLFSSL_CFLAGS_NO_VECTOR_INSNS)
--- a/linuxkm/Makefile
+++ b/linuxkm/Makefile
@@ -1,4 +1,22 @@
-# libwolfssl Linux kernel module Makefile (wraps Kbuild makefile)
+# libwolfssl Linux kernel module Makefile (wraps Kbuild-native makefile)
+#
+# Copyright (C) 2006-2020 wolfSSL Inc.
+#
+# This file is part of wolfSSL.
+#
+# wolfSSL is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# wolfSSL is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA

 SHELL=/bin/bash

--- a/linuxkm/get_thread_size.c
+++ b/linuxkm/get_thread_size.c
@@ -1,3 +1,25 @@
+/* get_thread_size.c -- trivial program to determine stack frame size
+ * for a Linux kernel thread, given a configured source tree.
+ *
+ * Copyright (C) 2006-2020 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
 #ifndef __KERNEL__
 #define __KERNEL__
 #endif
--- a/linuxkm/module_exports.c.template
+++ b/linuxkm/module_exports.c.template
@@ -1,3 +1,25 @@
+/* module_exports.c.template -- static preamble for dynamically generated
+ * module_exports.c (see Kbuild)
+ *
+ * Copyright (C) 2006-2020 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */
+
 #ifdef HAVE_CONFIG_H
    #include <config.h>
 #endif
--- a/linuxkm/module_hooks.c
+++ b/linuxkm/module_hooks.c
@@ -1,6 +1,23 @@
-/* http://h-wrt.com/en/mini-how-to/autotoolsSimpleModule */
-
-/*  src/module_hello.c */
+/* module_hooks.c -- module load/unload hooks for libwolfssl.ko
+ *
+ * Copyright (C) 2006-2020 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+ */

 #ifdef HAVE_CONFIG_H
    #include <config.h>
--- a/m4/ax_linuxkm.m4
+++ b/m4/ax_linuxkm.m4
@@ -1,3 +1,23 @@
+# ax_linuxkm.m4 -- macros for getting attributes of default configured kernel
+#
+# Copyright (C) 2006-2020 wolfSSL Inc.
+#
+# This file is part of wolfSSL.
+#
+# wolfSSL is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# wolfSSL is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
+
 AC_DEFUN([AC_PATH_DEFAULT_KERNEL_SOURCE],
 [
 AC_MSG_CHECKING([for default kernel build root])