Skip to content

Commit b44551c

Browse files
smirasmira
committed
feat: update Linux to 6.6.13
See siderolabs/pkgs#873 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 385707c commit b44551c

8 files changed

Lines changed: 54 additions & 37 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
1717
ARTIFACTS := _out
1818
TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-alpha.0-3-gc7076eb
1919
PKGS_PREFIX ?= ghcr.io/siderolabs
20-
PKGS ?= v1.7.0-alpha.0-14-g2358efe
20+
PKGS ?= v1.7.0-alpha.0-17-gefbbd23
2121
PKG_KERNEL ?= $(PKGS_PREFIX)/kernel:$(PKGS)
2222
EXTRAS ?= v1.7.0-alpha.0
2323
# renovate: datasource=github-tags depName=golang/go

‎hack/modules-amd64.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ kernel/drivers/ata/pata_oldpiix.ko
1515
kernel/drivers/ata/pata_sch.ko
1616
kernel/drivers/block/nbd.ko
1717
kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko
18+
kernel/drivers/gpu/drm/amd/amdxcp/amdxcp.ko
1819
kernel/drivers/gpu/drm/display/drm_display_helper.ko
1920
kernel/drivers/gpu/drm/drm_buddy.ko
21+
kernel/drivers/gpu/drm/drm_exec.ko
22+
kernel/drivers/gpu/drm/drm_suballoc_helper.ko
2023
kernel/drivers/gpu/drm/drm_ttm_helper.ko
2124
kernel/drivers/gpu/drm/i915/i915.ko
2225
kernel/drivers/gpu/drm/scheduler/gpu-sched.ko
@@ -45,6 +48,7 @@ kernel/drivers/hwmon/i5500_temp.ko
4548
kernel/drivers/hwmon/i5k_amb.ko
4649
kernel/drivers/hwmon/k10temp.ko
4750
kernel/drivers/hwmon/k8temp.ko
51+
kernel/drivers/i2c/algos/i2c-algo-bit.ko
4852
kernel/drivers/i2c/busses/i2c-i801.ko
4953
kernel/drivers/i2c/i2c-smbus.ko
5054
kernel/drivers/infiniband/hw/mlx4/mlx4_ib.ko
@@ -86,7 +90,6 @@ kernel/drivers/net/ethernet/intel/ice/ice.ko
8690
kernel/drivers/net/ethernet/intel/igb/igb.ko
8791
kernel/drivers/net/ethernet/intel/igbvf/igbvf.ko
8892
kernel/drivers/net/ethernet/intel/igc/igc.ko
89-
kernel/drivers/net/ethernet/intel/ixgb/ixgb.ko
9093
kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
9194
kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
9295
kernel/drivers/net/ethernet/marvell/sky2.ko
@@ -125,7 +128,6 @@ kernel/drivers/usb/serial/pl2303.ko
125128
kernel/drivers/vfio/pci/vfio-pci-core.ko
126129
kernel/drivers/vfio/pci/vfio-pci.ko
127130
kernel/drivers/vfio/vfio_iommu_type1.ko
128-
kernel/drivers/vfio/vfio_virqfd.ko
129131
kernel/drivers/vfio/vfio.ko
130132
kernel/drivers/virtio/virtio_balloon.ko
131133
kernel/drivers/virtio/virtio_input.ko

‎hack/modules-arm64.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ kernel/drivers/net/ethernet/sfc/siena/sfc-siena.ko
3636
kernel/drivers/vfio/pci/vfio-pci-core.ko
3737
kernel/drivers/vfio/pci/vfio-pci.ko
3838
kernel/drivers/vfio/vfio_iommu_type1.ko
39-
kernel/drivers/vfio/vfio_virqfd.ko
4039
kernel/drivers/vfio/vfio.ko
4140
kernel/lib/objagg.ko
4241
kernel/lib/parman.ko

‎hack/release.toml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ github_repo = "siderolabs/talos"
66
match_deps = "^github.com/((talos-systems|siderolabs)/[a-zA-Z0-9-]+)$"
77

88
# previous release
9-
previous = "v1.6.0-beta.1"
9+
previous = "v1.6.0"
1010

1111
pre_release = true
1212

@@ -17,7 +17,7 @@ preface = """\
1717
[notes.updates]
1818
title = "Component Updates"
1919
description = """\
20-
Linux: 6.1.73
20+
Linux: 6.6.13
2121
etcd: 3.5.11
2222
Kubernetes: 1.29.1
2323
containerd: 1.7.12
@@ -31,6 +31,12 @@ Talos is built with Go 1.21.6.
3131
title = "Device Selectors"
3232
description = """\
3333
Talos Linux now supports `physical: true` qualifier for device selectors, it selects non-virtual network interfaces (i.e. `en0` is selected, while `bond0` is not).
34+
"""
35+
36+
[notes.problems]
37+
title = "Known Problems"
38+
description = """\
39+
ZFS and DRBD extensions are disabled in this release due to incompatibility with the latest Linux kernel.
3440
"""
3541

3642
[make_deps]

‎internal/app/machined/pkg/controllers/runtime/kernel_module_spec.go‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ package runtime
66

77
import (
88
"context"
9+
"errors"
910
"fmt"
1011
"strings"
1112

1213
"github.com/cosi-project/runtime/pkg/controller"
13-
"github.com/cosi-project/runtime/pkg/resource"
14+
"github.com/cosi-project/runtime/pkg/safe"
1415
"github.com/pmorjan/kmod"
1516
"go.uber.org/zap"
1617

@@ -61,22 +62,29 @@ func (ctrl *KernelModuleSpecController) Run(ctx context.Context, r controller.Ru
6162
case <-ctx.Done():
6263
return nil
6364
case <-r.EventCh():
64-
modules, err := r.List(ctx, resource.NewMetadata(runtime.NamespaceName, runtime.KernelModuleSpecType, "", resource.VersionUndefined))
65-
if err != nil {
66-
return err
67-
}
65+
}
66+
67+
modules, err := safe.ReaderListAll[*runtime.KernelModuleSpec](ctx, r)
68+
if err != nil {
69+
return err
70+
}
6871

69-
// note: this code doesn't support module unloading in any way for now
70-
for _, res := range modules.Items {
71-
module := res.(*runtime.KernelModuleSpec).TypedSpec()
72-
parameters := strings.Join(module.Parameters, " ")
72+
var multiErr error
7373

74-
if err = manager.Load(module.Name, parameters, 0); err != nil {
75-
return fmt.Errorf("error loading module %q: %w", module.Name, err)
76-
}
74+
// note: this code doesn't support module unloading in any way for now
75+
for iter := modules.Iterator(); iter.Next(); {
76+
module := iter.Value().TypedSpec()
77+
parameters := strings.Join(module.Parameters, " ")
78+
79+
if err = manager.Load(module.Name, parameters, 0); err != nil {
80+
multiErr = errors.Join(multiErr, fmt.Errorf("error loading module %q: %w", module.Name, err))
7781
}
7882
}
7983

84+
if multiErr != nil {
85+
return multiErr
86+
}
87+
8088
r.ResetRestartBackoff()
8189
}
8290
}

‎internal/integration/api/extensions_qemu.go‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,32 +101,32 @@ func (suite *ExtensionsSuiteQEMU) TestExtensionsExpectedPaths() {
101101
func (suite *ExtensionsSuiteQEMU) TestExtensionsExpectedModules() {
102102
// expectedModulesModDep is a map of module name to module.dep name
103103
expectedModulesModDep := map[string]string{
104-
"asix": "asix.ko",
105-
"ax88179_178a": "ax88179_178a.ko",
106-
"ax88796b": "ax88796b.ko",
107-
"binfmt_misc": "binfmt_misc.ko",
108-
"btrfs": "btrfs.ko",
109-
"cdc_ether": "cdc_ether.ko",
110-
"cdc_mbim": "cdc_mbim.ko",
111-
"cdc_ncm": "cdc_ncm.ko",
112-
"cdc_subset": "cdc_subset.ko",
113-
"cdc_wdm": "cdc-wdm.ko",
114-
"cxgb": "cxgb.ko",
115-
"cxgb3": "cxgb3.ko",
116-
"cxgb4": "cxgb4.ko",
117-
"cxgb4vf": "cxgb4vf.ko",
118-
"drbd": "drbd.ko",
104+
"asix": "asix.ko",
105+
"ax88179_178a": "ax88179_178a.ko",
106+
"ax88796b": "ax88796b.ko",
107+
"binfmt_misc": "binfmt_misc.ko",
108+
"btrfs": "btrfs.ko",
109+
"cdc_ether": "cdc_ether.ko",
110+
"cdc_mbim": "cdc_mbim.ko",
111+
"cdc_ncm": "cdc_ncm.ko",
112+
"cdc_subset": "cdc_subset.ko",
113+
"cdc_wdm": "cdc-wdm.ko",
114+
"cxgb": "cxgb.ko",
115+
"cxgb3": "cxgb3.ko",
116+
"cxgb4": "cxgb4.ko",
117+
"cxgb4vf": "cxgb4vf.ko",
118+
// "drbd": "drbd.ko", // disabled, see https://github.com/siderolabs/pkgs/pull/873
119119
"gasket": "gasket.ko",
120120
"net1080": "net1080.ko",
121121
"option": "option.ko",
122122
"qmi_wwan": "qmi_wwan.ko",
123123
"r8153_ecm": "r8153_ecm.ko",
124124
"thunderbolt": "thunderbolt.ko",
125-
"thunderbolt_net": "thunderbolt-net.ko",
125+
"thunderbolt_net": "thunderbolt_net.ko",
126126
"usb_wwan": "usb_wwan.ko",
127127
"usbnet": "usbnet.ko",
128128
"zaurus": "zaurus.ko",
129-
"zfs": "zfs.ko",
129+
// "zfs": "zfs.ko", // disabled, see https://github.com/siderolabs/pkgs/pull/873
130130
}
131131

132132
node := suite.RandomDiscoveredNodeInternalIP(machine.TypeWorker)
@@ -543,6 +543,8 @@ func (suite *ExtensionsSuiteQEMU) mdADMScan() string {
543543

544544
// TestExtensionsZFS verifies zfs is working, udev rules work and the pool is mounted on reboot.
545545
func (suite *ExtensionsSuiteQEMU) TestExtensionsZFS() {
546+
suite.T().Skip("skipping due to https://github.com/siderolabs/pkgs/pull/873")
547+
546548
node := suite.RandomDiscoveredNodeInternalIP(machine.TypeWorker)
547549
suite.AssertServicesRunning(suite.ctx, node, map[string]string{"ext-zpool-importer": "Finished"})
548550

‎pkg/machinery/constants/constants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
const (
1818
// DefaultKernelVersion is the default Linux kernel version.
19-
DefaultKernelVersion = "6.1.73-talos"
19+
DefaultKernelVersion = "6.6.13-talos"
2020

2121
// KernelModulesPath is the default path to the kernel modules without the kernel version.
2222
KernelModulesPath = "/lib/modules"

‎pkg/machinery/gendata/data/pkgs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.7.0-alpha.0-14-g2358efe
1+
v1.7.0-alpha.0-17-gefbbd23

0 commit comments

Comments
 (0)