Revert "TEST: kCFI"

This reverts commit b0fa875.

Author: dsseng

kernel/build/config-amd64

@@ -521,7 +521,6 @@ CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 # CONFIG_STRICT_SIGALTSTACK_SIZE is not set
-CONFIG_CFI_AUTO_DEFAULT=y
 CONFIG_HAVE_LIVEPATCH=y
 CONFIG_X86_BUS_LOCK_DETECT=y
 # end of Processor type and features
@@ -532,12 +531,11 @@ CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_ENTRY_PADDING=y
 CONFIG_CC_HAS_KCFI_ARITY=y
 CONFIG_FUNCTION_PADDING_CFI=11
-CONFIG_FUNCTION_PADDING_BYTES=11
+CONFIG_FUNCTION_PADDING_BYTES=16
 CONFIG_CALL_PADDING=y
-CONFIG_FINEIBT=y
-CONFIG_FINEIBT_BHI=y
 CONFIG_HAVE_CALL_THUNKS=y
 CONFIG_CALL_THUNKS=y
+CONFIG_PREFIX_SYMBOLS=y
 CONFIG_CPU_MITIGATIONS=y
 CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y
 CONFIG_MITIGATION_RETPOLINE=y
@@ -886,22 +884,21 @@ CONFIG_HAVE_ARCH_KSTACK_ERASE=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_LTO=y
+CONFIG_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_HAS_LTO_CLANG=y
-CONFIG_LTO_NONE=y
+# CONFIG_LTO_NONE is not set
 # CONFIG_LTO_CLANG_FULL is not set
-# CONFIG_LTO_CLANG_THIN is not set
+CONFIG_LTO_CLANG_THIN=y
 CONFIG_ARCH_SUPPORTS_AUTOFDO_CLANG=y
 # CONFIG_AUTOFDO_CLANG is not set
 CONFIG_ARCH_SUPPORTS_PROPELLER_CLANG=y
 # CONFIG_PROPELLER_CLANG is not set
 CONFIG_ARCH_SUPPORTS_CFI=y
-CONFIG_ARCH_USES_CFI_TRAPS=y
-CONFIG_CFI=y
-# CONFIG_CFI_ICALL_NORMALIZE_INTEGERS is not set
+# CONFIG_CFI is not set
 CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS=y
-# CONFIG_CFI_PERMISSIVE is not set
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y
@@ -1000,7 +997,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
 CONFIG_MODVERSIONS=y
 CONFIG_GENKSYMS=y
-# CONFIG_GENDWARFKSYMS is not set
 CONFIG_ASM_MODVERSIONS=y
 # CONFIG_EXTENDED_MODVERSIONS is not set
 CONFIG_BASIC_MODVERSIONS=y

kernel/build/config-arm64

@@ -850,17 +850,17 @@ CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
 CONFIG_SHADOW_CALL_STACK=y
+CONFIG_LTO=y
+CONFIG_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_HAS_LTO_CLANG=y
-CONFIG_LTO_NONE=y
+# CONFIG_LTO_NONE is not set
 # CONFIG_LTO_CLANG_FULL is not set
-# CONFIG_LTO_CLANG_THIN is not set
+CONFIG_LTO_CLANG_THIN=y
 CONFIG_ARCH_SUPPORTS_CFI=y
-CONFIG_CFI=y
-# CONFIG_CFI_ICALL_NORMALIZE_INTEGERS is not set
+# CONFIG_CFI is not set
 CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS=y
-# CONFIG_CFI_PERMISSIVE is not set
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -929,7 +929,8 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT=4
+CONFIG_FUNCTION_ALIGNMENT_8B=y
+CONFIG_FUNCTION_ALIGNMENT=8
 CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
@@ -943,7 +944,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set
 CONFIG_MODVERSIONS=y
 CONFIG_GENKSYMS=y
-# CONFIG_GENDWARFKSYMS is not set
 CONFIG_ASM_MODVERSIONS=y
 # CONFIG_EXTENDED_MODVERSIONS is not set
 CONFIG_BASIC_MODVERSIONS=y
@@ -6633,6 +6633,7 @@ CONFIG_HID_TOPSEED=m
 #
 # HID-BPF support
 #
+# CONFIG_HID_BPF is not set
 # end of HID-BPF support
 
 CONFIG_I2C_HID=y
@@ -10511,6 +10512,8 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FREGS=y
 CONFIG_HAVE_FTRACE_GRAPH_FUNC=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_EXTRA_IPI_TRACEPOINTS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -10533,6 +10536,8 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_FUNCTION_TRACE_ARGS=y
 CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
+CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
 # CONFIG_FPROBE is not set
 # CONFIG_FUNCTION_PROFILER is not set