[https://nvbugs/5740377][fix] Lock resource to fix potential access to released data #10827
Conversation
Signed-off-by: Hui Gao <huig@nvidia.com>
|
/bot run --disable-fail-fast |
📝 WalkthroughWalkthroughThe changes introduce thread-safety enhancements to the KV cache manager by adding mutex locking mechanisms around critical sections accessing shared data structures, and re-enable two previously skipped integration tests. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
cpp/tensorrt_llm/batch_manager/kvCacheManager.cpp (2)
425-462: Critical:mNextBlocksMutexis not a member ofKVCacheBlock.The mutex
mNextBlocksMutexis declared inWindowBlockManager(see header lines 1040-1042), butfindMatchingBlock()is a method ofKVCacheBlock. This will fail to compile becauseKVCacheBlockhas no member namedmNextBlocksMutex.The mutex should be declared in the
KVCacheBlockclass since it protectsmNextBlocks, which is a member ofKVCacheBlock. Additionally, sincefindMatchingBlock()is aconstmethod (line 426), the mutex must be declared asmutable.🔧 Suggested fix in header file (KVCacheBlock class)
Add the mutex to
KVCacheBlockclass instead ofWindowBlockManager:class KVCacheBlock { // ... existing members ... // Hash for the event manager size_t mHash; + + // Mutex for thread-safe access to mNextBlocks + mutable std::mutex mNextBlocksMutex; };And remove lines 1040-1042 from
WindowBlockManager.
1173-1196: Addmutablequalifier tomCachedBlocksRootMutexdeclaration.The
findNewContextBlock()method isconstbut locksmCachedBlocksRootMutexat line 1181. Aconstmethod cannot modify member variables unless they are declaredmutable. In C++, locking a mutex modifies its internal state, so the mutex at line 1024 in the header must be declared asmutable std::mutex mCachedBlocksRootMutex;instead ofstd::mutex mCachedBlocksRootMutex;. Without this change, the code will fail to compile.
🤖 Fix all issues with AI agents
In `@cpp/include/tensorrt_llm/batch_manager/kvCacheManager.h`:
- Around line 1040-1042: The mutex mNextBlocksMutex is declared in
WindowBlockManager but protects KVCacheBlock::mNextBlocks and is used by
KVCacheBlock::findMatchingBlock() (a const method); remove the mNextBlocksMutex
declaration from WindowBlockManager and add it as a member of the KVCacheBlock
class near the mNextBlocks declaration (make it mutable so it can be locked from
the const findMatchingBlock() method) so locking occurs on the correct object.
🧹 Nitpick comments (1)
cpp/include/tensorrt_llm/batch_manager/kvCacheManager.h (1)
1-15: Update copyright year to include 2025 or 2026.Per coding guidelines, source files should contain an NVIDIA copyright header with the year of latest meaningful modification. The current header shows 2022-2024, but this file is being modified in 2026.
📝 Suggested fix
/* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2022-2026, NVIDIA CORPORATION. All rights reserved.
|
PR_Github #32679 [ run ] triggered by Bot. Commit: |
|
PR_Github #32679 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #32691 [ run ] triggered by Bot. Commit: |
|
PR_Github #32691 [ run ] completed with state
|
Signed-off-by: Hui Gao <huig@nvidia.com>
HuiGao-NV
force-pushed
the
fix_segfault
branch
from
fbf36e3 to
c8c2867
Compare
|
/bot run --disable-fail-fast |
|
PR_Github #32701 [ run ] triggered by Bot. Commit: |
|
PR_Github #32701 [ run ] completed with state
|
|
/bot run |
|
PR_Github #32817 [ run ] triggered by Bot. Commit: |
|
PR_Github #32817 [ run ] completed with state |
HuiGao-NV
changed the title
3 participants
Summary by CodeRabbit
Bug Fixes
Tests
✏️ Tip: You can customize this high-level summary in your review settings.
Description
Test Coverage
PR Checklist
Please review the following before submitting your PR:
PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.
PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.
Test cases are provided for new code paths (see test instructions)
Any new dependencies have been scanned for license and vulnerabilities
CODEOWNERS updated if ownership changes
Documentation updated as needed
Update tava architecture diagram if there is a significant design change in PR.
The reviewers assigned automatically/manually are appropriate for the PR.
Please check this after reviewing the above items as appropriate for this PR.
GitHub Bot Help
/bot [-h] ['run', 'kill', 'skip', 'reuse-pipeline'] ...Provide a user friendly way for developers to interact with a Jenkins server.
Run
/bot [-h|--help]to print this help message.See details below for each supported subcommand.
Details
run [--reuse-test (optional)pipeline-id --disable-fail-fast --skip-test --stage-list "A10-PyTorch-1, xxx" --gpu-type "A30, H100_PCIe" --test-backend "pytorch, cpp" --add-multi-gpu-test --only-multi-gpu-test --disable-multi-gpu-test --post-merge --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx" --detailed-log --debug(experimental)]Launch build/test pipelines. All previously running jobs will be killed.
--reuse-test (optional)pipeline-id(OPTIONAL) : Allow the new pipeline to reuse build artifacts and skip successful test stages from a specified pipeline or the last pipeline if no pipeline-id is indicated. If the Git commit ID has changed, this option will be always ignored. The DEFAULT behavior of the bot is to reuse build artifacts and successful test results from the last pipeline.--disable-reuse-test(OPTIONAL) : Explicitly prevent the pipeline from reusing build artifacts and skipping successful test stages from a previous pipeline. Ensure that all builds and tests are run regardless of previous successes.--disable-fail-fast(OPTIONAL) : Disable fail fast on build/tests/infra failures.--skip-test(OPTIONAL) : Skip all test stages, but still run build stages, package stages and sanity check stages. Note: Does NOT update GitHub check status.--stage-list "A10-PyTorch-1, xxx"(OPTIONAL) : Only run the specified test stages. Examples: "A10-PyTorch-1, xxx". Note: Does NOT update GitHub check status.--gpu-type "A30, H100_PCIe"(OPTIONAL) : Only run the test stages on the specified GPU types. Examples: "A30, H100_PCIe". Note: Does NOT update GitHub check status.--test-backend "pytorch, cpp"(OPTIONAL) : Skip test stages which don't match the specified backends. Only support [pytorch, cpp, tensorrt, triton]. Examples: "pytorch, cpp" (does not run test stages with tensorrt or triton backend). Note: Does NOT update GitHub pipeline status.--only-multi-gpu-test(OPTIONAL) : Only run the multi-GPU tests. Note: Does NOT update GitHub check status.--disable-multi-gpu-test(OPTIONAL) : Disable the multi-GPU tests. Note: Does NOT update GitHub check status.--add-multi-gpu-test(OPTIONAL) : Force run the multi-GPU tests in addition to running L0 pre-merge pipeline.--post-merge(OPTIONAL) : Run the L0 post-merge pipeline instead of the ordinary L0 pre-merge pipeline.--extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx"(OPTIONAL) : Run the ordinary L0 pre-merge pipeline and specified test stages. Examples: --extra-stage "H100_PCIe-TensorRT-Post-Merge-1, xxx".--detailed-log(OPTIONAL) : Enable flushing out all logs to the Jenkins console. This will significantly increase the log volume and may slow down the job.--debug(OPTIONAL) : Experimental feature. Enable access to the CI container for debugging purpose. Note: Specify exactly one stage in thestage-listparameter to access the appropriate container environment. Note: Does NOT update GitHub check status.For guidance on mapping tests to stage names, see
docs/source/reference/ci-overview.mdand the
scripts/test_to_stage_mapping.pyhelper.kill
killKill all running builds associated with pull request.
skip
skip --comment COMMENTSkip testing for latest commit on pull request.
--comment "Reason for skipping build/test"is required. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.reuse-pipeline
reuse-pipelineReuse a previous pipeline to validate current commit. This action will also kill all currently running builds associated with the pull request. IMPORTANT NOTE: This is dangerous since lack of user care and validation can cause top of tree to break.