Skip to content

Commit 34abd40

Browse files
metze-sambasmfrench
authored andcommitted
smb: server: make use of smbdirect_socket.send_io.bcredits
It turns out that our code will corrupt the stream of reassabled data transfer messages when we trigger an immendiate (empty) send. In order to fix this we'll have a single 'batch' credit per connection. And code getting that credit is free to use as much messages until remaining_length reaches 0, then the batch credit it given back and the next logical send can happen. Cc: <stable@vger.kernel.org> # 6.18.x Cc: Namjae Jeon <linkinjeon@kernel.org> Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Signed-off-by: Stefan Metzmacher <metze@samba.org> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 8106978 commit 34abd40

1 file changed

Lines changed: 51 additions & 2 deletions

File tree

fs/smb/server/transport_rdma.c

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ static void smb_direct_disconnect_wake_up_all(struct smbdirect_socket *sc)
221221
* in order to notice the broken connection.
222222
*/
223223
wake_up_all(&sc->status_wait);
224+
wake_up_all(&sc->send_io.bcredits.wait_queue);
224225
wake_up_all(&sc->send_io.lcredits.wait_queue);
225226
wake_up_all(&sc->send_io.credits.wait_queue);
226227
wake_up_all(&sc->send_io.pending.zero_wait_queue);
@@ -1152,17 +1153,18 @@ static void smb_direct_send_ctx_init(struct smbdirect_send_batch *send_ctx,
11521153
send_ctx->wr_cnt = 0;
11531154
send_ctx->need_invalidate_rkey = need_invalidate_rkey;
11541155
send_ctx->remote_key = remote_key;
1156+
send_ctx->credit = 0;
11551157
}
11561158

11571159
static int smb_direct_flush_send_list(struct smbdirect_socket *sc,
11581160
struct smbdirect_send_batch *send_ctx,
11591161
bool is_last)
11601162
{
11611163
struct smbdirect_send_io *first, *last;
1162-
int ret;
1164+
int ret = 0;
11631165

11641166
if (list_empty(&send_ctx->msg_list))
1165-
return 0;
1167+
goto release_credit;
11661168

11671169
first = list_first_entry(&send_ctx->msg_list,
11681170
struct smbdirect_send_io,
@@ -1204,6 +1206,13 @@ static int smb_direct_flush_send_list(struct smbdirect_socket *sc,
12041206
smb_direct_free_sendmsg(sc, last);
12051207
}
12061208

1209+
release_credit:
1210+
if (is_last && !ret && send_ctx->credit) {
1211+
atomic_add(send_ctx->credit, &sc->send_io.bcredits.count);
1212+
send_ctx->credit = 0;
1213+
wake_up(&sc->send_io.bcredits.wait_queue);
1214+
}
1215+
12071216
return ret;
12081217
}
12091218

@@ -1229,6 +1238,25 @@ static int wait_for_credits(struct smbdirect_socket *sc,
12291238
} while (true);
12301239
}
12311240

1241+
static int wait_for_send_bcredit(struct smbdirect_socket *sc,
1242+
struct smbdirect_send_batch *send_ctx)
1243+
{
1244+
int ret;
1245+
1246+
if (send_ctx->credit)
1247+
return 0;
1248+
1249+
ret = wait_for_credits(sc,
1250+
&sc->send_io.bcredits.wait_queue,
1251+
&sc->send_io.bcredits.count,
1252+
1);
1253+
if (ret)
1254+
return ret;
1255+
1256+
send_ctx->credit = 1;
1257+
return 0;
1258+
}
1259+
12321260
static int wait_for_send_lcredit(struct smbdirect_socket *sc,
12331261
struct smbdirect_send_batch *send_ctx)
12341262
{
@@ -1430,6 +1458,16 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,
14301458
struct smbdirect_send_io *msg;
14311459
int data_length;
14321460
struct scatterlist sg[SMBDIRECT_SEND_IO_MAX_SGE - 1];
1461+
struct smbdirect_send_batch _send_ctx;
1462+
1463+
if (!send_ctx) {
1464+
smb_direct_send_ctx_init(&_send_ctx, false, 0);
1465+
send_ctx = &_send_ctx;
1466+
}
1467+
1468+
ret = wait_for_send_bcredit(sc, send_ctx);
1469+
if (ret)
1470+
goto bcredit_failed;
14331471

14341472
ret = wait_for_send_lcredit(sc, send_ctx);
14351473
if (ret)
@@ -1482,6 +1520,13 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,
14821520
ret = post_sendmsg(sc, send_ctx, msg);
14831521
if (ret)
14841522
goto err;
1523+
1524+
if (send_ctx == &_send_ctx) {
1525+
ret = smb_direct_flush_send_list(sc, send_ctx, true);
1526+
if (ret)
1527+
goto err;
1528+
}
1529+
14851530
return 0;
14861531
err:
14871532
smb_direct_free_sendmsg(sc, msg);
@@ -1490,6 +1535,9 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,
14901535
credit_failed:
14911536
atomic_inc(&sc->send_io.lcredits.count);
14921537
lcredit_failed:
1538+
atomic_add(send_ctx->credit, &sc->send_io.bcredits.count);
1539+
send_ctx->credit = 0;
1540+
bcredit_failed:
14931541
return ret;
14941542
}
14951543

@@ -1961,6 +2009,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc,
19612009
resp->max_fragmented_size =
19622010
cpu_to_le32(sp->max_fragmented_recv_size);
19632011

2012+
atomic_set(&sc->send_io.bcredits.count, 1);
19642013
sc->recv_io.expected = SMBDIRECT_EXPECT_DATA_TRANSFER;
19652014
sc->status = SMBDIRECT_SOCKET_CONNECTED;
19662015
}

0 commit comments

Comments
 (0)