sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tcp_datahandler: try throttled=false on iob_trycopyin failure as well

Browse Source 
I assume this was just an oversight because I couldn't
find any obvious reason to special-case only the first IOB.

The commit message of the original commit is cited below.

```
commit bf210560017b8df1201c02bcf1afee1fabaa37e8
Author: chao.an <anchao@xiaomi.com>
Date:   Fri Nov 27 09:50:38 2020 +0800

    net/tcp: fallback to unthrottle pool to avoid deadlock

    Add a fallback mechanism to ensure that there are still available
    iobs for an free connection, Guarantees all connections will have
    a minimum threshold iob to keep the connection not be hanged.

    Change-Id: I59bed98d135ccd1f16264b9ccacdd1b0d91261de
    Signed-off-by: chao.an <anchao@xiaomi.com>
```
This commit is contained in:
YAMAMOTO Takashi 2021-06-08 10:09:01 +09:00 committed by Xiang Xiao
parent 4b351fc447
commit 64676641cb
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
net/tcp/tcp_callback.c
View File

@ -233,43 +233,44 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
bool throttled = true; bool throttled = true;
int ret; int ret;
/* Try to allocate on I/O buffer to start the chain without waiting (and /* Try to allocate I/O buffers and copy the data into them
* throttling as necessary). If we would have to wait, then drop the * without waiting (and throttling as necessary).
* packet.
*/ */
iob = iob_tryalloc(throttled, IOBUSER_NET_TCP_READAHEAD); while (true)
if (iob == NULL)
{ {
iob = iob_tryalloc(throttled, IOBUSER_NET_TCP_READAHEAD);
if (iob != NULL)
{
ret = iob_trycopyin(iob, buffer, buflen, 0, throttled,
IOBUSER_NET_TCP_READAHEAD);
if (ret < 0)
{
/* On a failure, iob_copyin return a negated error value but
* does not free any I/O buffers.
*/
iob_free_chain(iob, IOBUSER_NET_TCP_READAHEAD);
iob = NULL;
}
}
#if CONFIG_IOB_THROTTLE > 0 #if CONFIG_IOB_THROTTLE > 0
if (IOB_QEMPTY(&conn->readahead)) if (iob == NULL && throttled && IOB_QEMPTY(&conn->readahead))
{ {
/* Fallback out of the throttled entry */ /* Fallback out of the throttled entry */
throttled = false; throttled = false;
iob = iob_tryalloc(throttled, IOBUSER_NET_TCP_READAHEAD); continue;
} }
#endif #endif
if (iob == NULL) break;
{
nerr("ERROR: Failed to create new I/O buffer chain\n");
return 0;
}
} }
/* Copy the new appdata into the I/O buffer chain (without waiting) */ if (iob == NULL)
ret = iob_trycopyin(iob, buffer, buflen, 0, throttled,
IOBUSER_NET_TCP_READAHEAD);
if (ret < 0)
{ {
/* On a failure, iob_copyin return a negated error value but does nerr("ERROR: Failed to create new I/O buffer chain\n");
* not free any I/O buffers.
*/
nerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
iob_free_chain(iob, IOBUSER_NET_TCP_READAHEAD);
return 0; return 0;
} }