diff mbox series

cifs: smbd: Update receive credits before sending and deal with credits roll back on failure before sending

Message ID 1585639101-117035-1-git-send-email-longli@linuxonhyperv.com (mailing list archive)
State New, archived
Headers show
Series cifs: smbd: Update receive credits before sending and deal with credits roll back on failure before sending | expand

Commit Message

Long Li March 31, 2020, 7:18 a.m. UTC 
From: Long Li <longli@microsoft.com>

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@microsoft.com>
---
 fs/cifs/smbdirect.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

kernel test robot April 2, 2020, 1:06 a.m. UTC | #1 
Hi,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on cifs/for-next]
[also build test WARNING on v5.6 next-20200331]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/longli-linuxonhyperv-com/cifs-smbd-Update-receive-credits-before-sending-and-deal-with-credits-roll-back-on-failure-before-sending/20200331-152104
base:   git://git.samba.org/sfrench/cifs-2.6.git for-next
reproduce:
        # apt-get install sparse
        # sparse version: v0.6.1-187-gbff9b106-dirty
        make ARCH=x86_64 allmodconfig
        make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
:::::: branch date: 10 hours ago
:::::: commit date: 10 hours ago

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>

>> fs/cifs/smbdirect.c:856:26: sparse: sparse: incorrect type in argument 1 (different base types) @@    expected int i @@    got restricted __le16 [usertyint i @@
>> fs/cifs/smbdirect.c:856:26: sparse:    expected int i
>> fs/cifs/smbdirect.c:856:26: sparse:    got restricted __le16 [usertype] credits_granted
>> fs/cifs/smbdirect.c:905:35: sparse: sparse: invalid assignment: +=
>> fs/cifs/smbdirect.c:905:35: sparse:    left side has type int
>> fs/cifs/smbdirect.c:905:35: sparse:    right side has type restricted __le16
   fs/cifs/smbdirect.c:907:26: sparse: sparse: incorrect type in argument 1 (different base types) @@    expected int i @@    got restricted __le16 [usertyint i @@
   fs/cifs/smbdirect.c:907:26: sparse:    expected int i
   fs/cifs/smbdirect.c:907:26: sparse:    got restricted __le16 [usertype] credits_granted

# https://github.com/0day-ci/linux/commit/e5b2c129dd7cb9db51cd025f988ff5bc2b0990a9
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout e5b2c129dd7cb9db51cd025f988ff5bc2b0990a9
vim +856 fs/cifs/smbdirect.c

f198186aa9bbd6 Long Li 2017-11-04  806  
f198186aa9bbd6 Long Li 2017-11-04  807  /*
f198186aa9bbd6 Long Li 2017-11-04  808   * Build and prepare the SMBD packet header
f198186aa9bbd6 Long Li 2017-11-04  809   * This function waits for avaialbe send credits and build a SMBD packet
f198186aa9bbd6 Long Li 2017-11-04  810   * header. The caller then optional append payload to the packet after
f198186aa9bbd6 Long Li 2017-11-04  811   * the header
f198186aa9bbd6 Long Li 2017-11-04  812   * intput values
f198186aa9bbd6 Long Li 2017-11-04  813   * size: the size of the payload
f198186aa9bbd6 Long Li 2017-11-04  814   * remaining_data_length: remaining data to send if this is part of a
f198186aa9bbd6 Long Li 2017-11-04  815   * fragmented packet
f198186aa9bbd6 Long Li 2017-11-04  816   * output values
f198186aa9bbd6 Long Li 2017-11-04  817   * request_out: the request allocated from this function
f198186aa9bbd6 Long Li 2017-11-04  818   * return values: 0 on success, otherwise actual error code returned
f198186aa9bbd6 Long Li 2017-11-04  819   */
f198186aa9bbd6 Long Li 2017-11-04  820  static int smbd_create_header(struct smbd_connection *info,
f198186aa9bbd6 Long Li 2017-11-04  821  		int size, int remaining_data_length,
f198186aa9bbd6 Long Li 2017-11-04  822  		struct smbd_request **request_out)
f198186aa9bbd6 Long Li 2017-11-04  823  {
f198186aa9bbd6 Long Li 2017-11-04  824  	struct smbd_request *request;
f198186aa9bbd6 Long Li 2017-11-04  825  	struct smbd_data_transfer *packet;
f198186aa9bbd6 Long Li 2017-11-04  826  	int header_length;
f198186aa9bbd6 Long Li 2017-11-04  827  	int rc;
f198186aa9bbd6 Long Li 2017-11-04  828  
f198186aa9bbd6 Long Li 2017-11-04  829  	/* Wait for send credits. A SMBD packet needs one credit */
f198186aa9bbd6 Long Li 2017-11-04  830  	rc = wait_event_interruptible(info->wait_send_queue,
f198186aa9bbd6 Long Li 2017-11-04  831  		atomic_read(&info->send_credits) > 0 ||
f198186aa9bbd6 Long Li 2017-11-04  832  		info->transport_status != SMBD_CONNECTED);
f198186aa9bbd6 Long Li 2017-11-04  833  	if (rc)
f198186aa9bbd6 Long Li 2017-11-04  834  		return rc;
f198186aa9bbd6 Long Li 2017-11-04  835  
f198186aa9bbd6 Long Li 2017-11-04  836  	if (info->transport_status != SMBD_CONNECTED) {
f198186aa9bbd6 Long Li 2017-11-04  837  		log_outgoing(ERR, "disconnected not sending\n");
62fdf6707ebd46 Long Li 2019-04-05  838  		return -EAGAIN;
f198186aa9bbd6 Long Li 2017-11-04  839  	}
f198186aa9bbd6 Long Li 2017-11-04  840  	atomic_dec(&info->send_credits);
f198186aa9bbd6 Long Li 2017-11-04  841  
f198186aa9bbd6 Long Li 2017-11-04  842  	request = mempool_alloc(info->request_mempool, GFP_KERNEL);
f198186aa9bbd6 Long Li 2017-11-04  843  	if (!request) {
f198186aa9bbd6 Long Li 2017-11-04  844  		rc = -ENOMEM;
e5b2c129dd7cb9 Long Li 2020-03-31  845  		goto err_alloc;
f198186aa9bbd6 Long Li 2017-11-04  846  	}
f198186aa9bbd6 Long Li 2017-11-04  847  
f198186aa9bbd6 Long Li 2017-11-04  848  	request->info = info;
f198186aa9bbd6 Long Li 2017-11-04  849  
f198186aa9bbd6 Long Li 2017-11-04  850  	/* Fill in the packet header */
f198186aa9bbd6 Long Li 2017-11-04  851  	packet = smbd_request_payload(request);
f198186aa9bbd6 Long Li 2017-11-04  852  	packet->credits_requested = cpu_to_le16(info->send_credit_target);
f198186aa9bbd6 Long Li 2017-11-04  853  	packet->credits_granted =
f198186aa9bbd6 Long Li 2017-11-04  854  		cpu_to_le16(manage_credits_prior_sending(info));
f198186aa9bbd6 Long Li 2017-11-04  855  	info->send_immediate = false;
e5b2c129dd7cb9 Long Li 2020-03-31 @856  	atomic_add(packet->credits_granted, &info->receive_credits);
f198186aa9bbd6 Long Li 2017-11-04  857  
f198186aa9bbd6 Long Li 2017-11-04  858  	packet->flags = 0;
f198186aa9bbd6 Long Li 2017-11-04  859  	if (manage_keep_alive_before_sending(info))
f198186aa9bbd6 Long Li 2017-11-04  860  		packet->flags |= cpu_to_le16(SMB_DIRECT_RESPONSE_REQUESTED);
f198186aa9bbd6 Long Li 2017-11-04  861  
f198186aa9bbd6 Long Li 2017-11-04  862  	packet->reserved = 0;
f198186aa9bbd6 Long Li 2017-11-04  863  	if (!size)
f198186aa9bbd6 Long Li 2017-11-04  864  		packet->data_offset = 0;
f198186aa9bbd6 Long Li 2017-11-04  865  	else
f198186aa9bbd6 Long Li 2017-11-04  866  		packet->data_offset = cpu_to_le32(24);
f198186aa9bbd6 Long Li 2017-11-04  867  	packet->data_length = cpu_to_le32(size);
f198186aa9bbd6 Long Li 2017-11-04  868  	packet->remaining_data_length = cpu_to_le32(remaining_data_length);
f198186aa9bbd6 Long Li 2017-11-04  869  	packet->padding = 0;
f198186aa9bbd6 Long Li 2017-11-04  870  
f198186aa9bbd6 Long Li 2017-11-04  871  	log_outgoing(INFO, "credits_requested=%d credits_granted=%d "
f198186aa9bbd6 Long Li 2017-11-04  872  		"data_offset=%d data_length=%d remaining_data_length=%d\n",
f198186aa9bbd6 Long Li 2017-11-04  873  		le16_to_cpu(packet->credits_requested),
f198186aa9bbd6 Long Li 2017-11-04  874  		le16_to_cpu(packet->credits_granted),
f198186aa9bbd6 Long Li 2017-11-04  875  		le32_to_cpu(packet->data_offset),
f198186aa9bbd6 Long Li 2017-11-04  876  		le32_to_cpu(packet->data_length),
f198186aa9bbd6 Long Li 2017-11-04  877  		le32_to_cpu(packet->remaining_data_length));
f198186aa9bbd6 Long Li 2017-11-04  878  
f198186aa9bbd6 Long Li 2017-11-04  879  	/* Map the packet to DMA */
f198186aa9bbd6 Long Li 2017-11-04  880  	header_length = sizeof(struct smbd_data_transfer);
f198186aa9bbd6 Long Li 2017-11-04  881  	/* If this is a packet without payload, don't send padding */
f198186aa9bbd6 Long Li 2017-11-04  882  	if (!size)
f198186aa9bbd6 Long Li 2017-11-04  883  		header_length = offsetof(struct smbd_data_transfer, padding);
f198186aa9bbd6 Long Li 2017-11-04  884  
f198186aa9bbd6 Long Li 2017-11-04  885  	request->num_sge = 1;
f198186aa9bbd6 Long Li 2017-11-04  886  	request->sge[0].addr = ib_dma_map_single(info->id->device,
f198186aa9bbd6 Long Li 2017-11-04  887  						 (void *)packet,
f198186aa9bbd6 Long Li 2017-11-04  888  						 header_length,
7f46d23e1b14f0 Long Li 2019-05-13  889  						 DMA_TO_DEVICE);
f198186aa9bbd6 Long Li 2017-11-04  890  	if (ib_dma_mapping_error(info->id->device, request->sge[0].addr)) {
f198186aa9bbd6 Long Li 2017-11-04  891  		mempool_free(request, info->request_mempool);
f198186aa9bbd6 Long Li 2017-11-04  892  		rc = -EIO;
e5b2c129dd7cb9 Long Li 2020-03-31  893  		goto err_dma;
f198186aa9bbd6 Long Li 2017-11-04  894  	}
f198186aa9bbd6 Long Li 2017-11-04  895  
f198186aa9bbd6 Long Li 2017-11-04  896  	request->sge[0].length = header_length;
f198186aa9bbd6 Long Li 2017-11-04  897  	request->sge[0].lkey = info->pd->local_dma_lkey;
f198186aa9bbd6 Long Li 2017-11-04  898  
f198186aa9bbd6 Long Li 2017-11-04  899  	*request_out = request;
f198186aa9bbd6 Long Li 2017-11-04  900  	return 0;
f198186aa9bbd6 Long Li 2017-11-04  901  
e5b2c129dd7cb9 Long Li 2020-03-31  902  err_dma:
e5b2c129dd7cb9 Long Li 2020-03-31  903  	/* roll back receive credits */
e5b2c129dd7cb9 Long Li 2020-03-31  904  	spin_lock(&info->lock_new_credits_offered);
e5b2c129dd7cb9 Long Li 2020-03-31 @905  	info->new_credits_offered += packet->credits_granted;
e5b2c129dd7cb9 Long Li 2020-03-31  906  	spin_unlock(&info->lock_new_credits_offered);
e5b2c129dd7cb9 Long Li 2020-03-31  907  	atomic_sub(packet->credits_granted, &info->receive_credits);
e5b2c129dd7cb9 Long Li 2020-03-31  908  
e5b2c129dd7cb9 Long Li 2020-03-31  909  err_alloc:
e5b2c129dd7cb9 Long Li 2020-03-31  910  	/* roll back send credits */
f198186aa9bbd6 Long Li 2017-11-04  911  	atomic_inc(&info->send_credits);
e5b2c129dd7cb9 Long Li 2020-03-31  912  
f198186aa9bbd6 Long Li 2017-11-04  913  	return rc;
f198186aa9bbd6 Long Li 2017-11-04  914  }
f198186aa9bbd6 Long Li 2017-11-04  915  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Long Li April 2, 2020, 9:13 p.m. UTC | #2 
>Subject: Re: [PATCH] cifs: smbd: Update receive credits before sending and
>deal with credits roll back on failure before sending
>
>Hi,
>
>Thank you for the patch! Perhaps something to improve:
>
>[auto build test WARNING on cifs/for-next] [also build test WARNING on v5.6
>next-20200331] [if your patch is applied to the wrong git tree, please drop us a
>note to help improve the system. BTW, we also suggest to use '--base' option
>to specify the base tree in git format-patch, please see
>https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fstack
>overflow.com%2Fa%2F37406982&amp;data=02%7C01%7Clongli%40microsoft.
>com%7Cfd3236457b134cab5aa708d7d6a23124%7C72f988bf86f141af91ab2d7cd
>011db47%7C1%7C0%7C637213864404913375&amp;sdata=cMWv%2F9OFGZbe
>wPd1QSe2cevsCi4Lu%2BU8NTmKtn4UbUs%3D&amp;reserved=0]
>
>url:
>https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithu
>b.com%2F0day-ci%2Flinux%2Fcommits%2Flongli-linuxonhyperv-com%2Fcifs-
>smbd-Update-receive-credits-before-sending-and-deal-with-credits-roll-
>back-on-failure-before-sending%2F20200331-
>152104&amp;data=02%7C01%7Clongli%40microsoft.com%7Cfd3236457b134ca
>b5aa708d7d6a23124%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C63
>7213864404913375&amp;sdata=B7NJcoR5AXP0B5SS3GJ36GT%2B78sVsfXGRa
>MqaMZ3r7c%3D&amp;reserved=0
>base:   git://git.samba.org/sfrench/cifs-2.6.git for-next
>reproduce:
>        # apt-get install sparse
>        # sparse version: v0.6.1-187-gbff9b106-dirty
>        make ARCH=x86_64 allmodconfig
>        make C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__'
>:::::: branch date: 10 hours ago
>:::::: commit date: 10 hours ago
>
>If you fix the issue, kindly add following tag
>Reported-by: kbuild test robot <lkp@intel.com>

Sent v2 to fix this.

Thanks,
Long

>
>>> fs/cifs/smbdirect.c:856:26: sparse: sparse: incorrect type in argument 1
>(different base types) @@    expected int i @@    got restricted __le16
>[usertyint i @@
>>> fs/cifs/smbdirect.c:856:26: sparse:    expected int i
>>> fs/cifs/smbdirect.c:856:26: sparse:    got restricted __le16 [usertype]
>credits_granted
>>> fs/cifs/smbdirect.c:905:35: sparse: sparse: invalid assignment: +=
>>> fs/cifs/smbdirect.c:905:35: sparse:    left side has type int
>>> fs/cifs/smbdirect.c:905:35: sparse:    right side has type restricted __le16
>   fs/cifs/smbdirect.c:907:26: sparse: sparse: incorrect type in argument 1
>(different base types) @@    expected int i @@    got restricted __le16
>[usertyint i @@
>   fs/cifs/smbdirect.c:907:26: sparse:    expected int i
>   fs/cifs/smbdirect.c:907:26: sparse:    got restricted __le16 [usertype]
>credits_granted
>
>#
>https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithu
>b.com%2F0day-
>ci%2Flinux%2Fcommit%2Fe5b2c129dd7cb9db51cd025f988ff5bc2b0990a9&amp
>;data=02%7C01%7Clongli%40microsoft.com%7Cfd3236457b134cab5aa708d7d6
>a23124%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C6372138644049
>13375&amp;sdata=J86JPBj4OUDrdvhwA%2FUbSo9mRoZIQI39hww1H2nMyss
>%3D&amp;reserved=0
>git remote add linux-review
>https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithu
>b.com%2F0day-
>ci%2Flinux&amp;data=02%7C01%7Clongli%40microsoft.com%7Cfd3236457b13
>4cab5aa708d7d6a23124%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7
>C637213864404913375&amp;sdata=Ay%2FvqFcxpMtgsxBNJufixqP9wLsDyRlM
>54xiguD3Yfs%3D&amp;reserved=0
>git remote update linux-review
>git checkout e5b2c129dd7cb9db51cd025f988ff5bc2b0990a9
>vim +856 fs/cifs/smbdirect.c
>
>f198186aa9bbd6 Long Li 2017-11-04  806
>f198186aa9bbd6 Long Li 2017-11-04  807  /*
>f198186aa9bbd6 Long Li 2017-11-04  808   * Build and prepare the SMBD packet
>header
>f198186aa9bbd6 Long Li 2017-11-04  809   * This function waits for avaialbe
>send credits and build a SMBD packet
>f198186aa9bbd6 Long Li 2017-11-04  810   * header. The caller then optional
>append payload to the packet after
>f198186aa9bbd6 Long Li 2017-11-04  811   * the header
>f198186aa9bbd6 Long Li 2017-11-04  812   * intput values
>f198186aa9bbd6 Long Li 2017-11-04  813   * size: the size of the payload
>f198186aa9bbd6 Long Li 2017-11-04  814   * remaining_data_length: remaining
>data to send if this is part of a
>f198186aa9bbd6 Long Li 2017-11-04  815   * fragmented packet
>f198186aa9bbd6 Long Li 2017-11-04  816   * output values
>f198186aa9bbd6 Long Li 2017-11-04  817   * request_out: the request allocated
>from this function
>f198186aa9bbd6 Long Li 2017-11-04  818   * return values: 0 on success,
>otherwise actual error code returned
>f198186aa9bbd6 Long Li 2017-11-04  819   */
>f198186aa9bbd6 Long Li 2017-11-04  820  static int smbd_create_header(struct
>smbd_connection *info,
>f198186aa9bbd6 Long Li 2017-11-04  821  		int size, int
>remaining_data_length,
>f198186aa9bbd6 Long Li 2017-11-04  822  		struct smbd_request
>**request_out)
>f198186aa9bbd6 Long Li 2017-11-04  823  {
>f198186aa9bbd6 Long Li 2017-11-04  824  	struct smbd_request *request;
>f198186aa9bbd6 Long Li 2017-11-04  825  	struct smbd_data_transfer
>*packet;
>f198186aa9bbd6 Long Li 2017-11-04  826  	int header_length;
>f198186aa9bbd6 Long Li 2017-11-04  827  	int rc;
>f198186aa9bbd6 Long Li 2017-11-04  828
>f198186aa9bbd6 Long Li 2017-11-04  829  	/* Wait for send credits. A
>SMBD packet needs one credit */
>f198186aa9bbd6 Long Li 2017-11-04  830  	rc =
>wait_event_interruptible(info->wait_send_queue,
>f198186aa9bbd6 Long Li 2017-11-04  831  		atomic_read(&info-
>>send_credits) > 0 ||
>f198186aa9bbd6 Long Li 2017-11-04  832  		info-
>>transport_status != SMBD_CONNECTED);
>f198186aa9bbd6 Long Li 2017-11-04  833  	if (rc)
>f198186aa9bbd6 Long Li 2017-11-04  834  		return rc;
>f198186aa9bbd6 Long Li 2017-11-04  835
>f198186aa9bbd6 Long Li 2017-11-04  836  	if (info->transport_status !=
>SMBD_CONNECTED) {
>f198186aa9bbd6 Long Li 2017-11-04  837  		log_outgoing(ERR,
>"disconnected not sending\n");
>62fdf6707ebd46 Long Li 2019-04-05  838  		return -EAGAIN;
>f198186aa9bbd6 Long Li 2017-11-04  839  	}
>f198186aa9bbd6 Long Li 2017-11-04  840  	atomic_dec(&info-
>>send_credits);
>f198186aa9bbd6 Long Li 2017-11-04  841
>f198186aa9bbd6 Long Li 2017-11-04  842  	request =
>mempool_alloc(info->request_mempool, GFP_KERNEL);
>f198186aa9bbd6 Long Li 2017-11-04  843  	if (!request) {
>f198186aa9bbd6 Long Li 2017-11-04  844  		rc = -ENOMEM;
>e5b2c129dd7cb9 Long Li 2020-03-31  845  		goto err_alloc;
>f198186aa9bbd6 Long Li 2017-11-04  846  	}
>f198186aa9bbd6 Long Li 2017-11-04  847
>f198186aa9bbd6 Long Li 2017-11-04  848  	request->info = info;
>f198186aa9bbd6 Long Li 2017-11-04  849
>f198186aa9bbd6 Long Li 2017-11-04  850  	/* Fill in the packet header */
>f198186aa9bbd6 Long Li 2017-11-04  851  	packet =
>smbd_request_payload(request);
>f198186aa9bbd6 Long Li 2017-11-04  852  	packet->credits_requested =
>cpu_to_le16(info->send_credit_target);
>f198186aa9bbd6 Long Li 2017-11-04  853  	packet->credits_granted =
>f198186aa9bbd6 Long Li 2017-11-04  854
>	cpu_to_le16(manage_credits_prior_sending(info));
>f198186aa9bbd6 Long Li 2017-11-04  855  	info->send_immediate = false;
>e5b2c129dd7cb9 Long Li 2020-03-31 @856  	atomic_add(packet-
>>credits_granted, &info->receive_credits);
>f198186aa9bbd6 Long Li 2017-11-04  857
>f198186aa9bbd6 Long Li 2017-11-04  858  	packet->flags = 0;
>f198186aa9bbd6 Long Li 2017-11-04  859  	if
>(manage_keep_alive_before_sending(info))
>f198186aa9bbd6 Long Li 2017-11-04  860  		packet->flags |=
>cpu_to_le16(SMB_DIRECT_RESPONSE_REQUESTED);
>f198186aa9bbd6 Long Li 2017-11-04  861
>f198186aa9bbd6 Long Li 2017-11-04  862  	packet->reserved = 0;
>f198186aa9bbd6 Long Li 2017-11-04  863  	if (!size)
>f198186aa9bbd6 Long Li 2017-11-04  864  		packet->data_offset =
>0;
>f198186aa9bbd6 Long Li 2017-11-04  865  	else
>f198186aa9bbd6 Long Li 2017-11-04  866  		packet->data_offset =
>cpu_to_le32(24);
>f198186aa9bbd6 Long Li 2017-11-04  867  	packet->data_length =
>cpu_to_le32(size);
>f198186aa9bbd6 Long Li 2017-11-04  868  	packet-
>>remaining_data_length = cpu_to_le32(remaining_data_length);
>f198186aa9bbd6 Long Li 2017-11-04  869  	packet->padding = 0;
>f198186aa9bbd6 Long Li 2017-11-04  870
>f198186aa9bbd6 Long Li 2017-11-04  871  	log_outgoing(INFO,
>"credits_requested=%d credits_granted=%d "
>f198186aa9bbd6 Long Li 2017-11-04  872  		"data_offset=%d
>data_length=%d remaining_data_length=%d\n",
>f198186aa9bbd6 Long Li 2017-11-04  873  		le16_to_cpu(packet-
>>credits_requested),
>f198186aa9bbd6 Long Li 2017-11-04  874  		le16_to_cpu(packet-
>>credits_granted),
>f198186aa9bbd6 Long Li 2017-11-04  875  		le32_to_cpu(packet-
>>data_offset),
>f198186aa9bbd6 Long Li 2017-11-04  876  		le32_to_cpu(packet-
>>data_length),
>f198186aa9bbd6 Long Li 2017-11-04  877  		le32_to_cpu(packet-
>>remaining_data_length));
>f198186aa9bbd6 Long Li 2017-11-04  878
>f198186aa9bbd6 Long Li 2017-11-04  879  	/* Map the packet to DMA */
>f198186aa9bbd6 Long Li 2017-11-04  880  	header_length = sizeof(struct
>smbd_data_transfer);
>f198186aa9bbd6 Long Li 2017-11-04  881  	/* If this is a packet without
>payload, don't send padding */
>f198186aa9bbd6 Long Li 2017-11-04  882  	if (!size)
>f198186aa9bbd6 Long Li 2017-11-04  883  		header_length =
>offsetof(struct smbd_data_transfer, padding);
>f198186aa9bbd6 Long Li 2017-11-04  884
>f198186aa9bbd6 Long Li 2017-11-04  885  	request->num_sge = 1;
>f198186aa9bbd6 Long Li 2017-11-04  886  	request->sge[0].addr =
>ib_dma_map_single(info->id->device,
>f198186aa9bbd6 Long Li 2017-11-04  887
>		 (void *)packet,
>f198186aa9bbd6 Long Li 2017-11-04  888
>		 header_length,
>7f46d23e1b14f0 Long Li 2019-05-13  889
>		 DMA_TO_DEVICE);
>f198186aa9bbd6 Long Li 2017-11-04  890  	if
>(ib_dma_mapping_error(info->id->device, request->sge[0].addr)) {
>f198186aa9bbd6 Long Li 2017-11-04  891
>	mempool_free(request, info->request_mempool);
>f198186aa9bbd6 Long Li 2017-11-04  892  		rc = -EIO;
>e5b2c129dd7cb9 Long Li 2020-03-31  893  		goto err_dma;
>f198186aa9bbd6 Long Li 2017-11-04  894  	}
>f198186aa9bbd6 Long Li 2017-11-04  895
>f198186aa9bbd6 Long Li 2017-11-04  896  	request->sge[0].length =
>header_length;
>f198186aa9bbd6 Long Li 2017-11-04  897  	request->sge[0].lkey = info-
>>pd->local_dma_lkey;
>f198186aa9bbd6 Long Li 2017-11-04  898
>f198186aa9bbd6 Long Li 2017-11-04  899  	*request_out = request;
>f198186aa9bbd6 Long Li 2017-11-04  900  	return 0;
>f198186aa9bbd6 Long Li 2017-11-04  901
>e5b2c129dd7cb9 Long Li 2020-03-31  902  err_dma:
>e5b2c129dd7cb9 Long Li 2020-03-31  903  	/* roll back receive credits */
>e5b2c129dd7cb9 Long Li 2020-03-31  904  	spin_lock(&info-
>>lock_new_credits_offered);
>e5b2c129dd7cb9 Long Li 2020-03-31 @905  	info->new_credits_offered +=
>packet->credits_granted;
>e5b2c129dd7cb9 Long Li 2020-03-31  906  	spin_unlock(&info-
>>lock_new_credits_offered);
>e5b2c129dd7cb9 Long Li 2020-03-31  907  	atomic_sub(packet-
>>credits_granted, &info->receive_credits);
>e5b2c129dd7cb9 Long Li 2020-03-31  908
>e5b2c129dd7cb9 Long Li 2020-03-31  909  err_alloc:
>e5b2c129dd7cb9 Long Li 2020-03-31  910  	/* roll back send credits */
>f198186aa9bbd6 Long Li 2017-11-04  911  	atomic_inc(&info-
>>send_credits);
>e5b2c129dd7cb9 Long Li 2020-03-31  912
>f198186aa9bbd6 Long Li 2017-11-04  913  	return rc;
>f198186aa9bbd6 Long Li 2017-11-04  914  }
>f198186aa9bbd6 Long Li 2017-11-04  915
>
>---
>0-DAY CI Kernel Test Service, Intel Corporation
>https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.0
>1.org%2Fhyperkitty%2Flist%2Fkbuild-
>all%40lists.01.org&amp;data=02%7C01%7Clongli%40microsoft.com%7Cfd3236
>457b134cab5aa708d7d6a23124%7C72f988bf86f141af91ab2d7cd011db47%7C1%
>7C0%7C637213864404913375&amp;sdata=ojHI4Ub%2B0MaZ2I7RM9mSmqope
>GfUbtLuP8lTGaR7Qmo%3D&amp;reserved=0
diff mbox series

Patch

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;
 }