Skip to content

Commit 806ad4f

Browse files
committed
kernel-mshv: Enable missing configs per customer request
Enable the following Kconfig symbols in arch/x86/configs/mshv_defconfig and arch/arm64/configs/mshv_defconfig: CONFIG_LWTUNNEL=y CONFIG_LWTUNNEL_BPF=y CONFIG_MICROSOFT_MANA=m CONFIG_TARGET_CORE=m CONFIG_TCM_USER2=m CONFIG_MPTCP=y CONFIG_INET_DIAG=m CONFIG_TLS=m CONFIG_LOOPBACK_TARGET=m CONFIG_OVERLAY_FS_METACOPY=y CONFIG_OVERLAY_FS_INDEX=y CONFIG_TCP_CONG_BBR=m CONFIG_NET_CLS_FLOWER=m Also enable CONFIG_OVERLAY_FS_REDIRECT_DIR=y in both configs as it is selected by CONFIG_OVERLAY_FS_METACOPY. arm64 already had most of these, x86 needed all of them. Signed-off-by: Saul Paredes <saulparedes@microsoft.com>
1 parent 485ab9c commit 806ad4f

4 files changed

Lines changed: 44 additions & 17 deletions

File tree

SPECS/kernel-mshv/config

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,9 @@ CONFIG_PACKET_DIAG=m
10751075
CONFIG_UNIX=y
10761076
CONFIG_AF_UNIX_OOB=y
10771077
CONFIG_UNIX_DIAG=m
1078-
# CONFIG_TLS is not set
1078+
CONFIG_TLS=m
1079+
# CONFIG_TLS_DEVICE is not set
1080+
# CONFIG_TLS_TOE is not set
10791081
CONFIG_XFRM=y
10801082
CONFIG_XFRM_OFFLOAD=y
10811083
CONFIG_XFRM_ALGO=m
@@ -1126,7 +1128,11 @@ CONFIG_INET_IPCOMP=m
11261128
CONFIG_INET_TABLE_PERTURB_ORDER=16
11271129
CONFIG_INET_XFRM_TUNNEL=m
11281130
CONFIG_INET_TUNNEL=m
1129-
# CONFIG_INET_DIAG is not set
1131+
CONFIG_INET_DIAG=m
1132+
CONFIG_INET_TCP_DIAG=m
1133+
# CONFIG_INET_UDP_DIAG is not set
1134+
# CONFIG_INET_RAW_DIAG is not set
1135+
# CONFIG_INET_DIAG_DESTROY is not set
11301136
CONFIG_TCP_CONG_ADVANCED=y
11311137
# CONFIG_TCP_CONG_BIC is not set
11321138
CONFIG_TCP_CONG_CUBIC=y
@@ -1143,7 +1149,7 @@ CONFIG_TCP_CONG_CUBIC=y
11431149
# CONFIG_TCP_CONG_ILLINOIS is not set
11441150
# CONFIG_TCP_CONG_DCTCP is not set
11451151
# CONFIG_TCP_CONG_CDG is not set
1146-
# CONFIG_TCP_CONG_BBR is not set
1152+
CONFIG_TCP_CONG_BBR=m
11471153
CONFIG_DEFAULT_CUBIC=y
11481154
# CONFIG_DEFAULT_RENO is not set
11491155
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -1177,7 +1183,9 @@ CONFIG_IPV6_PIMSM_V2=y
11771183
# CONFIG_IPV6_RPL_LWTUNNEL is not set
11781184
# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
11791185
CONFIG_NETLABEL=y
1180-
# CONFIG_MPTCP is not set
1186+
CONFIG_MPTCP=y
1187+
CONFIG_INET_MPTCP_DIAG=m
1188+
CONFIG_MPTCP_IPV6=y
11811189
CONFIG_NETWORK_SECMARK=y
11821190
CONFIG_NET_PTP_CLASSIFY=y
11831191
CONFIG_NETWORK_PHY_TIMESTAMPING=y
@@ -1534,6 +1542,7 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
15341542
# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
15351543
CONFIG_SCTP_COOKIE_HMAC_MD5=y
15361544
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
1545+
CONFIG_INET_SCTP_DIAG=m
15371546
# CONFIG_RDS is not set
15381547
# CONFIG_TIPC is not set
15391548
# CONFIG_ATM is not set
@@ -1607,7 +1616,7 @@ CONFIG_CLS_U32_MARK=y
16071616
CONFIG_NET_CLS_FLOW=m
16081617
CONFIG_NET_CLS_CGROUP=m
16091618
CONFIG_NET_CLS_BPF=m
1610-
# CONFIG_NET_CLS_FLOWER is not set
1619+
CONFIG_NET_CLS_FLOWER=m
16111620
CONFIG_NET_CLS_MATCHALL=m
16121621
CONFIG_NET_EMATCH=y
16131622
CONFIG_NET_EMATCH_STACK=32
@@ -1698,6 +1707,7 @@ CONFIG_CAN_GW=m
16981707
# CONFIG_BT is not set
16991708
# CONFIG_AF_RXRPC is not set
17001709
# CONFIG_AF_KCM is not set
1710+
CONFIG_STREAM_PARSER=y
17011711
# CONFIG_MCTP is not set
17021712
CONFIG_FIB_RULES=y
17031713
CONFIG_WIRELESS=y
@@ -1737,7 +1747,8 @@ CONFIG_CEPH_LIB=m
17371747
# CONFIG_NFC is not set
17381748
# CONFIG_PSAMPLE is not set
17391749
# CONFIG_NET_IFE is not set
1740-
# CONFIG_LWTUNNEL is not set
1750+
CONFIG_LWTUNNEL=y
1751+
CONFIG_LWTUNNEL_BPF=y
17411752
CONFIG_DST_CACHE=y
17421753
CONFIG_GRO_CELLS=y
17431754
CONFIG_NET_SELFTESTS=y
@@ -2169,11 +2180,13 @@ CONFIG_SCSI_IPR_TRACE=y
21692180
CONFIG_SCSI_IPR_DUMP=y
21702181
CONFIG_SCSI_QLOGIC_1280=m
21712182
CONFIG_SCSI_QLA_FC=m
2183+
# CONFIG_TCM_QLA2XXX is not set
21722184
CONFIG_SCSI_QLA_ISCSI=m
21732185
# CONFIG_QEDI is not set
21742186
# CONFIG_QEDF is not set
21752187
CONFIG_SCSI_LPFC=m
21762188
CONFIG_SCSI_LPFC_DEBUG_FS=y
2189+
# CONFIG_SCSI_EFCT is not set
21772190
CONFIG_SCSI_DC395x=m
21782191
CONFIG_SCSI_AM53C974=m
21792192
CONFIG_SCSI_WD719X=m
@@ -2335,7 +2348,15 @@ CONFIG_DM_VERITY_FEC=y
23352348
# CONFIG_DM_LOG_WRITES is not set
23362349
# CONFIG_DM_INTEGRITY is not set
23372350
# CONFIG_DM_AUDIT is not set
2338-
# CONFIG_TARGET_CORE is not set
2351+
CONFIG_TARGET_CORE=m
2352+
# CONFIG_TCM_IBLOCK is not set
2353+
# CONFIG_TCM_FILEIO is not set
2354+
# CONFIG_TCM_PSCSI is not set
2355+
CONFIG_TCM_USER2=m
2356+
CONFIG_LOOPBACK_TARGET=m
2357+
# CONFIG_TCM_FC is not set
2358+
# CONFIG_ISCSI_TARGET is not set
2359+
# CONFIG_REMOTE_TARGET is not set
23392360
CONFIG_FUSION=y
23402361
CONFIG_FUSION_SPI=y
23412362
# CONFIG_FUSION_FC is not set
@@ -2566,7 +2587,7 @@ CONFIG_NET_VENDOR_MICROCHIP=y
25662587
# CONFIG_VCAP is not set
25672588
# CONFIG_NET_VENDOR_MICROSEMI is not set
25682589
CONFIG_NET_VENDOR_MICROSOFT=y
2569-
# CONFIG_MICROSOFT_MANA is not set
2590+
CONFIG_MICROSOFT_MANA=m
25702591
CONFIG_NET_VENDOR_MYRI=y
25712592
CONFIG_MYRI10GE=m
25722593
CONFIG_MYRI10GE_DCA=y
@@ -5110,6 +5131,7 @@ CONFIG_INFINIBAND_VIRT_DMA=y
51105131
# CONFIG_INFINIBAND_CXGB4 is not set
51115132
# CONFIG_INFINIBAND_EFA is not set
51125133
# CONFIG_INFINIBAND_ERDMA is not set
5134+
# CONFIG_MANA_INFINIBAND is not set
51135135
CONFIG_MLX4_INFINIBAND=m
51145136
CONFIG_MLX5_INFINIBAND=m
51155137
# CONFIG_INFINIBAND_MTHCA is not set
@@ -5125,6 +5147,7 @@ CONFIG_INFINIBAND_IPOIB=m
51255147
CONFIG_INFINIBAND_IPOIB_DEBUG=y
51265148
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
51275149
# CONFIG_INFINIBAND_SRP is not set
5150+
# CONFIG_INFINIBAND_SRPT is not set
51285151
# CONFIG_INFINIBAND_ISER is not set
51295152
# CONFIG_INFINIBAND_RTRS_CLIENT is not set
51305153
# CONFIG_INFINIBAND_RTRS_SERVER is not set
@@ -5360,6 +5383,7 @@ CONFIG_VHOST_TASK=y
53605383
CONFIG_VHOST=m
53615384
CONFIG_VHOST_MENU=y
53625385
CONFIG_VHOST_NET=m
5386+
# CONFIG_VHOST_SCSI is not set
53635387
CONFIG_VHOST_VSOCK=m
53645388
CONFIG_VHOST_VDPA=m
53655389
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
@@ -6188,11 +6212,11 @@ CONFIG_FUSE_FS=m
61886212
# CONFIG_CUSE is not set
61896213
# CONFIG_VIRTIO_FS is not set
61906214
CONFIG_OVERLAY_FS=m
6191-
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
6215+
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
61926216
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
6193-
# CONFIG_OVERLAY_FS_INDEX is not set
6217+
CONFIG_OVERLAY_FS_INDEX=y
61946218
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
6195-
# CONFIG_OVERLAY_FS_METACOPY is not set
6219+
CONFIG_OVERLAY_FS_METACOPY=y
61966220
# CONFIG_OVERLAY_FS_DEBUG is not set
61976221

61986222
#

SPECS/kernel-mshv/config_aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9917,11 +9917,11 @@ CONFIG_CUSE=m
99179917
CONFIG_VIRTIO_FS=m
99189918
CONFIG_FUSE_DAX=y
99199919
CONFIG_OVERLAY_FS=y
9920-
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
9920+
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
99219921
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
9922-
# CONFIG_OVERLAY_FS_INDEX is not set
9922+
CONFIG_OVERLAY_FS_INDEX=y
99239923
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
9924-
# CONFIG_OVERLAY_FS_METACOPY is not set
9924+
CONFIG_OVERLAY_FS_METACOPY=y
99259925
# CONFIG_OVERLAY_FS_DEBUG is not set
99269926

99279927
#

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"50_mariner_mshv.cfg": "12bf23f8857f893549933a20062ad2a69c3c654b87893e8dd3ce42f9329801c7",
44
"50_mariner_mshv_menuentry": "5a46bb273be0e829fec4e1f498b1a11b59ded6e14d42a19be7da860c3f4c35be",
55
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
6-
"config": "1d2a651010da7f085e0f84d9a9a87d91ae11d5198fba0855811f6653c99ba919",
6+
"config": "5824f12c2fe2d5337414168640a9db0a2527c8cd4b3766b6074bf37028787c82",
77
"kernel-mshv-6.6.137.mshv1.tar.gz": "1d4dbcf9768471fff5934899d8008a1260f225dc910e6dfd3e73f7d420b54b4a",
8-
"config_aarch64": "3127fe65dda320d1875dd7d06fe51fc38b6f2643b931aced0dd9d1e0087cd9df"
8+
"config_aarch64": "1377d8363a90820291c8146e3ad4df52ca7c676e28f1e2719a81a2b06178c269"
99
}
1010
}

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.137.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+
* Wed May 13 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.137.mshv1-2
271+
- Enable missing configs per customer request
272+
270273
* Tue May 05 2026 Saul Paredes <saulparedes@microsoft.com> - 6.6.137.mshv1-1
271274
- Upgrade to 6.6.137.mshv1
272275

0 commit comments

Comments
 (0)