[Deepin-Kernel-SIG] [linux 6.6.y] [Upstream] mm/hugetlb: drop node_alloc_noretry from alloc_fresh_hugetlb_folio

[opsiff]

mainline inclusion
from mainline-v6.11-rc1
category: bugfix

Since commit d67e32f ("hugetlb: restructure pool allocations"), the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() is not used, so drop it.

Link: https://lkml.kernel.org/r/20240516081035.5651-1-osalvador@suse.de

Reviewed-by: Sidhartha Kumar sidhartha.kumar@oracle.com
Reviewed-by: Anshuman Khandual anshuman.khandual@arm.com
Reviewed-by: Vishal Moola (Oracle) vishal.moola@gmail.com
Reviewed-by: Muchun Song muchun.song@linux.dev
Cc: Oscar Salvador osalvador@suse.de
Cc: Peter Xu peterx@redhat.com

(cherry picked from commit 6584a14)

Summary by Sourcery

Bug Fixes:

• Clean up stale node_alloc_noretry handling in hugetlb fresh folio allocation after prior refactoring.

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR removes the unused node_alloc_noretry parameter from alloc_fresh_hugetlb_folio and its callers, simplifying the hugetlb folio allocation path while explicitly passing NULL to the lower-level allocator.

Sequence diagram for updated hugetlb folio allocation path

sequenceDiagram
    participant alloc_surplus_hugetlb_folio
    participant alloc_migrate_hugetlb_folio
    participant hugetlb_hstate_alloc_pages_onenode
    participant alloc_fresh_hugetlb_folio
    participant __alloc_fresh_hugetlb_folio

    alloc_surplus_hugetlb_folio->>alloc_fresh_hugetlb_folio: alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask)
    alloc_migrate_hugetlb_folio->>alloc_fresh_hugetlb_folio: alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask)
    hugetlb_hstate_alloc_pages_onenode->>alloc_fresh_hugetlb_folio: alloc_fresh_hugetlb_folio(h, gfp_mask, nid, node_states)

    alloc_fresh_hugetlb_folio->>__alloc_fresh_hugetlb_folio: __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL)
    __alloc_fresh_hugetlb_folio-->>alloc_fresh_hugetlb_folio: folio
    alloc_fresh_hugetlb_folio-->>alloc_surplus_hugetlb_folio: folio
    alloc_fresh_hugetlb_folio-->>alloc_migrate_hugetlb_folio: folio
    alloc_fresh_hugetlb_folio-->>hugetlb_hstate_alloc_pages_onenode: folio

Loading

File-Level Changes

Change	Details	Files
Remove unused node_alloc_noretry parameter from alloc_fresh_hugetlb_folio and update callers accordingly.	Drop node_alloc_noretry parameter from alloc_fresh_hugetlb_folio signature. Pass a hard-coded NULL for the node_alloc_noretry argument when calling __alloc_fresh_hugetlb_folio. Update alloc_surplus_hugetlb_folio, alloc_migrate_hugetlb_folio, and hugetlb_hstate_alloc_pages_onenode to call alloc_fresh_hugetlb_folio without the removed parameter.	mm/hugetlb.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!

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.

[sourcery-ai]

Hey - I've reviewed your changes and they look great!

---

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.}

[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

[Copilot]

Pull request overview

This PR backports an upstream hugetlb cleanup to the 6.6.y tree by removing the unused node_alloc_noretry parameter from alloc_fresh_hugetlb_folio(), simplifying the fresh hugepage allocation interface after prior refactoring.

Changes:

• Drop the unused node_alloc_noretry argument from alloc_fresh_hugetlb_folio()’s signature.
• Update all in-file callers to use the new 4-argument form.
• Pass NULL explicitly to __alloc_fresh_hugetlb_folio() for the now-internal/unused noretry tracking in this path.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.