Revert "[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] bpf: Fix kabi in bpf_map_owner by using KABI_EXTEND"

[opsiff]

Reverts #1368

Summary by Sourcery

Bug Fixes:

• Align the bpf_map_owner structure layout with the original ABI by removing the DEEPIN_KABI_EXTEND wrapper from expected_attach_type.

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR reverts a previous Deepin-specific KABI extension to bpf_map_owner by restoring expected_attach_type to a normal enum field, effectively undoing the KABI_EXTEND usage introduced earlier.

Class diagram for reverted KABI extension in bpf_map_owner

classDiagram
    class bpf_map_owner {
        bool xdp_has_frags
        u64 storage_cookie[MAX_BPF_CGROUP_STORAGE_TYPE]
        const btf_type* attach_func_proto
        enum bpf_attach_type expected_attach_type
    }

Loading

File-Level Changes

Change	Details	Files
Restore bpf_map_owner.expected_attach_type to a standard enum field and remove the Deepin KABI extension wrapper.	Replace DEEPIN_KABI_EXTEND wrapper around expected_attach_type with a plain enum bpf_attach_type member Revert KABI-related adjustment in the bpf_map_owner struct layout for Deepin kernel	include/linux/bpf.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

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[deepin-ci-robot]

[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:

• deepin/OWNERS

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

[sourcery-ai]

Hey - I've left some high level feedback:

• Since this reverts the KABI_EXTEND usage for expected_attach_type, please double-check other fields in struct bpf_map_owner (and related structs) for similar wrappers to ensure the ABI layout is consistently aligned with the original design.
• Consider adding a brief comment near expected_attach_type explaining why it must not use DEEPIN_KABI_EXTEND (i.e., to preserve the original ABI layout), so future changes don’t inadvertently reintroduce the same issue.

Prompt for AI Agents

Please address the comments from this code review:

## Overall Comments
- Since this reverts the KABI_EXTEND usage for `expected_attach_type`, please double-check other fields in `struct bpf_map_owner` (and related structs) for similar wrappers to ensure the ABI layout is consistently aligned with the original design.
- Consider adding a brief comment near `expected_attach_type` explaining why it must not use `DEEPIN_KABI_EXTEND` (i.e., to preserve the original ABI layout), so future changes don’t inadvertently reintroduce the same issue.

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[opsiff]

#1501