Skip to content

ggml : fix race-condition in ggml-rpc #13600

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −0
Open

ggml : fix race-condition in ggml-rpc #13600

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1e8e91
ggml : Fixed race-condition that leads to crashes when using ggml-rpc
gkpln3 May 17, 2025
f33b76d
Refactor RPC command mutex handling to use socket-specific mutex
gkpln3 May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ggml/src/ggml-rpc/ggml-rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ static bool parse_endpoint(const std::string & endpoint, std::string & host, int
// RPC request : | rpc_cmd (1 byte) | request_size (8 bytes) | request_data (request_size bytes) |
// No response
static bool send_rpc_cmd(const std::shared_ptr<socket_t> & sock, enum rpc_cmd cmd, const void * input, size_t input_size) {
static std::mutex send_rpc_cmd_mutex;
std::lock_guard<std::mutex> lock(send_rpc_cmd_mutex);
Copy link
Member

@ggerganov ggerganov May 25, 2025

Choose a reason for hiding this comment

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

Instead of a global mutex, probably it's better to associate it with the specific instance of the socket. Consider moving the mutex to struct socket_t.

Copy link
Author

@gkpln3 gkpln3 May 25, 2025

Choose a reason for hiding this comment

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

Good idea, let me try that.

Copy link
Author

@gkpln3 gkpln3 May 25, 2025

Choose a reason for hiding this comment

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

Looks good, I've updated the PR.

uint8_t cmd_byte = cmd;
if (!send_data(sock->fd, &cmd_byte, sizeof(cmd_byte))) {
return false;
Expand Down