From: Long Li <longli@xxxxxxxxxxxxx>
Recevie credits should be updated before sending the packet, not
before a work is scheduled. Also, the value needs roll back if
something fails and cannot send.
Signed-off-by: Long Li <longli@xxxxxxxxxxxxx>
---
fs/cifs/smbdirect.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index c7ef2d7ce0ef..bdae6d41748c 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -450,8 +450,6 @@ static void smbd_post_send_credits(struct work_struct *work)
info->new_credits_offered += ret;
spin_unlock(&info->lock_new_credits_offered);
- atomic_add(ret, &info->receive_credits);
-
/* Check if we can post new receive and grant credits to peer */
check_and_send_immediate(info);
}
@@ -840,7 +838,7 @@ static int smbd_create_header(struct smbd_connection *info,
request = mempool_alloc(info->request_mempool, GFP_KERNEL);
if (!request) {
rc = -ENOMEM;
- goto err;
+ goto err_alloc;
}
request->info = info;
@@ -851,6 +849,7 @@ static int smbd_create_header(struct smbd_connection *info,
packet->credits_granted =
cpu_to_le16(manage_credits_prior_sending(info));
info->send_immediate = false;
+ atomic_add(packet->credits_granted, &info->receive_credits);
packet->flags = 0;
if (manage_keep_alive_before_sending(info))
@@ -887,7 +886,7 @@ static int smbd_create_header(struct smbd_connection *info,
if (ib_dma_mapping_error(info->id->device, request->sge[0].addr)) {
mempool_free(request, info->request_mempool);
rc = -EIO;
- goto err;
+ goto err_dma;
}
request->sge[0].length = header_length;
@@ -896,8 +895,17 @@ static int smbd_create_header(struct smbd_connection *info,
*request_out = request;
return 0;
-err:
+err_dma:
+ /* roll back receive credits */
+ spin_lock(&info->lock_new_credits_offered);
+ info->new_credits_offered += packet->credits_granted;
+ spin_unlock(&info->lock_new_credits_offered);
+ atomic_sub(packet->credits_granted, &info->receive_credits);
+
+err_alloc:
+ /* roll back send credits */
atomic_inc(&info->send_credits);
+
return rc;
}
--
2.17.1
