Skip to content

[BugFix] Avoid race conditions in zero-copy tensor transmission #17203

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Apr 26, 2025
Merged

[BugFix] Avoid race conditions in zero-copy tensor transmission #17203

merged 4 commits into from
Apr 26, 2025

Conversation

njhill
Copy link
Member

@njhill njhill commented Apr 25, 2025 •
edited by github-actions bot
Loading

When reusing buffers and when sending direct references to tensor backing data that may be managed by the pytorch cpu allocator.

In both cases we need to ensure ZMQ is finished with the buffer before reusing it.

Also extend unit test to cover empty tensor case.

Hopefully fixes #15207.

@njhill
[BugFix] Avoid race conditions in zero-copy tensor transmission
8b4aade 
When reusing buffers and when sending direct references to tensor backing data that may be managed by the pytorch cpu allocator.

In both cases we need to ensure ZMQ is finished with the buffer before reusing it.

Also extend unit test to cover empty tensor case.

Signed-off-by: Nick Hill <[email protected]>
@github-actions GitHub Actions
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

@mergify mergify bot added the v1 label Apr 25, 2025
@njhill
minor code simplification
d1a0cfc 
Signed-off-by: Nick Hill <[email protected]>
@njhill njhill added this to the v0.8.5 milestone Apr 25, 2025
@njhill njhill added the bug Something isn't working label Apr 25, 2025
DarkLight1337
DarkLight1337 approved these changes Apr 26, 2025
View reviewed changes
Copy link
Member

@DarkLight1337 DarkLight1337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing!

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) April 26, 2025 02:53
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Apr 26, 2025
@DarkLight1337 DarkLight1337 merged commit b07bf83 into vllm-project:main Apr 26, 2025
43 checks passed
@njhill njhill deleted the fix-buffer-race branch April 26, 2025 13:44
@njhill njhill mentioned this pull request Apr 28, 2025
Closed
1 task
jikunshang pushed a commit to jikunshang/vllm that referenced this pull request Apr 29, 2025
@njhill @dbyoung18
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
e692d9b 
…-project#17203)

Signed-off-by: Nick Hill <[email protected]>
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Apr 29, 2025
@njhill @lk-chen
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
e1f3e71 
…-project#17203)

Signed-off-by: Nick Hill <[email protected]>
adobrzyn pushed a commit to HabanaAI/vllm-fork that referenced this pull request Apr 30, 2025
@njhill @adobrzyn
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
e2a1870 
…-project#17203)

Signed-off-by: Nick Hill <[email protected]>
Signed-off-by: Agata Dobrzyniewicz <[email protected]>
RichardoMrMu pushed a commit to RichardoMrMu/vllm that referenced this pull request May 12, 2025
@njhill
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
1d6cff4 
…-project#17203)

Signed-off-by: Nick Hill <[email protected]>
Signed-off-by: Mu Huai <[email protected]>
@ckhordiasma ckhordiasma mentioned this pull request May 14, 2025
Merged
zzzyq pushed a commit to zzzyq/vllm that referenced this pull request May 24, 2025
@njhill
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
b4a8272 
…-project#17203)

Signed-off-by: Nick Hill <[email protected]>
Signed-off-by: Yuqi Zhang <[email protected]>
minpeter pushed a commit to minpeter/vllm that referenced this pull request Jun 24, 2025
@njhill @minpeter
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
bf700da 
…-project#17203)

Signed-off-by: Nick Hill <[email protected]>
Signed-off-by: minpeter <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DarkLight1337 DarkLight1337 DarkLight1337 approved these changes

@WoosukKwon WoosukKwon Awaiting requested review from WoosukKwon WoosukKwon is a code owner

@robertgshaw2-redhat robertgshaw2-redhat Awaiting requested review from robertgshaw2-redhat robertgshaw2-redhat is a code owner

@ywang96 ywang96 Awaiting requested review from ywang96 ywang96 is a code owner

@comaniac comaniac Awaiting requested review from comaniac comaniac is a code owner

@alexm-redhat alexm-redhat Awaiting requested review from alexm-redhat alexm-redhat is a code owner

Assignees
No one assigned
Labels
bug Something isn't working ready ONLY add when PR is ready to merge/full CI is needed v1
Projects
None yet
Milestone
v0.8.5
Development

Successfully merging this pull request may close these issues.

[Bug]: msgspec.DecodeError: MessagePack data is malformed: trailing characters (byte 13)
2 participants
@njhill @DarkLight1337