Skip to content

kernel: Enable BBR3 #15801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andrew344c wants to merge 6 commits into
base: 3.0-dev
Choose a base branch
from
Draft

kernel: Enable BBR3 #15801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8022250
Add BBR3 opt
Feb 4, 2026
4380bb0
Add BBR3 for aarch64
Feb 4, 2026
987a63a
Change config ver comment for config check
Feb 4, 2026
8c3a806
Use 6.6.121.1
Feb 4, 2026
0cdddba
Bump kernel specs and update sigs
Feb 11, 2026
10d7d61
graphpkgfetcher: handle hash-prefixed cached RPM filenames safely
Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
Summary: Linux Kernel
Name: kernel-ipe
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -460,6 +460,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-64k-signed-%{buildarch}
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-signed/kernel-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Summary: Signed Unified Kernel Image for %{buildarch} systems
Name: kernel-uki-signed-%{buildarch}
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -68,6 +68,9 @@ popd
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel-64k/kernel-64k.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
Summary: Linux Kernel
Name: kernel-64k
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -380,6 +380,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel-headers/kernel-headers.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -75,6 +75,9 @@ done
%endif

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
1 change: 1 addition & 0 deletions SPECS/kernel/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,7 @@ CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_TCP_CONG_DCTCP=m
CONFIG_TCP_CONG_CDG=m
CONFIG_TCP_CONG_BBR=m
CONFIG_TCP_CONG_BBR3=m
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
Expand Down
1 change: 1 addition & 0 deletions SPECS/kernel/config_aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,6 +1249,7 @@ CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_TCP_CONG_DCTCP=m
CONFIG_TCP_CONG_CDG=m
CONFIG_TCP_CONG_BBR=m
CONFIG_TCP_CONG_BBR3=m
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel/kernel-uki.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Summary: Unified Kernel Image
Name: kernel-uki
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Bump release to match kernel

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
4 changes: 2 additions & 2 deletions SPECS/kernel/kernel.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Signatures": {
"azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
"config": "45568c4b391b581400145626bd7ca1712028bfcef6b1f3ab4691c27786a91c3a",
"config_aarch64": "77ba2d0761f07f9d1182fd3ab469106e99c38e839665e5af699379a1a204a844",
"config": "12b7d141e723411dd576e9861d72cc6d05195a06883992e65e9fb10ef2d51961",
"config_aarch64": "eed562e301040fb995a1c661b162df8352961781adccf9e0e5f3f40569b978a5",
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
Expand Down
5 changes: 4 additions & 1 deletion SPECS/kernel/kernel.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
Summary: Linux Kernel
Name: kernel
Version: 6.6.121.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -440,6 +440,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
%{_sysconfdir}/bash_completion.d/bpftool

%changelog
* Wed Feb 11 2026 Andrew Chiang <andrewchiang@microsoft.com> - 6.6.121.1-2
- Enable CONFIG_TCP_CONG_BBR3=m

* Mon Feb 02 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.121.1-1
- Auto-upgrade to 6.6.121.1

Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.aarch64.rpm
kernel-headers-6.6.121.1-1.azl3.noarch.rpm
kernel-headers-6.6.121.1-2.azl3.noarch.rpm
glibc-2.38-18.azl3.aarch64.rpm
glibc-devel-2.38-18.azl3.aarch64.rpm
glibc-i18n-2.38-18.azl3.aarch64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.x86_64.rpm
kernel-headers-6.6.121.1-1.azl3.noarch.rpm
kernel-headers-6.6.121.1-2.azl3.noarch.rpm
glibc-2.38-18.azl3.x86_64.rpm
glibc-devel-2.38-18.azl3.x86_64.rpm
glibc-i18n-2.38-18.azl3.x86_64.rpm
Expand Down
2 changes: 1 addition & 1 deletion toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.aarch64.rpm
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
kernel-headers-6.6.121.1-1.azl3.noarch.rpm
kernel-headers-6.6.121.1-2.azl3.noarch.rpm
kmod-30-1.azl3.aarch64.rpm
kmod-debuginfo-30-1.azl3.aarch64.rpm
kmod-devel-30-1.azl3.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
itstool-2.0.7-1.azl3.noarch.rpm
kbd-2.2.0-2.azl3.x86_64.rpm
kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm
kernel-cross-headers-6.6.121.1-1.azl3.noarch.rpm
kernel-headers-6.6.121.1-1.azl3.noarch.rpm
kernel-cross-headers-6.6.121.1-2.azl3.noarch.rpm
kernel-headers-6.6.121.1-2.azl3.noarch.rpm
kmod-30-1.azl3.x86_64.rpm
kmod-debuginfo-30-1.azl3.x86_64.rpm
kmod-devel-30-1.azl3.x86_64.rpm
Expand Down
39 changes: 33 additions & 6 deletions toolkit/tools/graphpkgfetcher/graphpkgfetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"os"
"path/filepath"
"sort"
"strings"

"github.com/microsoft/azurelinux/toolkit/tools/internal/exe"
Expand Down Expand Up @@ -518,13 +519,17 @@ func resolveSingleNode(cloner *rpmrepocloner.RpmRepoCloner, node *pkggraph.PkgNo
}

func assignRPMPath(node *pkggraph.PkgNode, outDir string, resolvedPackages []string) (err error) {
rpmPaths := []string{}
for _, resolvedPackage := range resolvedPackages {
rpmPaths = append(rpmPaths, rpmPackageToRPMPath(resolvedPackage, outDir))
}
// Keep canonical package filenames in graph nodes for downstream consumers that
// parse package names from basenames (for example pkgworker's tdnf install args).
chosenRPMPath := rpmPackageToRPMPath(resolvedPackages[0], outDir)
if len(resolvedPackages) > 1 {
rpmPaths := []string{}
for _, resolvedPackage := range resolvedPackages {
// For conflict resolution only, use the actual on-disk file path which may
// include a tdnf-added filename prefix.
rpmPaths = append(rpmPaths, findResolvedRPMPath(resolvedPackage, outDir))
}

chosenRPMPath := rpmPaths[0]
if len(rpmPaths) > 1 {
var resolvedRPMs []string
logger.Log.Debugf("Found %d candidates. Resolving", len(rpmPaths))

Expand Down Expand Up @@ -559,6 +564,28 @@ func rpmPackageToRPMPath(rpmPackage, outDir string) string {
return filepath.Join(outDir, rpmName)
}

// findResolvedRPMPath returns the on-disk path for a package in the RPM cache.
// Newer tdnf builds may prefix downloaded RPM files (for example "<hash>-name-ver-rel.arch.rpm").
// Keep using the canonical filename when present, and otherwise fall back to the prefixed variant.
func findResolvedRPMPath(rpmPackage, outDir string) string {
canonicalPath := rpmPackageToRPMPath(rpmPackage, outDir)

exists, err := file.PathExists(canonicalPath)
if err == nil && exists {
return canonicalPath
}

canonicalBase := filepath.Base(canonicalPath)
pattern := filepath.Join(outDir, fmt.Sprintf("*-%s", canonicalBase))
matches, err := filepath.Glob(pattern)
if err != nil || len(matches) == 0 {
return canonicalPath
}

sort.Strings(matches)
return matches[0]
}

func isToolchainPackage(rpmPath string, toolchainRPMs []string) bool {
base := filepath.Base(rpmPath)
for _, t := range toolchainRPMs {
Expand Down
Loading