Skip to content

Revert "[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] net/ipv6: Fix KABI for Remove expired routes with a separated list of…"#1497

Closed
opsiff wants to merge 1 commit intolinux-6.6.yfrom
revert-1452-linux-6.6.y-2026-01-26-kabi
Closed

Revert "[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] net/ipv6: Fix KABI for Remove expired routes with a separated list of…"#1497
opsiff wants to merge 1 commit intolinux-6.6.yfrom
revert-1452-linux-6.6.y-2026-01-26-kabi

Conversation

@opsiff
Copy link
Member

@opsiff opsiff commented Feb 10, 2026

Reverts #1452

Summary by Sourcery

Revert previous IPv6 route garbage-collection KABI change and restore the original gc linkage and table GC list definitions.

Enhancements:

  • Restore fib6_info.gc_link as a standard field and revert it from KABI-specific usage.
  • Revert fib6_table.tb6_gc_hlist back to a regular garbage-collection candidate list instead of a KABI extension.

@sourcery-ai
Copy link

sourcery-ai bot commented Feb 10, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR reverts a previous Deepin KABI-compatible change to IPv6 FIB garbage collection, restoring direct struct members for GC linkage and table GC list while freeing the previously reserved KABI slots.

Class diagram for reverted IPv6 FIB GC fields

classDiagram
    class fib6_info {
        +refcount_t fib6_ref
        +unsigned_long expires
        +struct_hlist_node gc_link
        +struct_dst_metrics* fib6_metrics
        +struct_fib6_nh fib6_nh[]
    }

    class fib6_table {
        +struct_inet_peer_base tb6_peers
        +unsigned_int flags
        +unsigned_int fib_seq
        +struct_hlist_head tb6_gc_hlist
    }

    fib6_table "1" o-- "*" fib6_info : manages_gc_candidates
Loading

File-Level Changes

Change Details Files
Restore direct GC linkage fields in IPv6 fib6_info and fib6_table while converting prior Deepin KABI usages back to plain struct members/reserves.
  • Add fib6_info.gc_link as a real struct hlist_node member instead of using a DEEPIN_KABI_USE macro slot
  • Replace DEEPIN_KABI_USE for slots 1 and 2 in fib6_info with DEEPIN_KABI_RESERVE macros, freeing them from binding to gc_link
  • Change fib6_table.tb6_gc_hlist from a DEEPIN_KABI_EXTEND macro usage back to a normal struct hlist_head field for GC candidates
include/net/ip6_fib.h

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from opsiff. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey - I've left some high level feedback:

  • Since gc_link is now a regular struct member again and the KABI slots are switched to DEEPIN_KABI_RESERVE(1/2), double-check that no other code still assumes DEEPIN_KABI_USE(..., gc_link) semantics or accesses these slots directly elsewhere in the tree.
  • With tb6_gc_hlist reverted to a normal struct hlist_head, verify that any initialization and teardown paths still correctly initialize and clear this list without relying on DEEPIN_KABI_EXTEND-specific behavior.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Since `gc_link` is now a regular struct member again and the KABI slots are switched to `DEEPIN_KABI_RESERVE(1/2)`, double-check that no other code still assumes `DEEPIN_KABI_USE(..., gc_link)` semantics or accesses these slots directly elsewhere in the tree.
- With `tb6_gc_hlist` reverted to a normal `struct hlist_head`, verify that any initialization and teardown paths still correctly initialize and clear this list without relying on `DEEPIN_KABI_EXTEND`-specific behavior.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@opsiff
Copy link
Member Author

opsiff commented Feb 10, 2026

#1501

@opsiff opsiff closed this Feb 10, 2026
@opsiff opsiff deleted the revert-1452-linux-6.6.y-2026-01-26-kabi branch February 10, 2026 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants