Skip to content
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

RDMA: Fix dead loop when transfer large data (20KB) #1386

Merged
merged 4 commits into from
Dec 5, 2024
Merged

RDMA: Fix dead loop when transfer large data (20KB) #1386

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e99df1e
fix dead loop when transfer large data (size>20474) by rdma
fengquyoumo Dec 3, 2024
9b8acb2
Fix the dead loop when rdma transfers large data by implementing post…
fengquyoumo Dec 5, 2024
0710aa1
Adjust the location of flags in struct rdma_connection because of mem…
fengquyoumo Dec 5, 2024
8517cde
adjust format
fengquyoumo Dec 5, 2024
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
33 changes: 29 additions & 4 deletions src/rdma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,12 @@ typedef enum ValkeyRdmaOpcode {
#define VALKEY_RDMA_INVALID_OPCODE 0xffff
#define VALKEY_RDMA_KEEPALIVE_MS 3000

#define RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE (1 << 0)

typedef struct rdma_connection {
connection c;
struct rdma_cm_id *cm_id;
int flags;
int last_errno;
listNode *pending_list_node;
} rdma_connection;
Expand Down Expand Up @@ -693,7 +696,7 @@ static void connRdmaEventHandler(struct aeEventLoop *el, int fd, void *clientDat
}

/* uplayer should read all */
while (ctx->rx.pos < ctx->rx.offset) {
while (!(rdma_conn->flags & RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE) && ctx->rx.pos < ctx->rx.offset) {
if (conn->read_handler && (callHandler(conn, conn->read_handler) == C_ERR)) {
return;
}
Expand All @@ -705,7 +708,7 @@ static void connRdmaEventHandler(struct aeEventLoop *el, int fd, void *clientDat
}

/* RDMA comp channel has no POLLOUT event, try to send remaining buffer */
if ((ctx->tx.offset < ctx->tx.length) && conn->write_handler) {
if (!(rdma_conn->flags & RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE) && ctx->tx.offset < ctx->tx.length && conn->write_handler) {
callHandler(conn, conn->write_handler);
}
}
Expand Down Expand Up @@ -884,6 +887,9 @@ static void connRdmaAcceptHandler(aeEventLoop *el, int fd, void *privdata, int m
}

static int connRdmaSetRwHandler(connection *conn) {
rdma_connection *rdma_conn = (rdma_connection *)conn;
if (rdma_conn->flags & RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE) return C_OK;

/* IB channel only has POLLIN event */
if (conn->read_handler || conn->write_handler) {
if (aeCreateFileEvent(server.el, conn->fd, AE_READABLE, conn->type->ae_handler, conn) == AE_ERR) {
Expand Down Expand Up @@ -1721,12 +1727,12 @@ static int rdmaProcessPendingData(void) {
listNode *ln;
rdma_connection *rdma_conn;
connection *conn;
int processed;
int processed = 0;

processed = listLength(pending_list);
listRewind(pending_list, &li);
while ((ln = listNext(&li))) {
rdma_conn = listNodeValue(ln);
if (rdma_conn->flags & RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE) continue;
conn = &rdma_conn->c;

/* a connection can be disconnected by remote peer, CM event mark state as CONN_STATE_CLOSED, kick connection
Expand All @@ -1741,15 +1747,32 @@ static int rdmaProcessPendingData(void) {
callHandler(conn, conn->write_handler);
}

++processed;
continue;
}

connRdmaEventHandler(NULL, -1, rdma_conn, 0);
++processed;
}

return processed;
}

static void postPoneUpdateRdmaState(struct connection *conn, int postpone) {
rdma_connection *rdma_conn = (rdma_connection *)conn;
if (postpone) {
rdma_conn->flags |= RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE;
} else {
rdma_conn->flags &= ~RDMA_CONN_FLAG_POSTPONE_UPDATE_STATE;
}
}

static void updateRdmaState(struct connection *conn) {
rdma_connection *rdma_conn = (rdma_connection *)conn;
connRdmaSetRwHandler(conn);
connRdmaEventHandler(NULL, -1, rdma_conn, 0);
}

static ConnectionType CT_RDMA = {
/* connection type */
.get_type = connRdmaGetType,
Expand Down Expand Up @@ -1792,6 +1815,8 @@ static ConnectionType CT_RDMA = {
/* pending data */
.has_pending_data = rdmaHasPendingData,
.process_pending_data = rdmaProcessPendingData,
.postpone_update_state = postPoneUpdateRdmaState,
.update_state = updateRdmaState,
};

ConnectionType *connectionTypeRdma(void) {
Expand Down
Loading