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

[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] x86/cpufeatures: Make AVX-VNNI depend on AVX #624

Merged

Conversation

opsiff
Copy link
Member

@opsiff opsiff commented Feb 24, 2025

mainline inclusion
from mainline-v6.14-rc4
category: bugfix

The 'noxsave' boot option disables support for AVX, but support for the AVX-VNNI feature was still declared on CPUs that support it. Fix this.

Cc: Dave Hansen [email protected]
Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit 517120728484df1ab8b71cba8d2cad19f52f18a1)

Summary by Sourcery

Bug Fixes:

  • Fixes an issue where AVX-VNNI was incorrectly enabled when AVX was disabled via the 'noxsave' boot option.

mainline inclusion
from mainline-v6.14-rc4
category: bugfix

The 'noxsave' boot option disables support for AVX, but support for the
AVX-VNNI feature was still declared on CPUs that support it.  Fix this.

Signed-off-by: Eric Biggers <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Cc: Dave Hansen <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
(cherry picked from commit 517120728484df1ab8b71cba8d2cad19f52f18a1)
Signed-off-by: Wentao Guan <[email protected]>
Copy link

sourcery-ai bot commented Feb 24, 2025

Reviewer's Guide by Sourcery

This pull request fixes an issue where the AVX-VNNI feature could be enabled even when AVX was disabled (e.g., via the 'noxsave' boot option). The fix adds a dependency between AVX-VNNI and AVX in the cpuid_deps array. This ensures that AVX-VNNI is only enabled on CPUs that also support AVX.

Updated class diagram for cpuid_dep struct

classDiagram
    class cpuid_dep {
        X86_FEATURE feature
        X86_FEATURE dependency
    }
    note for cpuid_dep "This struct defines the dependencies between CPU features."
    cpuid_dep : { X86_FEATURE_AVX_VNNI, X86_FEATURE_AVX }
    note for cpuid_dep "AVX_VNNI now depends on AVX"
Loading

File-Level Changes

Change Details Files
Added a dependency between the AVX-VNNI feature and AVX, ensuring that AVX-VNNI is only enabled if AVX is also enabled.
  • Added a new entry to the cpuid_deps array that specifies X86_FEATURE_AVX as a dependency for X86_FEATURE_AVX_VNNI.
arch/x86/kernel/cpu/cpuid-deps.c

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!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

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 @opsiff - I've reviewed your changes - here's some feedback:

Overall Comments:

  • This looks like a straightforward and necessary fix.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

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.

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: sourcery-ai[bot]
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.

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

@Avenger-285714
Copy link
Collaborator

/lgtm

@Avenger-285714 Avenger-285714 merged commit 210d69d into deepin-community:linux-6.6.y Feb 24, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants