[Deepin-Kernel-SIG] [linux 6.6.y] [KABI] apply kabi fixes for 6.6.152-6.6.155 - #2130
Open
opsiff wants to merge 3 commits into
Open
[Deepin-Kernel-SIG] [linux 6.6.y] [KABI] apply kabi fixes for 6.6.152-6.6.155#2130opsiff wants to merge 3 commits into
opsiff wants to merge 3 commits into
Conversation
deepin inclusion category: kabi Commit 305b667 ("binfmt_elf_fdpic: fix AUXV size calculation for ELF_HWCAP3 and ELF_HWCAP4") increased AT_VECTOR_SIZE_BASE from 22 to 24, which enlarges the saved_auxv[] array in struct mm_struct and changes the genksyms checksums of every exported symbol whose type graph reaches struct mm_struct. Keep the new value for the compiler but let genksyms keep seeing the old value 22 via an __GENKSYMS__ conditional, so the checksums stay identical to the previous release. Fixes: 305b667 ("binfmt_elf_fdpic: fix AUXV size calculation for ELF_HWCAP3 and ELF_HWCAP4") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
deepin inclusion category: kabi Commit 5ac8f0d ("LoongArch: Add cpuhotplug hooks to fix high cpu usage of vCPU threads") inserted CPUHP_AP_LOONGARCH_ARCH_TIMER_STARTING in the middle of enum cpuhp_state, changing the genksyms expansion of the enum and the checksums of the exported cpuhp symbols. Wrap the new enumerator with DEEPIN_KABI_EXTEND_ENUM so that genksyms keeps seeing the old enum while the compiler still gets the new state. Fixes: 5ac8f0d ("LoongArch: Add cpuhotplug hooks to fix high cpu usage of vCPU threads") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Reviewer's guide (collapsed on small PRs)Reviewer's GuideApplies 6.6.152–6.6.155 KABI fixes by controlling genksyms-only auxiliary-vector sizing, marking a CPU hotplug enum extension, and moving KCOV task_struct storage into stable Deepin KABI slots with disabled-configuration reservations. Flow diagram for configuration-dependent KABI preservationflowchart TD
A[Build kernel headers] --> B{CONFIG_KCOV enabled?}
B -->|Yes| C[Use KABI slots 2-5 for KCOV task storage]
B -->|No| D[Reserve KABI slots 2-5]
C --> E[Reserve slots 6-8]
D --> E
Flow diagram for genksyms auxiliary-vector compatibilityflowchart TD
A[Process auxvec.h] --> B{__GENKSYMS__ defined?}
B -->|Yes| C[AT_VECTOR_SIZE_BASE = 22]
B -->|No| D[AT_VECTOR_SIZE_BASE = 24]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
opsiff
force-pushed
the
linux-6.6.y-2026-09-08-kabi
branch
from
September 8, 2026 09:01
53dac14 to
3e47488
Compare
deepin inclusion
category: kabi
Commit 7806ff0e8a4d9 ("net: core,vrf: Change pcpu_dstat fields to
u64_stats_t") changed the fields of struct pcpu_dstats from u64 to
u64_stats_t, and commit 171f95d662863 ("net: harmonize tstats and
dstats") moved rx_drops behind tx_bytes. Both reached us through the
v6.6.153 stable update. The struct is reachable from struct net_device,
so the change alters the genksyms checksums of every exported symbol
whose type graph contains it (netdev, skb, socket, netlink, tls, ...).
On x86_64 u64_stats_t has the same size as u64, so the binary layout is
unchanged; the struct is per-cpu data allocated and accessed only by the
core kernel through dedicated helpers. Keep the new upstream layout for
the compiler but let genksyms keep seeing the old plain u64 members in
the old order with DEEPIN_KABI_BROKEN_REMOVE_BLOCK/INSERT_BLOCK.
Fixes: 7806ff0e8a4d9 ("net: core,vrf: Change pcpu_dstat fields to u64_stats_t")
Fixes: 171f95d662863 ("net: harmonize tstats and dstats")
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
There was a problem hiding this comment.
🟡 Changes recommended
The CPU hotplug state uses an end-extension annotation for a middle enum insertion.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Adds Deepin KABI annotations for Linux 6.6.152–6.6.155 compatibility changes.
Changes:
- Preserves auxiliary-vector sizing signatures.
- Annotates a CPU hotplug enum addition.
- Preserves historical network-stat structure signatures.
File summaries
| File | Description |
|---|---|
include/linux/auxvec.h |
Retains the previous genksyms size. |
include/linux/cpuhotplug.h |
Annotates the new LoongArch state. |
include/linux/netdevice.h |
Masks the updated statistics layout from genksyms. |
Review details
- Files reviewed: 3/3 changed files
- Comments generated: 1
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| CPUHP_AP_TEGRA_TIMER_STARTING, | ||
| CPUHP_AP_ARMADA_TIMER_STARTING, | ||
| CPUHP_AP_LOONGARCH_ARCH_TIMER_STARTING, | ||
| DEEPIN_KABI_EXTEND_ENUM(CPUHP_AP_LOONGARCH_ARCH_TIMER_STARTING) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by Sourcery
Enhancements: