[Deepin-Kernel-SIG] [linux 6.6-y] [Upstream] [Intel] Backport bugfixes for QuickAssist Technology(QAT) live migration for in-tree driver

[Avenger-285714]

Link: #837

Skip iommu/amd: Set the pgsize_bitmap correctly

Summary by Sourcery

Implement ahead-of-time bit setting in the IOMMUFD IOVA bitmap for live migration, backport Intel QAT migration device support into the in-tree build, and correct related bitmask, overflow, and size calculations across drivers and selftests.

Bug Fixes:

• Fix ADF_RP_INT_SRC_SEL_F_RISE_MASK to use the correct bit range in the QAT GEN4 hardware data header
• Correct check_add_overflow parameter order in the VFIO/QAT resume write handler
• Make the mock_domain dirty_ops structure static in IOMMUFD selftests

Enhancements:

• Add set_ahead_length field and processing to pre-set bits in the IOMMUFD IOVA bitmap
• Include qat_mig_dev.o in the Intel QAT common build objects

Build:

• Adjust QAT common Makefile to move qat_mig_dev.o into the main intel_qat-objs list

Tests:

• Update IOMMUFD selftests to compute bitmap size in bytes using DIV_ROUND_UP and adjust FLAVORS for new buffer sizes
• Introduce DIV_ROUND_UP macro in test utils and apply it for consistent size calculations

[sourcery-ai]

Reviewer's Guide

This PR backports upstream QAT live migration fixes by integrating the migration device into the QAT build and correcting mask and overflow checks, extends the IOVA bitmap with a “set ahead” mechanism for pre-pinning, and refactors selftests to unify bitmap size calculations using DIV_ROUND_UP (including marking dirty_ops static)

Sequence Diagram for IOVA Bitmap Set-Ahead Logic

sequenceDiagram
    participant Caller
    participant iova_bitmap_set() as IBS
    participant iova_bitmap_advance() as IBA
    participant iova_bitmap_set_ahead() as IBSA
    participant iova_bitmap_struct as "iova_bitmap instance"

    Caller->>IBS: Call iova_bitmap_set(bitmap, iova, length)
    IBS->>iova_bitmap_struct: Update bitmap->set_ahead_length (if conditions met)
    IBS-->>Caller: Return

    %% Later in execution flow, or in a different context
    Caller->>IBA: Call iova_bitmap_advance(bitmap)
    IBA->>iova_bitmap_struct: Read bitmap->set_ahead_length
    alt If bitmap->set_ahead_length > 0
        IBA->>IBSA: Call iova_bitmap_set_ahead(bitmap, bitmap->set_ahead_length)
        IBSA->>iova_bitmap_struct: Loop (get pages, set bits in bitmap, put pages)
        IBSA->>iova_bitmap_struct: bitmap->set_ahead_length = 0
        IBSA-->>IBA: Return (status)
    end
    IBA-->>Caller: Return (status)

Loading

Updated Class Diagram for iova_bitmap Structure

classDiagram
    class iova_bitmap {
        +unsigned long set_ahead_length
        +iova_bitmap_set_ahead(size_t set_ahead_length) : int
        +iova_bitmap_advance() : int
        +iova_bitmap_set(unsigned long iova, unsigned long length) : void
    }

Loading

File-Level Changes

Change	Details	Files
Support “set ahead” functionality in the IOVA bitmap	Add set_ahead_length field to iova_bitmap Implement iova_bitmap_set_ahead() to pre-set and skip bits Hook set-ahead processing into iova_bitmap_advance() Record leftover range in set_ahead_length in iova_bitmap_set()	drivers/iommu/iommufd/iova_bitmap.c
Refactor bitmap sizing in IOMMU selftests	Introduce DIV_ROUND_UP macro for rounding Calculate buffer size in bytes via DIV_ROUND_UP Adjust posix_memalign and munmap size arguments Rename fixture variants and update buffer_size values	tools/testing/selftests/iommu/iommufd_utils.h tools/testing/selftests/iommu/iommufd.c
Consolidate QAT live migration build and fix macros/overflow checks	Include qat_mig_dev.o in common QAT objects and remove from PCI IOV build Update ADF_RP_INT_SRC_SEL_F_RISE_MASK to use GENMASK(1, 0) Correct check_add_overflow() argument order in VFIO QAT resume path	drivers/crypto/intel/qat/qat_common/Makefile drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.h drivers/vfio/pci/qat/main.c
Refine kernel selftest dirty_ops and allocation size	Mark dirty_ops as static const Use DIV_ROUND_UP for kernel selftest bitmap_size allocation	drivers/iommu/iommufd/selftest.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.

[Copilot]

Pull Request Overview

This PR backports bugfixes for QuickAssist Technology (QAT) live migration and includes related adjustments to IOMMU test utilities and configurations.

• Fixes in dirty bitmap size calculations and memory allocation in IOMMU selftests
• Updates to IOMMU and QAT driver configurations and object files
• Adjustments to interrupt mask definitions for QAT hardware

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
tools/testing/selftests/iommu/iommufd_utils.h	Introduces DIV_ROUND_UP macro and updates dirty bitmap calculations
tools/testing/selftests/iommu/iommufd.c	Corrects bitmap size calculation and updates fixture variants for testing
tools/testing/selftests/iommu/config	Adds additional configuration options for fault injection and debugging
drivers/vfio/pci/qat/main.c	Modifies check_add_overflow call to use the correct length parameter
drivers/iommu/iommufd/selftest.c	Adjusts bitmap size calculation using DIV_ROUND_UP for clarity
drivers/iommu/iommufd/iova_bitmap.c	Adds a mechanism (set_ahead) for handling unmapped bitmap bits
drivers/iommu/iommufd/Kconfig	Selects the IOMMUFD_DRIVER for enabling tests
drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.h	Updates the interrupt source mask for QAT ring interrupt handling
drivers/crypto/intel/qat/qat_common/Makefile	Updates the object file list to reflect QAT migration changes

Comments suppressed due to low confidence (2)

tools/testing/selftests/iommu/iommufd_utils.h:283

• [nitpick] The local variable name 'bitmap_size' may be confused with previous usage in the function signature. Consider renaming it (e.g. to 'alloc_size') for clarity.

unsigned long bitmap_size = DIV_ROUND_UP(nbits, BITS_PER_BYTE);

drivers/iommu/iommufd/iova_bitmap.c:470

• [nitpick] Consider adding a comment explaining the purpose and expected range of 'set_ahead_length' to improve maintainability and ease future code reviews.

bitmap->set_ahead_length = ((last_bit - cur_bit + 1) << bitmap->mapped.pgshift);

[deepin-ci-robot]

deepin pr auto review

代码审查意见：

1. 在Makefile中添加了qat_mig_dev.o对象文件，需要确认这个文件是否存在并且是必要的。如果这个文件不是必需的，应该移除它以避免不必要的编译。

2. 在adf_gen4_hw_data.h文件中，ADF_RP_INT_SRC_SEL_F_RISE_MASK宏的定义从BIT(2)更改为GENMASK(1, 0)，这可能会改变原有的功能。需要确认这个更改是否正确，并且不会引入任何问题。

3. 在iova_bitmap.c文件中，新增了一个iova_bitmap_set_ahead函数，这个函数看起来是为了预分配IOVA范围。但是，这个函数的实现可能会影响现有的iova_bitmap_advance函数的行为，需要确保这两个函数的集成不会导致问题。

4. 在selftest.c文件中，iommufd_test_dirty函数中的bitmap_size计算方式从直接除以BITS_PER_BYTE更改为使用DIV_ROUND_UP宏，这可能会改变原有的行为。需要确认这个更改是否正确，并且不会引入任何问题。

5. 在main.c文件中，qat_vf_resume_write函数中的check_add_overflow调用可能存在错误，因为len和*offs的类型不同。应该确保len的类型与*offs的类型相匹配，或者进行适当的类型转换。

6. 在iommufd.c文件中，iommufd_dirty_tracking测试套件的FIXTURE_SETUP函数中，self->bitmap_size的计算方式从直接除以BITS_PER_BYTE更改为使用DIV_ROUND_UP宏，这可能会改变原有的行为。需要确认这个更改是否正确，并且不会引入任何问题。

7. 在iommufd.c文件中，iommufd_dirty_tracking测试套件的FIXTURE_TEARDOWN函数中，munmap函数的参数应该与FIXTURE_SETUP函数中的计算方式一致，否则可能会导致内存泄漏。

8. 在iommufd_utils.h文件中，新增了一个DIV_ROUND_UP宏，这个宏的定义是正确的，但是应该确保这个宏在所有需要的地方都被正确使用，以避免潜在的整数除法问题。

总的来说，这些更改看起来都是合理的，但是需要确保它们不会引入任何问题，并且与现有的代码库兼容。

[sourcery-ai]

Hey @Avenger-285714 - I've reviewed your changes - here's some feedback:

• Ensure that the new set_ahead_length field is explicitly initialized (e.g., in iova_bitmap_create) to zero to prevent accidental use of stale values before any set_ahead calls.
• Since DIV_ROUND_UP is added in the test utils, wrap it in #ifndef or give it a unique prefix to avoid macro collisions with other headers.
• Double-check that moving qat_mig_dev.o into the main intel_qat-objs list doesn’t pull migration code into builds where it’s not needed—consider guarding it behind a CONFIG_QAT_MIGRATION option if appropriate.

Here's what I looked at during the review

• 🟡 General issues: 1 issue found
• 🟢 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 ✨

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

[sourcery-ai]

issue (bug_risk): Removed cast to loff_t may cause incorrect overflow checks

Casting len to loff_t is important for correct signed overflow detection. Using size_t may result in missed or incorrect overflow checks. Please ensure both operands are cast to a consistent type.

[deepin-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: opsiff

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• deepin/OWNERS [opsiff]

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

[Avenger-285714]

https://gitee.com/anolis/cloud-kernel/pulls?assignee_id=&author_id=&label_ids=&label_text=&milestone_id=&page=121&priority=&project_type=&scope=&search=&single_label_id=&single_label_text=&sort=closed_at+desc&status=merged&target_project=&tester_id=