Skip to content

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

Merged
DarkLight1337 merged 4 commits intovllm-project:mainfrom
njhill:fix-buffer-race
Apr 26, 2025
Merged

[BugFix] Avoid race conditions in zero-copy tensor transmission#17203
DarkLight1337 merged 4 commits intovllm-project:mainfrom
njhill:fix-buffer-race

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 <nhill@redhat.com>
@github-actions
Copy link

github-actions bot commented Apr 25, 2025

👋 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 <nhill@redhat.com>
@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
@njhill
tracker.done is a property
eebacb8 
Signed-off-by: Nick Hill <nhill@redhat.com>
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
@njhill
more tracker.done() -> tracker.done
e6dfbf0 
Signed-off-by: Nick Hill <nhill@redhat.com>
@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
[BugFix] Avoid race conditions in zero-copy tensor transmission (vllm…
e692d9b 
…-project#17203)

Signed-off-by: Nick Hill <nhill@redhat.com>
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 <nhill@redhat.com>
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 <nhill@redhat.com>
Signed-off-by: Agata Dobrzyniewicz <adobrzyniewicz@habana.ai>
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 <nhill@redhat.com>
Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
@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 <nhill@redhat.com>
Signed-off-by: Yuqi Zhang <yuqizhang@google.com>
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

@robertgshaw2-redhat robertgshaw2-redhat Awaiting requested review from robertgshaw2-redhat

@ywang96 ywang96 Awaiting requested review from ywang96

@comaniac comaniac Awaiting requested review from comaniac

@alexm-redhat alexm-redhat Awaiting requested review from alexm-redhat

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