Skip to content
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.

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

[AUTOPATCHER-kernel] Kernel upgrade to version 6.6.76.1 - branch 3.0-dev #12277

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

Conversation

CBL-Mariner-Bot
Copy link
Collaborator

@CBL-Mariner-Bot CBL-Mariner-Bot commented Feb 10, 2025

[AUTOPATCHER-kernel] Kernel upgrade to version 6.6.76.1 - branch 3.0-dev
Upgrade pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=732782&view=results

Updated Builds
BB - in progress
full build- (in progress)
[BVT tests] (in progress)

AMD

*** Smoke Testing Kernel 6.6.76.1-1.azl3 (est. < 1 min) ***
PASS: Kernel version matches the running kernel version.
PASS: eth0 interface is up.
PASS: iptables service is running.
Boot times:
Startup finished in 1.595s (kernel) + 1.442s (initrd) + 9.407s (userspace) = 12.445s 
graphical.target reached after 9.033s in userspace.
Kernel size:
-rw------- 1 root root 15036416 Feb 13 06:29 /boot/vmlinuz-6.6.76.1-1.azl3
30916	/lib/modules/6.6.76.1-1.azl3
kernel memory:
MemTotal:       32874296 kB
MemFree:        32507756 kB
MemAvailable:   32330144 kB
Total memory:
               total        used        free      shared  buff/cache   available
Mem:           32103         531       31745           8         122       31572
Swap:              0           0           0

ARM

*** Smoke Testing Kernel 6.6.76.1-1.azl3 (est. < 1 min) ***
PASS: Kernel version matches the running kernel version.
PASS: eth0 interface is up.
PASS: iptables service is running.
Boot times:
Startup finished in 2.246s (kernel) + 1.360s (initrd) + 4.853s (userspace) = 8.460s 
graphical.target reached after 4.593s in userspace.
Kernel size:
-rw------- 1 root root 48718336 Feb 13 07:02 /boot/vmlinuz-6.6.76.1-1.azl3
49196	/lib/modules/6.6.76.1-1.azl3
kernel memory:
MemTotal:       395447196 kB
MemFree:        392638160 kB
MemAvailable:   391086032 kB
Total memory:
               total        used        free      shared  buff/cache   available
Mem:          386178        4258      383435           1         173      381919
Swap:              0           0           0

@@ -2119,6 +2119,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
# CONFIG_ZRAM_DEF_COMP_LZO is not set
CONFIG_ZRAM_DEF_COMP="lzo-rle"
# CONFIG_ZRAM_WRITEBACK is not set
# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
Copy link
Contributor

@rlmenge rlmenge Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of microsoft/CBL-Mariner-Linux-Kernel@b7c3fd6

This is a new option seperates out ZRAM access time tracking or "ac-time tracking" which was previously a part of the memory tracking option. It is selected if ZRAM_MEMORY_TRACKING is enabled which is on in ARM64 but not in x86_64

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping off to stay inline with what was previously present for x86_64

@@ -7129,9 +7130,9 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TMPFS_INODE64 is not set
# CONFIG_TMPFS_QUOTA is not set
CONFIG_HUGETLBFS=y
# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -2626,6 +2626,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
# CONFIG_ZRAM_DEF_COMP_LZO is not set
CONFIG_ZRAM_DEF_COMP="lzo-rle"
CONFIG_ZRAM_WRITEBACK=y
CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
Copy link
Contributor

@rlmenge rlmenge Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as in config
Result of microsoft/CBL-Mariner-Linux-Kernel@b7c3fd6

This is a new option seperates out ZRAM access time tracking or "ac-time tracking" which was previously a part of the memory tracking option. It is selected if ZRAM_MEMORY_TRACKING is enabled which is on in ARM64 but not in x86_64.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping on to stay inline with what was previously present for aarch64

@@ -9167,7 +9168,6 @@ CONFIG_BRCMSTB_DPFE=y
CONFIG_BRCMSTB_MEMC=y
# CONFIG_OMAP_GPMC is not set
CONFIG_FSL_IFC=y
CONFIG_MTK_SMI=m
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of microsoft/CBL-Mariner-Linux-Kernel@acefaa6

The config_aarch64 sets DRM_MEDIATEK which previously selected MTK_SMI . MTK_SMI is still available at https://github.com/microsoft/CBL-Mariner-Linux-Kernel/blob/rolling-lts/mariner-3/6.6.76.1/drivers/memory/Kconfig#L183

Copy link
Contributor

@rlmenge rlmenge Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only selectable now by

  │   - MTK_IOMMU [=n] && IOMMU_SUPPORT [=y] && (ARCH_MEDIATEK [=y] || COMPILE_TEST [=n])                                                                                                                                  
  │   - MTK_IOMMU_V1 [=n] && IOMMU_SUPPORT [=y] && ARM && (ARCH_MEDIATEK [=y] || COMPILE_TEST [=n]) 

Which would require turning on MTK_IOMMU or MTK_IOMMU_V1 .

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to keep CONFIG_MTK_SMI we need to enable

CONFIG_MTK_IOMMU=m 
CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set

I tested the kernel modules' size using du -s /lib/modules/$(uname -r) (default unit appears to be KB) and vmlinuz size difference and saw ~64KB increase

Without CONFIG_MTK_SMI

49164   /lib/modules/6.6.76.1-1.azl3
-rw------- 1 root root 48718336 Feb 11 02:38 /boot/vmlinuz-6.6.76.1-1.azl3

With CONFIG_MTK_SMI

49228  /lib/modules/6.6.76.1-1001.azl3
-rw------- 1 root root 48718336 Feb 12 18:55 /boot/vmlinuz-6.6.76.1-1001.azl3

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping CONFIG_MTK_SMI to stay inline with previous offerings

@rlmenge rlmenge force-pushed the cblmargh/kernel-upgrade-3.0-dev-6.6.76.1 branch from 52c77f7 to aabc139 Compare February 13, 2025 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants