fix(kernel): restore required configs and disable unused features

base/comps/kernel/6.18-aarch64-azl.config

@@ -1024,7 +1024,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOPRIO=y
@@ -2060,7 +2060,7 @@ CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_NETROM=m
-CONFIG_ROSE=m
+# CONFIG_ROSE is not set
 
 #
 # AX.25 network device drivers
@@ -12572,7 +12572,7 @@ CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_V4 is not set
 CONFIG_XFS_SUPPORT_ASCII_CI=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -12886,10 +12886,7 @@ CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_COMPRESSION is not set
-CONFIG_SMB_SERVER=m
-CONFIG_SMB_SERVER_SMBDIRECT=y
-CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
-CONFIG_SMB_SERVER_KERBEROS5=y
+# CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
@@ -12989,10 +12986,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
 # CONFIG_SECURITY_SELINUX_DEBUG is not set
-CONFIG_SECURITY_SMACK=y
-# CONFIG_SECURITY_SMACK_BRINGUP is not set
-CONFIG_SECURITY_SMACK_NETFILTER=y
-CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024

base/comps/kernel/6.18-x86_64-azl.config

@@ -1082,7 +1082,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOPRIO=y
@@ -2079,7 +2079,7 @@ CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_NETROM=m
-CONFIG_ROSE=m
+# CONFIG_ROSE is not set
 
 #
 # AX.25 network device drivers
@@ -2442,7 +2442,7 @@ CONFIG_EDD=y
 CONFIG_EDD_OFF=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
+CONFIG_DMI_SYSFS=m
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
@@ -5564,7 +5564,9 @@ CONFIG_DRM_AMD_DC_FP=y
 CONFIG_DRM_AMD_SECURE_DISPLAY=y
 # end of Display Engine Configuration
 
-# CONFIG_HSA_AMD is not set
+CONFIG_HSA_AMD=y
+CONFIG_HSA_AMD_SVM=y
+CONFIG_HSA_AMD_P2P=y
 # CONFIG_DRM_NOUVEAU is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_FORCE_PROBE=""
@@ -7261,7 +7263,7 @@ CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_V4 is not set
 CONFIG_XFS_SUPPORT_ASCII_CI=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -7552,10 +7554,7 @@ CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_COMPRESSION is not set
-CONFIG_SMB_SERVER=m
-CONFIG_SMB_SERVER_SMBDIRECT=y
-CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
-CONFIG_SMB_SERVER_KERBEROS5=y
+# CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
@@ -7656,10 +7655,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
 # CONFIG_SECURITY_SELINUX_DEBUG is not set
-CONFIG_SECURITY_SMACK=y
-# CONFIG_SECURITY_SMACK_BRINGUP is not set
-CONFIG_SECURITY_SMACK_NETFILTER=y
-CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024

base/comps/kernel/kernel.spec

@@ -17,7 +17,7 @@
 # When rebuilding without a version change, bump azl_pkgrelease (manual release).
 # This corresponds to upstream Fedora's %{pkgrelease} macro; we use it in the
 # %{specrelease} macro below instead of a hardcoded value.
-%define azl_pkgrelease 1
+%define azl_pkgrelease 2
 # NVIDIA open GPU kernel module version (built as a kmod subpackage).
 %define nvidia_open_version 610.43.02
 # AZL: MLNX OFED kernel modules (mlnx-ofa_kernel), built as kmod subpackages.
@@ -4324,6 +4324,14 @@ fi\
 
 # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here)
 %changelog
+* Sun Nov 01 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.57-1.2
+- Enable CONFIG_BLK_CGROUP_IOLATENCY=y on both architectures
+- Enable CONFIG_HSA_AMD=y, CONFIG_HSA_AMD_SVM=y, and CONFIG_HSA_AMD_P2P=y
+  on x86_64
+- Enable CONFIG_DMI_SYSFS=m on x86_64
+- Disable CONFIG_SECURITY_SMACK, CONFIG_ROSE, CONFIG_SMB_SERVER, and
+  CONFIG_XFS_SUPPORT_V4 on both architectures
+
 * Thu Oct 29 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.18.57-1.1
 - feat(kernel): update kernel and kernel-headers to 6.18.57.1
 

locks/kernel.lock

@@ -1,5 +1,5 @@
 # Managed by azldev component update. Do not edit manually.
 version = 1
 manual-bump = 2
-input-fingerprint = 'sha256:0418f259c00b83a26ba0d7519645293a20298fb00dc369dbe1af1a3885b8205f'
+input-fingerprint = 'sha256:e3feeea53d02bc10ae0afa0b92fa9c84189b3f52631e65b1fa45211bfb9872bf'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'

scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json

@@ -3376,20 +3376,6 @@
           ],
           "justification": "kernel: Enable CONFIG_SQUASHFS_ZSTD and CONFIG_FW_CFG_SYSFS - PR: https://github.com/microsoft/azurelinux/pull/15612"
         },
-        {
-          "name": "CONFIG_HSA_AMD_SVM",
-          "values": [
-            {
-              "architecture": "x86_64",
-              "value": "n"
-            },
-            {
-              "architecture": "arm64",
-              "value": "y"
-            }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_NUMA_BALANCING",
           "values": [
@@ -3536,14 +3522,6 @@
           ],
           "justification": "https://microsoft.visualstudio.com/OS/_workitems/edit/60759133"
         },
-        {
-          "name": "CONFIG_BLK_CGROUP_IOLATENCY",
-          "values": [
-            { "architecture": "x86_64", "value": "n" },
-            { "architecture": "arm64", "value": "n" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_CRYPTO_ARC4",
           "values": [
@@ -3560,13 +3538,6 @@
           ],
           "justification": "Align kernel 6.18 with its generated configuration"
         },
-        {
-          "name": "CONFIG_DMI_SYSFS",
-          "values": [
-            { "architecture": "x86_64", "value": "n" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_DRM",
           "values": [
@@ -3598,20 +3569,6 @@
           ],
           "justification": "Align kernel 6.18 with its generated configuration"
         },
-        {
-          "name": "CONFIG_HSA_AMD",
-          "values": [
-            { "architecture": "x86_64", "value": "n" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
-        {
-          "name": "CONFIG_HSA_AMD_P2P",
-          "values": [
-            { "architecture": "x86_64", "value": "n" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_IP_VS_DEBUG",
           "values": [
@@ -3682,37 +3639,13 @@
           ],
           "justification": "Align kernel 6.18 with its generated configuration"
         },
-        {
-          "name": "CONFIG_ROSE",
-          "values": [
-            { "architecture": "x86_64", "value": "m" },
-            { "architecture": "arm64", "value": "m" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
-        {
-          "name": "CONFIG_SECURITY_SMACK",
-          "values": [
-            { "architecture": "x86_64", "value": "y" },
-            { "architecture": "arm64", "value": "y" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_SEV_GUEST",
           "values": [
             { "architecture": "x86_64", "value": "m" }
           ],
           "justification": "Align kernel 6.18 with its generated configuration"
         },
-        {
-          "name": "CONFIG_SMB_SERVER",
-          "values": [
-            { "architecture": "x86_64", "value": "m" },
-            { "architecture": "arm64", "value": "m" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_TDX_GUEST_DRIVER",
           "values": [
@@ -3749,14 +3682,6 @@
           ],
           "justification": "Align kernel 6.18 with its generated configuration"
         },
-        {
-          "name": "CONFIG_XFS_SUPPORT_V4",
-          "values": [
-            { "architecture": "x86_64", "value": "y" },
-            { "architecture": "arm64", "value": "y" }
-          ],
-          "justification": "Align kernel 6.18 with its generated configuration"
-        },
         {
           "name": "CONFIG_ZONE_DMA",
           "values": [

specs/k/kernel/6.18-aarch64-azl.config

@@ -1024,7 +1024,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOPRIO=y
@@ -2060,7 +2060,7 @@ CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_NETROM=m
-CONFIG_ROSE=m
+# CONFIG_ROSE is not set
 
 #
 # AX.25 network device drivers
@@ -12572,7 +12572,7 @@ CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_V4 is not set
 CONFIG_XFS_SUPPORT_ASCII_CI=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -12886,10 +12886,7 @@ CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_COMPRESSION is not set
-CONFIG_SMB_SERVER=m
-CONFIG_SMB_SERVER_SMBDIRECT=y
-CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
-CONFIG_SMB_SERVER_KERBEROS5=y
+# CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
@@ -12989,10 +12986,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
 # CONFIG_SECURITY_SELINUX_DEBUG is not set
-CONFIG_SECURITY_SMACK=y
-# CONFIG_SECURITY_SMACK_BRINGUP is not set
-CONFIG_SECURITY_SMACK_NETFILTER=y
-CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024

specs/k/kernel/6.18-x86_64-azl.config

@@ -1082,7 +1082,7 @@ CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOPRIO=y
@@ -2079,7 +2079,7 @@ CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_NETROM=m
-CONFIG_ROSE=m
+# CONFIG_ROSE is not set
 
 #
 # AX.25 network device drivers
@@ -2442,7 +2442,7 @@ CONFIG_EDD=y
 CONFIG_EDD_OFF=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
+CONFIG_DMI_SYSFS=m
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
@@ -5564,7 +5564,9 @@ CONFIG_DRM_AMD_DC_FP=y
 CONFIG_DRM_AMD_SECURE_DISPLAY=y
 # end of Display Engine Configuration
 
-# CONFIG_HSA_AMD is not set
+CONFIG_HSA_AMD=y
+CONFIG_HSA_AMD_SVM=y
+CONFIG_HSA_AMD_P2P=y
 # CONFIG_DRM_NOUVEAU is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_FORCE_PROBE=""
@@ -7261,7 +7263,7 @@ CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_SUPPORT_V4=y
+# CONFIG_XFS_SUPPORT_V4 is not set
 CONFIG_XFS_SUPPORT_ASCII_CI=y
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -7552,10 +7554,7 @@ CONFIG_CIFS_SWN_UPCALL=y
 # CONFIG_CIFS_SMB_DIRECT is not set
 CONFIG_CIFS_FSCACHE=y
 # CONFIG_CIFS_COMPRESSION is not set
-CONFIG_SMB_SERVER=m
-CONFIG_SMB_SERVER_SMBDIRECT=y
-CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
-CONFIG_SMB_SERVER_KERBEROS5=y
+# CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
@@ -7656,10 +7655,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
 # CONFIG_SECURITY_SELINUX_DEBUG is not set
-CONFIG_SECURITY_SMACK=y
-# CONFIG_SECURITY_SMACK_BRINGUP is not set
-CONFIG_SECURITY_SMACK_NETFILTER=y
-CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
+# CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024