Skip to content

Commit eaf89b6

Browse files
rlmengerlmenge
authored
Build PCI_HYPERV as a built-in (#11992)
Change PCI_HYPERV to be builtin. This also requires PCI_HYPERV_INTERFACE to be builtin as well. PCI_HYPERV was previously loaded as a module but it results in race conditions when devices are mapped and unmapped. AzureLinux is already starting to access PCIe Devices, when the MMIO mappings from UEFI haven't been fully torn down yet. That causes conflicts, which shows up as missing disks to the customer. If AzureLinux has hyperv pci built into the kernel, then that changes the load ordering of the drivers in the kernel, which has the desired side-effect that UEFI mappings get torn down before the AzureLinux creates net mappings.
1 parent 7036f48 commit eaf89b6

File tree

16 files changed

+42
-21
lines changed

16 files changed

+42
-21
lines changed

‎SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Signed Linux Kernel for %{buildarch} systems
88
Name: kernel-64k-signed-%{buildarch}
99
Version: 6.6.64.2
10-
Release: 3%{?dist}
10+
Release: 4%{?dist}
1111
License: GPLv2
1212
Vendor: Microsoft Corporation
1313
Distribution: Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
105105
%exclude /module_info.ld
106106

107107
%changelog
108+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
109+
- Bump release to match kernel-64k
110+
108111
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
109112
- Bump release to match kernel
110113

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.64.2
13-
Release: 3%{?dist}
13+
Release: 4%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
149+
- Bump release to match kernel
150+
148151
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
149152
- Bump release to match kernel
150153

‎SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.64.2
9-
Release: 3%{?dist}
9+
Release: 4%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
72+
- Bump release to match kernel
73+
7174
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
7275
- Bump release to match kernel
7376

‎SPECS/kernel-64k/config_aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,7 @@ CONFIG_PCI_PRI=y
20852085
CONFIG_PCI_PASID=y
20862086
# CONFIG_PCI_P2PDMA is not set
20872087
CONFIG_PCI_LABEL=y
2088-
CONFIG_PCI_HYPERV=m
2088+
CONFIG_PCI_HYPERV=y
20892089
# CONFIG_PCI_DYNAMIC_OF_NODES is not set
20902090
# CONFIG_PCIE_BUS_TUNE_OFF is not set
20912091
CONFIG_PCIE_BUS_DEFAULT=y
@@ -2119,7 +2119,7 @@ CONFIG_PCI_HOST_GENERIC=y
21192119
CONFIG_PCIE_MEDIATEK=y
21202120
# CONFIG_PCIE_MEDIATEK_GEN3 is not set
21212121
# CONFIG_PCIE_MICROCHIP_HOST is not set
2122-
CONFIG_PCI_HYPERV_INTERFACE=m
2122+
CONFIG_PCI_HYPERV_INTERFACE=y
21232123
# CONFIG_PCI_TEGRA is not set
21242124
CONFIG_PCIE_RCAR_HOST=y
21252125
# CONFIG_PCIE_RCAR_EP is not set

‎SPECS/kernel-64k/kernel-64k.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
4-
"config_aarch64": "6f1c7d15f41c38d45b131e3fd33fa4161f732e4afa1c47fbb2aaea078fbb3183",
4+
"config_aarch64": "dc7727f4d1b35ec323bc80aadeeba093a92bd45627093c4db49b500b14675add",
55
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
66
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
77
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",

‎SPECS/kernel-64k/kernel-64k.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
Summary: Linux Kernel
2626
Name: kernel-64k
2727
Version: 6.6.64.2
28-
Release: 3%{?dist}
28+
Release: 4%{?dist}
2929
License: GPLv2
3030
Vendor: Microsoft Corporation
3131
Distribution: Azure Linux
@@ -370,6 +370,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
370370
%{_sysconfdir}/bash_completion.d/bpftool
371371

372372
%changelog
373+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
374+
- Build PCI_HYPERV as builtin
375+
373376
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
374377
- Bump release to match kernel
375378

‎SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.64.2
17-
Release: 3%{?dist}
17+
Release: 4%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
79+
- Bump release to match kernel
80+
7881
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
7982
- Bump release to match kernel
8083

‎SPECS/kernel/config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ CONFIG_PCI_PRI=y
19251925
CONFIG_PCI_PASID=y
19261926
# CONFIG_PCI_P2PDMA is not set
19271927
CONFIG_PCI_LABEL=y
1928-
CONFIG_PCI_HYPERV=m
1928+
CONFIG_PCI_HYPERV=y
19291929
# CONFIG_PCIE_BUS_TUNE_OFF is not set
19301930
CONFIG_PCIE_BUS_DEFAULT=y
19311931
# CONFIG_PCIE_BUS_SAFE is not set
@@ -1943,7 +1943,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
19431943
# PCI controller drivers
19441944
#
19451945
CONFIG_VMD=y
1946-
CONFIG_PCI_HYPERV_INTERFACE=m
1946+
CONFIG_PCI_HYPERV_INTERFACE=y
19471947

19481948
#
19491949
# Cadence-based PCIe controllers

‎SPECS/kernel/config_aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,7 +2087,7 @@ CONFIG_PCI_PRI=y
20872087
CONFIG_PCI_PASID=y
20882088
# CONFIG_PCI_P2PDMA is not set
20892089
CONFIG_PCI_LABEL=y
2090-
CONFIG_PCI_HYPERV=m
2090+
CONFIG_PCI_HYPERV=y
20912091
# CONFIG_PCI_DYNAMIC_OF_NODES is not set
20922092
# CONFIG_PCIE_BUS_TUNE_OFF is not set
20932093
CONFIG_PCIE_BUS_DEFAULT=y
@@ -2121,7 +2121,7 @@ CONFIG_PCI_HOST_GENERIC=y
21212121
CONFIG_PCIE_MEDIATEK=y
21222122
# CONFIG_PCIE_MEDIATEK_GEN3 is not set
21232123
# CONFIG_PCIE_MICROCHIP_HOST is not set
2124-
CONFIG_PCI_HYPERV_INTERFACE=m
2124+
CONFIG_PCI_HYPERV_INTERFACE=y
21252125
# CONFIG_PCI_TEGRA is not set
21262126
CONFIG_PCIE_RCAR_HOST=y
21272127
# CONFIG_PCIE_RCAR_EP is not set

‎SPECS/kernel/kernel-uki.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Summary: Unified Kernel Image
1414
Name: kernel-uki
1515
Version: 6.6.64.2
16-
Release: 3%{?dist}
16+
Release: 4%{?dist}
1717
License: GPLv2
1818
Vendor: Microsoft Corporation
1919
Distribution: Azure Linux
@@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7070
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7171

7272
%changelog
73+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
74+
- Bump release to match kernel
75+
7376
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
7477
- Bump release to match kernel
7578

‎SPECS/kernel/kernel.signatures.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"Signatures": {
33
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
4-
"config": "0cef3115393e9ad463e1a13eeefa920e7b3e3b97c9695cb75cc04556cd0a1bc2",
5-
"config_aarch64": "27a07a9652c8dcfff7edb3134372dd0f53a9a6c8ab9c3dc5bf580ee08410bd27",
4+
"config": "5a525032e8d3594867cc43bc4a8fb3e22851c16d48d4eb82fd1a4879dbcf2bcf",
5+
"config_aarch64": "017245201dda4a823fc51f8e212c410d2b12ab849a2da7588d000bcb8cc48ef4",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
88
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",

‎SPECS/kernel/kernel.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Summary: Linux Kernel
3131
Name: kernel
3232
Version: 6.6.64.2
33-
Release: 3%{?dist}
33+
Release: 4%{?dist}
3434
License: GPLv2
3535
Vendor: Microsoft Corporation
3636
Distribution: Azure Linux
@@ -428,6 +428,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
428428
%{_sysconfdir}/bash_completion.d/bpftool
429429

430430
%changelog
431+
* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
432+
- Build PCI_HYPERV as builtin
433+
431434
* Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
432435
- Disable DEBUG_PREEMPT
433436

‎toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.64.2-3.azl3.noarch.rpm
2+
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
33
glibc-2.38-8.azl3.aarch64.rpm
44
glibc-devel-2.38-8.azl3.aarch64.rpm
55
glibc-i18n-2.38-8.azl3.aarch64.rpm

‎toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.x86_64.rpm
2-
kernel-headers-6.6.64.2-3.azl3.noarch.rpm
2+
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
33
glibc-2.38-8.azl3.x86_64.rpm
44
glibc-devel-2.38-8.azl3.x86_64.rpm
55
glibc-i18n-2.38-8.azl3.x86_64.rpm

‎toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
156156
itstool-2.0.7-1.azl3.noarch.rpm
157157
kbd-2.2.0-2.azl3.aarch64.rpm
158158
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
159-
kernel-headers-6.6.64.2-3.azl3.noarch.rpm
159+
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
160160
kmod-30-1.azl3.aarch64.rpm
161161
kmod-debuginfo-30-1.azl3.aarch64.rpm
162162
kmod-devel-30-1.azl3.aarch64.rpm

‎toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
163163
itstool-2.0.7-1.azl3.noarch.rpm
164164
kbd-2.2.0-2.azl3.x86_64.rpm
165165
kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm
166-
kernel-cross-headers-6.6.64.2-3.azl3.noarch.rpm
167-
kernel-headers-6.6.64.2-3.azl3.noarch.rpm
166+
kernel-cross-headers-6.6.64.2-4.azl3.noarch.rpm
167+
kernel-headers-6.6.64.2-4.azl3.noarch.rpm
168168
kmod-30-1.azl3.x86_64.rpm
169169
kmod-debuginfo-30-1.azl3.x86_64.rpm
170170
kmod-devel-30-1.azl3.x86_64.rpm

0 commit comments

Comments
 (0)