Skip to content

[CLK 6.18] Sync minimal x86 config with full x86 config, disable X86_KERNEL_IBT - #1746

Merged
bmastbergen merged 3 commits into
ciq-6.18.yfrom
{bmastbergen_minimal_ibt}_ciq-6.18.y
Oct 30, 2026
Merged

bmastbergen merged 3 commits into
ciq-6.18.yfrom
{bmastbergen_minimal_ibt}_ciq-6.18.y

Conversation

@bmastbergen

@bmastbergen bmastbergen commented Oct 30, 2026 •

Copy link
Copy Markdown
Collaborator

With this PR the only difference between a full x86 build and a minimal x86 build is no X86_KERNEL_IBT

 % diff -urw ciq/configs/kernel-x86_64.config ciq/configs/kernel-x86_64-minimal.config
--- ciq/configs/kernel-x86_64.config    2026-10-30 07:24:40.493377383 -0400
+++ ciq/configs/kernel-x86_64-minimal.config    2026-10-30 07:29:02.411148179 -0400
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.18.55 Kernel Configuration
+# Linux/x86_64 6.18.59 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
@@ -496,7 +496,7 @@
 CONFIG_X86_UMIP=y
 CONFIG_CC_HAS_IBT=y
 CONFIG_X86_CET=y
-CONFIG_X86_KERNEL_IBT=y
+# CONFIG_X86_KERNEL_IBT is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_ARCH_PKEY_BITS=4
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
@@ -837,6 +837,7 @@
 CONFIG_X86_DISABLED_FEATURE_CENTAUR_MCR=y
 CONFIG_X86_DISABLED_FEATURE_LAM=y
 CONFIG_X86_DISABLED_FEATURE_XENPV=y
+CONFIG_X86_DISABLED_FEATURE_IBT=y
 CONFIG_AS_WRUSS=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 CONFIG_ARCH_HAS_DMA_OPS=y

@bmastbergen
bmastbergen requested review from a team and kemotaha October 30, 2026 13:49

@kerneltoast kerneltoast left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@bmastbergen
bmastbergen merged commit 0e90a38 into ciq-6.18.y Oct 30, 2026
12 checks passed
@bmastbergen
bmastbergen deleted the {bmastbergen_minimal_ibt}_ciq-6.18.y branch October 30, 2026 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants