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

Removed delay after receiving in recvfrom(). This was killing network performance

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5107 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-07 16:51:53 +00:00
parent 931d7909f5
commit 5b268e4dab
28 changed files with 131 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -3274,4 +3274,10 @@
* Kconfig: Verify configuration settings for the LPC43xx. This includes
some corrections to configuration variable names and defconfig settings.
* Kconfig: Add and verify configuration settings for the LPC31xx.
* arch/arm/src/stm32/stm32_uart.h and stm32_serial.c: Add logic to
re-initialize the console UART as needed to enable DMA on the
console UART (contributed by Mike Smith).
* net/recvfrom.c, net/Kconfig, include/nuttx/net/uipopt.h: Remove delay
after receiving data. That has historical reasons to be there (it
was needed before read-ahead buffering was added), but kills performance.
(Noted by Max Holtzberg).

7
Documentation/NuttxPortingGuide.html
View File

@ -5037,7 +5037,12 @@ build
<code>CONFIG_NET_TCP_READAHEAD_BUFSIZE</code>: Size of TCP read-ahead buffers
</li>
<li>
<code>CONFIG_NET_NTCP_READAHEAD_BUFFERS</code>: Number of TCP read-ahead buffers (may be zero)
<code>CONFIG_NET_NTCP_READAHEAD_BUFFERS</code>: Number of TCP read-ahead buffers (may be zero to disable TCP/IP read-ahead buffering)
</li>
<li>
<code>CONFIG_NET_TCP_RECVDELAY</code>: Delay (in deciseconds) after a TCP/IP packet is received.
This delay may allow catching of additional packets when TCP/IP read-ahead is disabled.
Default: 0
</li>
<li>
<code>CONFIG_NET_MAX_LISTENPORTS</code>: Maximum number of listening TCP ports (all tasks).

4
arch/arm/src/stm32/stm32_uart.h
View File

@ -198,11 +198,11 @@
# define SERIAL_HAVE_CONSOLE_DMA 1
#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_USART3_RXDMA)
# define SERIAL_HAVE_CONSOLE_DMA 1
#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && !efined(CONFIG_UART4_RXDMA)
#elif defined(CONFIG_UART4_SERIAL_CONSOLE) && defined(CONFIG_UART4_RXDMA)
# define SERIAL_HAVE_CONSOLE_DMA 1
#elif defined(CONFIG_UART5_SERIAL_CONSOLE) && defined(CONFIG_UART5_RXDMA)
# define SERIAL_HAVE_CONSOLE_DMA 1
#elif defined(CONFIG_USART6_SERIAL_CONSOLE) && !efined(CONFIG_USART6_RXDMA)
#elif defined(CONFIG_USART6_SERIAL_CONSOLE) && defined(CONFIG_USART6_RXDMA)
# define SERIAL_HAVE_CONSOLE_DMA 1
#endif

5
configs/README.txt
View File

@ -990,7 +990,10 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers
(may be zero)
(may be zero to disable TCP/IP read-ahead buffering)
CONFIG_NET_TCP_RECVDELAY - Delay (in deciseconds) after a TCP/IP packet
is received. This delay may allow catching of additional packets
when TCP/IP read-ahead is disabled. Default: 0
CONFIG_NET_TCPBACKLOG - Incoming connections pend in a backlog until
accept() is called. The size of the backlog is selected when listen()
is called.

2
configs/olimex-stm32-p107/nsh/defconfig
View File

@ -365,7 +365,7 @@ CONFIG_NET_MULTICAST=n
#
# STM32F107vc Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=n
CONFIG_STM32_RMII=y
CONFIG_STM32_RMII_MCO=y

2
configs/stm3220g-eval/dhcpd/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3220g-eval/nettest/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3220g-eval/nsh/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3220g-eval/nsh2/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3220g-eval/nxwm/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3220g-eval/ostest/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3220g-eval/telnetd/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F20xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/dhcpd/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/nettest/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/nsh/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/nsh2/defconfig
View File

@ -204,7 +204,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/nxconsole/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/nxwm/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/ostest/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/telnetd/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm3240g-eval/webserver/defconfig
View File

@ -203,7 +203,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm32f4discovery/nsh/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm32f4discovery/nxlines/defconfig
View File

@ -197,7 +197,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm32f4discovery/ostest/defconfig
View File

@ -192,7 +192,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

2
configs/stm32f4discovery/pm/defconfig
View File

@ -198,7 +198,7 @@ CONFIG_CAN2_BAUD=700000
#
# STM32F40xxx Ethernet device driver settings
#
CONFIG_STM32_PHYADDR=0x01
CONFIG_STM32_PHYADDR=1
CONFIG_STM32_MII=y
CONFIG_STM32_MII_MCO1=y
CONFIG_STM32_MII_MCO2=n

18
include/nuttx/net/uip/uipopt.h
View File

@ -296,7 +296,23 @@
/* The size of the TCP read buffer size */
#ifndef CONFIG_NET_TCP_READAHEAD_BUFSIZE
# define CONFIG_NET_TCP_READAHEAD_BUFSIZE UIP_TCP_MSS
# if CONFIG_NET_NTCP_READAHEAD_BUFFERS < 1
# define CONFIG_NET_TCP_READAHEAD_BUFSIZE 0
# else
# define CONFIG_NET_TCP_READAHEAD_BUFSIZE UIP_TCP_MSS
# endif
#endif
/* Delay after receive to catch a following packet. No delay should be
* required if TCP/IP read-ahead buffering is enabled.
*/
#ifndef CONFIG_NET_TCP_RECVDELAY
# if CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0
# define CONFIG_NET_TCP_RECVDELAY 0
# else
# define CONFIG_NET_TCP_RECVDELAY 5
# endif
#endif
/****************************************************************************

33
net/Kconfig
View File

@ -112,16 +112,43 @@ config NET_MAX_LISTENPORTS
Maximum number of listening TCP/IP ports (all tasks). Default: 20
config NET_TCP_READAHEAD_BUFSIZE
bool "TCP/IP read-ahead buffer size"
int "TCP/IP read-ahead buffer size"
default 562
---help---
Size of TCP/IP read-ahead buffers
Read-ahead buffers allows buffering of TCP/IP packets when there is no
receive in place to catch the TCP packet. In that case, the packet
will be retained in the NuttX read-ahead buffers.
This setting specifies the size of one TCP/IP read-ahead buffer.
This should best be a equal to the maximum packet size (NET_BUFSIZE).
config NET_NTCP_READAHEAD_BUFFERS
int "Number of TCP/IP read-ahead buffers"
default 8
---help---
Number of TCP/IP read-ahead buffers (may be zero)
Read-ahead buffers allows buffering of TCP/IP packets when there is no
receive in place to catch the TCP packet. In that case, the packet
will be retained in the NuttX read-ahead buffers.
This setting specifies the number of TCP/IP read-ahead buffers This
value can be set to zero to disable all TCP/IP read-ahead buffering.
You might want to disable TCP/IP read-ahead buffering on a highly
memory constained system that does not have any TCP/IP packet rate
issues.
config NET_TCP_RECVDELAY
int "TCP Rx delay"
default 0
---help---
If NET_NTCP_READAHEAD_BUFFERS is zero, then there will be no buffering
of TCP/IP packets: Any TCP/IP packet received will be ACKed, but its contents
will be dropped in the bit-bucket.
One low-performance option is delay for a short period of time after a
TCP/IP packet is received to see if another comes right behind it. Then
the packet data from both can be combined. This option only makes since
if performance is not an issue and you need to handle short bursts of
small, back-to-back packets. The delay is in units of deciseconds.
config NET_TCPBACKLOG
bool "TCP/IP backlog support"

63
net/recvfrom.c
View File

@ -59,8 +59,6 @@
* Definitions
****************************************************************************/
#define TCP_TIMEO 10 /* Deciseconds after data received before recv() returns */
#define UDPBUF ((struct uip_udpip_hdr *)&dev->d_buf[UIP_LLH_LEN])
#define TCPBUF ((struct uip_tcpip_hdr *)&dev->d_buf[UIP_LLH_LEN])
@ -354,31 +352,39 @@ static int recvfrom_timeout(struct recvfrom_s *pstate)
FAR struct socket *psock = 0;
socktimeo_t timeo = 0;
/* If this is a TCP socket that has already received some data,
* than we will always use a short timeout.
/* Check for a timeout configured via setsockopts(SO_RCVTIMEO). If none...
* we well let the read hang forever (except for the special case below).
*/
if (pstate->rf_recvlen > 0)
{
/* Use the short timeout */
/* Get the socket reference from the private data */
timeo = TCP_TIMEO;
psock = pstate->rf_sock;
if (psock)
{
/* Recover the timeout value (zero if no timeout) */
timeo = psock->s_rcvtimeo;
}
/* No.. check for a timeout configured via setsockopts(SO_RCVTIMEO).
* If none... we well let the read hang forever.
/* Use a fixed, configurable delay under the following circumstances:
*
* 1) This delay function has been enabled with CONFIG_NET_TCP_RECVDELAY > 0
* 2) Some data has already been received from the socket. Since this can
* only be true for a TCP/IP socket, this logic applies only to TCP/IP
* sockets, and either
* 3) There is no configured receive timeout, or
* 4) The configured receive timeout is greater than than the delay
*/
else
#if CONFIG_NET_TCP_RECVDELAY > 0
if ((timeo == 0 || timeo > CONFIG_NET_TCP_RECVDELAY) &&
pstate->rf_recvlen > 0)
{
/* Get the socket reference from the private data */
/* Use the configured timeout */
psock = pstate->rf_sock;
if (psock)
{
timeo = psock->s_rcvtimeo;
}
timeo = CONFIG_NET_TCP_RECVDELAY;
}
#endif
/* Is there an effective timeout? */
@ -389,7 +395,7 @@ static int recvfrom_timeout(struct recvfrom_s *pstate)
return net_timeo(pstate->rf_starttime, timeo);
}
/* No timeout */
/* No timeout -- hang forever waiting for data. */
return FALSE;
}
@ -489,9 +495,28 @@ static uint16_t recvfrom_tcpinterrupt(struct uip_driver_s *dev, void *conn,
flags = (flags & ~UIP_NEWDATA) | UIP_SNDACK;
/* If the user buffer has been filled, then we are finished. */
/* Check for transfer complete. We will consider the transfer
* complete in own of two different ways, depending on the setting
* of CONFIG_NET_TCP_RECVDELAY.
*
* 1) If CONFIG_NET_TCP_RECVDELAY == 0 then we will consider the
* TCP/IP transfer complete as soon as any data has been received.
* This is safe because if any additional data is received, it
* will be retained inthe TCP/IP read-ahead buffer until the
* next receive is performed.
* 2) CONFIG_NET_TCP_RECVDELAY > 0 may be set to wait a little
* bit to determine if more data will be received. You might
* do this if read-ahead buffereing is disabled and we want to
* minimize the loss of back-to-back packets. In this case,
* the transfer is complete when either a) the entire user buffer
* is full or 2) when the receive timeout occurs (below).
*/
#if CONFIG_NET_TCP_RECVDELAY > 0
if (pstate->rf_buflen == 0)
#else
if (pstate->rf_recvlen > 0)
#endif
{
nllvdbg("TCP resume\n");