ksmbd: reduce descriptor size if remaining bytes is less than request size
Subsystems (3)
Namjae Jeon
maintainerPATCH 1/1 ksmbd: reduce descriptor size if remaining bytes is less than request size
Create 3 kinds of files to reproduce this problem.
dd if=/dev/urandom of=127k.bin bs=1024 count=127
dd if=/dev/urandom of=128k.bin bs=1024 count=128
dd if=/dev/urandom of=129k.bin bs=1024 count=129
When copying files from ksmbd share to windows or cifs.ko, The following error message happen from windows client.
"The file '129k.bin' is too large for the destination filesystem."
We can see the error logs from ksmbd debug prints
[48394.611537] ksmbd: RDMA r/w request 0x0: token 0x669d, length 0x20000 [48394.612054] ksmbd: smb_direct: RDMA write, len 0x20000, needed credits 0x1 [48394.612572] ksmbd: filename 129k.bin, offset 131072, len 131072 [48394.614189] ksmbd: nbytes 1024, offset 132096 mincount 0 [48394.614585] ksmbd: Failed to process 8 [-22]
And we can reproduce it with cifs.ko,
e.g. dd if=129k.bin of=/dev/null bs=128KB count=2
This problem is that ksmbd rdma return error if remaining bytes is less than Length of Buffer Descriptor V1 Structure.
smb_direct_rdma_xmit()
...
if (desc_buf_len == 0 || total_length > buf_len ||
total_length > t->max_rdma_rw_size)
return -EINVAL;This patch reduce descriptor size with remaining bytes and remove the check for total_length and buf_len.
--- fs/smb/server/transport_rdma.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
fs/smb/server/transport_rdma.c +19 -6
@@ -1366,24 +1366,37 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,LIST_HEAD (msg_list);char *desc_buf;int credits_needed; -unsigned int desc_buf_len; +unsigned int desc_buf_len, desc_num =0 ;size_t total_length =0 ;if (t->status !=SMB_DIRECT_CS_CONNECTED )return -ENOTCONN ; +if (buf_len > t->max_rdma_rw_size) +return -EINVAL ; +/* calculate needed credits */ credits_needed =0 ; desc_buf = buf; -for (i =0 ; i < desc_len /sizeof (*desc); i++) { +for (i =0 ; i < desc_len /sizeof (*desc) && buf_len !=0 ; i++) { +if (!buf_len) +break ; + desc_buf_len =le32_to_cpu (desc[i].length); +if (!desc_buf_len) +return -EINVAL ; + +if (desc_buf_len > buf_len) { + desc_buf_len = buf_len; + desc[i].length =cpu_to_le32 (desc_buf_len); + buf_len =0 ; + } credits_needed +=calc_rw_credits (t, desc_buf, desc_buf_len); desc_buf += desc_buf_len; total_length += desc_buf_len; -if (desc_buf_len ==0 || total_length > buf_len || - total_length > t->max_rdma_rw_size) -return -EINVAL ; + buf_len -= desc_buf_len; + desc_num++; } ksmbd_debug(RDMA, "RDMA %s, len %#x, needed credits %#x\n",
@@ -1395,7 +1408,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,/* build rdma_rw_ctx for each descriptor */ desc_buf = buf; -for (i =0 ; i < desc_len /sizeof (*desc); i++) { +for (i =0 ; i < desc_num; i++) { msg =kzalloc (offsetof(struct smb_direct_rdma_rw_msg , sg_list) +sizeof (struct scatterlist ) *SG_CHUNK_SIZE ,GFP_KERNEL );if (!msg) {
Signature · 1 line
2.25.1
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Namjae,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on v6.5-rc7 next-20230821]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Namjae-Jeon/ksmbd-reduce-descriptor-size-if-remaining-bytes-is-less-than-request-size/20230821-215453 base: linus/master patch link: https://lore.kernel.org/r/20230821135140.4434-1-linkinjeon%40kernel.org patch subject: [PATCH] ksmbd: reduce descriptor size if remaining bytes is less than request size config: x86_64-randconfig-003-20230822 (https://download.01.org/0day-ci/archive/20230822/[email protected]/config) compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07) reproduce: (https://download.01.org/0day-ci/archive/20230822/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> fs/smb/server/transport_rdma.c:1370:9: warning: variable 'total_length' set but not used [-Wunused-but-set-variable]
size_t total_length = 0;
^1 warning generated.
vim +/total_length +1370 fs/smb/server/transport_rdma.c
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1355
1807abcf8778bc fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1356 static int smb_direct_rdma_xmit(struct smb_direct_transport *t,
1807abcf8778bc fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1357 void *buf, int buf_len,
1807abcf8778bc fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1358 struct smb2_buffer_desc_v1 *desc,
1807abcf8778bc fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1359 unsigned int desc_len,
1807abcf8778bc fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1360 bool is_read)
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1361 {
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1362 struct smb_direct_rdma_rw_msg *msg, *next_msg;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1363 int i, ret;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1364 DECLARE_COMPLETION_ONSTACK(completion);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1365 struct ib_send_wr *first_wr;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1366 LIST_HEAD(msg_list);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1367 char *desc_buf;
ddbdc861e37c16 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1368 int credits_needed;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1369 unsigned int desc_buf_len, desc_num = 0;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 @1370 size_t total_length = 0;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1371
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1372 if (t->status != SMB_DIRECT_CS_CONNECTED)
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1373 return -ENOTCONN;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1374
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1375 if (buf_len > t->max_rdma_rw_size)
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1376 return -EINVAL;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1377
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1378 /* calculate needed credits */
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1379 credits_needed = 0;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1380 desc_buf = buf;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1381 for (i = 0; i < desc_len / sizeof(*desc) && buf_len != 0; i++) {
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1382 if (!buf_len)
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1383 break;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1384
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1385 desc_buf_len = le32_to_cpu(desc[i].length);
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1386 if (!desc_buf_len)
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1387 return -EINVAL;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1388
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1389 if (desc_buf_len > buf_len) {
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1390 desc_buf_len = buf_len;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1391 desc[i].length = cpu_to_le32(desc_buf_len);
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1392 buf_len = 0;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1393 }
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1394
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1395 credits_needed += calc_rw_credits(t, desc_buf, desc_buf_len);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1396 desc_buf += desc_buf_len;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1397 total_length += desc_buf_len;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1398 buf_len -= desc_buf_len;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1399 desc_num++;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1400 }
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1401
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1402 ksmbd_debug(RDMA, "RDMA %s, len %#x, needed credits %#x\n",
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1403 is_read ? "read" : "write", buf_len, credits_needed);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1404
ddbdc861e37c16 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1405 ret = wait_for_rw_credits(t, credits_needed);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1406 if (ret < 0)
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1407 return ret;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1408
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1409 /* build rdma_rw_ctx for each descriptor */
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1410 desc_buf = buf;
7373359abfd031 fs/smb/server/transport_rdma.c Namjae Jeon 2023-08-21 1411 for (i = 0; i < desc_num; i++) {
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1412 msg = kzalloc(offsetof(struct smb_direct_rdma_rw_msg, sg_list) +
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1413 sizeof(struct scatterlist) * SG_CHUNK_SIZE, GFP_KERNEL);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1414 if (!msg) {
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1415 ret = -ENOMEM;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1416 goto out;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1417 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1418
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1419 desc_buf_len = le32_to_cpu(desc[i].length);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1420
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1421 msg->t = t;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1422 msg->cqe.done = is_read ? read_done : write_done;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1423 msg->completion = &completion;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1424
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1425 msg->sgt.sgl = &msg->sg_list[0];
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1426 ret = sg_alloc_table_chained(&msg->sgt,
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1427 get_buf_page_count(desc_buf, desc_buf_len),
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1428 msg->sg_list, SG_CHUNK_SIZE);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1429 if (ret) {
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1430 kfree(msg);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1431 ret = -ENOMEM;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1432 goto out;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1433 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1434
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1435 ret = get_sg_list(desc_buf, desc_buf_len,
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1436 msg->sgt.sgl, msg->sgt.orig_nents);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1437 if (ret < 0) {
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1438 sg_free_table_chained(&msg->sgt, SG_CHUNK_SIZE);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1439 kfree(msg);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1440 goto out;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1441 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1442
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1443 ret = rdma_rw_ctx_init(&msg->rw_ctx, t->qp, t->qp->port,
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1444 msg->sgt.sgl,
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1445 get_buf_page_count(desc_buf, desc_buf_len),
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1446 0,
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1447 le64_to_cpu(desc[i].offset),
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1448 le32_to_cpu(desc[i].token),
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1449 is_read ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1450 if (ret < 0) {
bde1694aecdb53 fs/cifsd/transport_rdma.c Namjae Jeon 2021-06-28 1451 pr_err("failed to init rdma_rw_ctx: %d\n", ret);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1452 sg_free_table_chained(&msg->sgt, SG_CHUNK_SIZE);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1453 kfree(msg);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1454 goto out;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1455 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1456
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1457 list_add_tail(&msg->list, &msg_list);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1458 desc_buf += desc_buf_len;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1459 }
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1460
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1461 /* concatenate work requests of rdma_rw_ctxs */
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1462 first_wr = NULL;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1463 list_for_each_entry_reverse(msg, &msg_list, list) {
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1464 first_wr = rdma_rw_ctx_wrs(&msg->rw_ctx, t->qp, t->qp->port,
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1465 &msg->cqe, first_wr);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1466 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1467
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1468 ret = ib_post_send(t->qp, first_wr, NULL);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1469 if (ret) {
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1470 pr_err("failed to post send wr for RDMA R/W: %d\n", ret);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1471 goto out;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1472 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1473
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1474 msg = list_last_entry(&msg_list, struct smb_direct_rdma_rw_msg, list);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1475 wait_for_completion(&completion);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1476 ret = msg->status;
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1477 out:
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1478 list_for_each_entry_safe(msg, next_msg, &msg_list, list) {
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1479 list_del(&msg->list);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1480 smb_direct_free_rdma_rw_msg(t, msg,
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1481 is_read ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1482 }
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1483 atomic_add(credits_needed, &t->rw_credits);
ee1b0558965909 fs/ksmbd/transport_rdma.c Hyunchul Lee 2022-04-30 1484 wake_up(&t->wait_rw_credits);
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1485 return ret;
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1486 }
0626e6641f6b46 fs/cifsd/transport_rdma.c Namjae Jeon 2021-03-16 1487 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki