You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/01/29 08:05:12 UTC
[incubator-nuttx] branch master updated (0356a6d -> 585884f)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 0356a6d boards: sabre-6quad: Update netnsh/defconfig
new 07e7ccb boards: sabre-6quad: The iperf works with CONFIG_NET_TCP_WRITE_BUFFERS
new ec8bf5c net: tcp: Add DEBUGASSERT() in psock_tcp_send()
new 585884f arch: imx6: Add CONFIG_IMX_ENET_NTXBUFFERS check in imx_enet.c
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/imx6/imx_enet.c | 4 ++++
boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig | 3 ++-
net/tcp/tcp_send_buffered.c | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)
[incubator-nuttx] 03/03: arch: imx6: Add CONFIG_IMX_ENET_NTXBUFFERS
check in imx_enet.c
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 585884fde9a9d90a82f170c56995ca912e04e29a
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jan 29 13:37:06 2021 +0900
arch: imx6: Add CONFIG_IMX_ENET_NTXBUFFERS check in imx_enet.c
Summary:
- This commit checks CONFIG_IMX_ENET_NTXBUFFERS without
CONFIG_NET_TCP_WRITE_BUFFERS
Impact:
- None
Testing:
- Tested with sabre-6quad:netnsh with QEMU
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
arch/arm/src/imx6/imx_enet.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/src/imx6/imx_enet.c b/arch/arm/src/imx6/imx_enet.c
index 9788f33..84f0f23 100644
--- a/arch/arm/src/imx6/imx_enet.c
+++ b/arch/arm/src/imx6/imx_enet.c
@@ -102,6 +102,10 @@
# error "Need at least one TX buffer"
#endif
+#if !defined (CONFIG_NET_TCP_WRITE_BUFFERS) && (CONFIG_IMX_ENET_NTXBUFFERS != 1)
+# error "CONFIG_IMX_ENET_NTXBUFFERS must be 1 without TCP_WRITE_BUFFERS"
+#endif
+
#if CONFIG_IMX_ENET_NRXBUFFERS < 1
# error "Need at least one RX buffer"
#endif
[incubator-nuttx] 01/03: boards: sabre-6quad: The iperf works with
CONFIG_NET_TCP_WRITE_BUFFERS
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 07e7ccb80ceb480c28f4dbe8b8d90c687fe19722
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jan 29 13:30:07 2021 +0900
boards: sabre-6quad: The iperf works with CONFIG_NET_TCP_WRITE_BUFFERS
Summary:
- This commit makes the iperf work with CONFIG_NET_TCP_WRITE_BUFFERS
- Since the iperf sends a large packet (e.g. 16KB), CONFIG_IOB_NBUFFERS
must be increased enough to hold the packet
- To improve performance CONFIG_IMX_ENET_NTXBUFFERS was changed to
the default (i.e. 2)
Impact:
- sabre-6quad:netnsh only
Testing:
- Tested with iperf with QEMU
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
index 326fa92..771944e 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
@@ -40,8 +40,8 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IMX6_ENET=y
CONFIG_IMX6_UART1=y
CONFIG_IMX_DDR_SIZE=1073741824
-CONFIG_IMX_ENET_NTXBUFFERS=1
CONFIG_INTELHEX_BINARY=y
+CONFIG_IOB_NBUFFERS=128
CONFIG_MAX_TASKS=16
CONFIG_NET=y
CONFIG_NETDB_DNSCLIENT=y
@@ -60,6 +60,7 @@ CONFIG_NET_ICMP_SOCKET=y
CONFIG_NET_MAX_LISTENPORTS=8
CONFIG_NET_STATISTICS=y
CONFIG_NET_TCP=y
+CONFIG_NET_TCP_WRITE_BUFFERS=y
CONFIG_NET_UDP=y
CONFIG_NET_UDP_CHECKSUMS=y
CONFIG_NFILE_DESCRIPTORS=8
[incubator-nuttx] 02/03: net: tcp: Add DEBUGASSERT() in
psock_tcp_send()
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ec8bf5c8c12e1784e619b090b87ca567b199ec71
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jan 29 13:34:52 2021 +0900
net: tcp: Add DEBUGASSERT() in psock_tcp_send()
Summary:
- This commit adds DEBUGASSERT() to check the IOB size
Impact:
- None
Testing:
- Tested with sabre-6quad:netnsh with QEMU
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
net/tcp/tcp_send_buffered.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 51c36a6..f99c748 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -1144,6 +1144,11 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
*/
blresult = net_breaklock(&count);
+
+ /* NOTE: At least IOB needs to hold the packet */
+
+ DEBUGASSERT((CONFIG_IOB_NBUFFERS * CONFIG_IOB_BUFSIZE) > len);
+
result = TCP_WBCOPYIN(wrb, (FAR uint8_t *)buf, len);
if (blresult >= 0)
{