Skip to content

Commit 3e793cc

Browse files
authored
kernel-mshv: enable CONFIG_WIREGUARD (#16365)
1 parent 411d648 commit 3e793cc

File tree

4 files changed

+26
-12
lines changed

4 files changed

+26
-12
lines changed

SPECS-SIGNED/kernel-mshv-signed/kernel-mshv-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed MSHV-enabled Linux Kernel for %{buildarch} systems
1111
Name: kernel-mshv-signed-%{buildarch}
1212
Version: 6.6.121.mshv1
13-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -140,6 +140,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
140140
%exclude /lib/modules/%{uname_r}/build
141141

142142
%changelog
143+
* Mon Mar 30 2026 Cameron Baird <cameronbaird@microsoft.com> - 6.6.121.mshv1-2
144+
- Enable CONFIG_WIREGUARD in kernel config
145+
143146
* Thu Feb 26 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.121.mshv1-1
144147
- Upgrade to 6.6.121.mshv1
145148

SPECS/kernel-mshv/config

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,7 +2357,8 @@ CONFIG_MII=m
23572357
CONFIG_NET_CORE=y
23582358
CONFIG_BONDING=m
23592359
CONFIG_DUMMY=m
2360-
# CONFIG_WIREGUARD is not set
2360+
CONFIG_WIREGUARD=m
2361+
# CONFIG_WIREGUARD_DEBUG is not set
23612362
# CONFIG_EQUALIZER is not set
23622363
# CONFIG_NET_FC is not set
23632364
# CONFIG_IFB is not set
@@ -6738,7 +6739,7 @@ CONFIG_CRYPTO_HASH_INFO=y
67386739
#
67396740
# Accelerated Cryptographic Algorithms for CPU (x86)
67406741
#
6741-
# CONFIG_CRYPTO_CURVE25519_X86 is not set
6742+
CONFIG_CRYPTO_CURVE25519_X86=m
67426743
CONFIG_CRYPTO_AES_NI_INTEL=y
67436744
# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
67446745
# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set
@@ -6758,13 +6759,13 @@ CONFIG_CRYPTO_AES_NI_INTEL=y
67586759
# CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set
67596760
# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set
67606761
# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set
6761-
# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
6762+
CONFIG_CRYPTO_CHACHA20_X86_64=m
67626763
# CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set
67636764
# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
67646765
# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
6765-
# CONFIG_CRYPTO_BLAKE2S_X86 is not set
6766+
CONFIG_CRYPTO_BLAKE2S_X86=y
67666767
# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
6767-
# CONFIG_CRYPTO_POLY1305_X86_64 is not set
6768+
CONFIG_CRYPTO_POLY1305_X86_64=m
67686769
# CONFIG_CRYPTO_SHA1_SSSE3 is not set
67696770
# CONFIG_CRYPTO_SHA256_SSSE3 is not set
67706771
# CONFIG_CRYPTO_SHA512_SSSE3 is not set
@@ -6845,13 +6846,20 @@ CONFIG_CRYPTO_LIB_UTILS=y
68456846
CONFIG_CRYPTO_LIB_AES=y
68466847
CONFIG_CRYPTO_LIB_ARC4=m
68476848
CONFIG_CRYPTO_LIB_GF128MUL=m
6849+
CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
68486850
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
6849-
# CONFIG_CRYPTO_LIB_CHACHA is not set
6850-
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
6851+
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
6852+
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
6853+
CONFIG_CRYPTO_LIB_CHACHA=m
6854+
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
6855+
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
6856+
CONFIG_CRYPTO_LIB_CURVE25519=m
68516857
CONFIG_CRYPTO_LIB_DES=m
68526858
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
6853-
# CONFIG_CRYPTO_LIB_POLY1305 is not set
6854-
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
6859+
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
6860+
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
6861+
CONFIG_CRYPTO_LIB_POLY1305=m
6862+
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
68556863
CONFIG_CRYPTO_LIB_SHA1=y
68566864
CONFIG_CRYPTO_LIB_SHA256=y
68576865
# end of Crypto library routines

SPECS/kernel-mshv/kernel-mshv.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"50_mariner_mshv.cfg": "12bf23f8857f893549933a20062ad2a69c3c654b87893e8dd3ce42f9329801c7",
44
"50_mariner_mshv_menuentry": "5a46bb273be0e829fec4e1f498b1a11b59ded6e14d42a19be7da860c3f4c35be",
55
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
6-
"config": "bad055a3b7a0f8d3a2a25cce94490fe47376535aba43659fdfb75b4c132dfec5",
6+
"config": "3513c71fb5d5dbc9c46e5fbca5767a0201fc3def43b8ee5e4fd754462e9591ae",
77
"kernel-mshv-6.6.121.mshv1.tar.gz": "a47c2bdfece34fa0ec7c6e81af5d2ef19ff4e0e97e79ab9d6e14a4b2e764346c",
88
"config_aarch64": "79b8844848674bcd16b4b0ac86b04ef8c9f6dbfdce3c56c11354e46f3f809da5"
99
}

SPECS/kernel-mshv/kernel-mshv.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Summary: Mariner kernel that has MSHV Host support
1919
Name: kernel-mshv
2020
Version: 6.6.121.mshv1
21-
Release: 1%{?dist}
21+
Release: 2%{?dist}
2222
License: GPLv2
2323
Group: Development/Tools
2424
Vendor: Microsoft Corporation
@@ -267,6 +267,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
267267
%{_includedir}/perf/perf_dlfilter.h
268268

269269
%changelog
270+
* Mon Mar 30 2026 Cameron Baird <cameronbaird@microsoft.com> - 6.6.121.mshv1-2
271+
- Enable CONFIG_WIREGUARD in kernel config
272+
270273
* Thu Feb 26 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.121.mshv1-1
271274
- Upgrade to 6.6.121.mshv1. This update adds deferred MSHV paging support
272275

0 commit comments

Comments
 (0)