OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity
48,765 Commits 18 Branches 185 Tags 409 MiB
Commit Graph

334 Commits

Author SHA1 Message Date
Fotis Panagiotopoulos 5e625b9cdb Performance optimizations in connection allocations. 2023-02-28 14:23:16 +01:00
Xiang Xiao 2c5f653bfd Remove the tail spaces from all files except Documentation 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2023-02-26 13:24:24 -08:00
Zhe Weng 0069eefd4b net/udp: Add drop count when limited by recv bufsize 
Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
 2023-02-24 14:36:01 +02:00
Fotis Panagiotopoulos 7f3591b9cc Improvements in UDP connections allocation. 2023-02-20 09:06:46 +08:00
zhanghongyu a2097cfb71 net: modify find device logic 
The priorities for finding a network adapter are as follows:
1. if laddr is not ANY, use laddr to find device;
2. if laddr is ANY, and bound index is not 0, use bound index
   to find device;
3. if laddr is ANY and no device is bound, use raddr to find
   device.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2023-02-12 01:25:34 +08:00
Zhe Weng aad1a70bc5 net/udp: Support binding to same addr/port if SO_REUSEADDR is specified. 
Ref: On Linux, if SO_REUSEADDR(sk_reuse) is set for both sockets, port will not be regarded as inuse. https://github.com/torvalds/linux/blob/v6.1/net/ipv4/udp.c#L146

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
 2023-02-10 10:01:08 +01:00
zhanghongyu 3e4e416786 tcp/udp_connect: If the remote addr is ANY, change it to LOOPBACK 
Behavior alignment to Linux

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2023-01-29 13:46:43 +08:00
梁超众 5012195bde support ipv4 ToS and ipv6 TrafficClass 
Signed-off-by: 梁超众 <liangchaozhong@xiaomi.com>
 2023-01-29 13:43:44 +08:00
zhanghongyu 1857a4a3c8 udp: Ipv4/6 can be bound to the same port 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2023-01-28 23:28:33 +02:00
zhanghongyu 99c2d2009a udp: remove DEBUGASSERT for ip6_is_ipv4addr 
fix build break if enable CONFIG_NET_IPv6 only

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2023-01-28 09:04:29 +02:00
chao an 2afa1b3b64 net/udp: correct linger timeout 
UDP linger timeout will be wrongly converted to UINT_MAX by _SO_TIMEOUT() when it is set to 0,

net/socket/socket.h:
|
| #  define _SO_TIMEOUT(t) ((t) ? (t) * MSEC_PER_DSEC : UINT_MAX)

net/udp/udp_close.c:
|
| if (_SO_GETOPT(conn->sconn.s_options, SO_LINGER))
|   {
|     timeout = _SO_TIMEOUT(conn->sconn.s_linger);
|   }

this change will correct this behavior, if the linger is set to 0, the timeout value should be 0

Signed-off-by: chao an <anchao@xiaomi.com>
 2023-01-18 02:47:12 +08:00
Xiang Xiao a851ad84c3 net: consistent the net sem wait naming conversion 
to prepare the new mutex wait function

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2023-01-15 12:31:30 -03:00
chao an 8a63d29c6e net/devif_poll: optimize device buffer alloc in txpoll 
Allocate the device buffer only if the protocol really need to send data.
not all protocols require the driver to prepare additional iob before
sending, especially UDP, each iob reserves l2/l3 header in advance
after prepare write buffer, net device could reuse this entry to send directly

Signed-off-by: chao an <anchao@xiaomi.com>
 2023-01-13 16:41:10 +08:00
Zhe Weng 6222ad5764 Revert "net: downgrade iob priority of input/udp/icmp to avoid blocking devif" 
This reverts commit d87620abc9.
 2023-01-12 01:56:18 +08:00
Zhe Weng d87620abc9 net: downgrade iob priority of input/udp/icmp to avoid blocking devif 
When trying to use iperf2, we found it comsumes all the IOB when sending UDP packets, then devif_poll has no IOB to send the packet out, so speed drops to 0 and never recovers.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
 2023-01-05 22:25:19 +08:00
Xiang Xiao d5689e070b net/arp: Remove nuttx/net/arp.h 
1.move ARPHRD_ETHER to netinet/arp.h
1.move arp_entry_s to net/arp/arp.h
2.move arp_input to nuttx/net/netdev.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-12-16 22:10:59 +02:00
chao an 3a50911810 net/udp: correct udp send timeout 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-16 09:51:15 +08:00
chao an 11de08de27 net/devif_send: replace all block send to nonblock mode 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-08 09:53:15 +01:00
chao an 82d67b201a net/offload: add offload support for pkt/arp 
1. add offload support for pkt/arp
2. Reset the d_buf to NULL if d_iob has released

Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-04 01:34:30 +08:00
chao an 34d2cde8a8 net/l2/l3/l4: add support of iob offload 
1. Add new config CONFIG_NET_LL_GUARDSIZE to isolation of l2 stack,
   which will benefit l3(IP) layer for multi-MAC(l2) implementation,
   especially in some NICs such as celluler net driver.

new configuration options: CONFIG_NET_LL_GUARDSIZE

CONFIG_NET_LL_GUARDSIZE will reserved l2 buffer header size of
network buffer to isolate the L2/L3 (MAC/IP) data on network layer,
which will be beneficial to L3 network layer protocol transparent
transmission and forwarding

------------------------------------------------------------
Layout of frist iob entry:

        iob_data (aligned by CONFIG_IOB_ALIGNMENT)
            |
            |                  io_offset(CONFIG_NET_LL_GUARDSIZE)
            |                                |
            -------------------------------------------------
      iob   |            Reserved            |    io_len    |
            -------------------------------------------------

-------------------------------------------------------------
Layout of different NICs implementation:

        iob_data (aligned by CONFIG_IOB_ALIGNMENT)
            |
            |                 io_offset(CONFIG_NET_LL_GUARDSIZE)
            |                                |
            -------------------------------------------------
 Ethernet   |       Reserved    | ETH_HDRLEN |    io_len    |
            ---------------------------------|---------------
 8021Q      |   Reserved  | ETH_8021Q_HDRLEN |    io_len    |
            ---------------------------------|---------------
 ipforward  |            Reserved            |    io_len    |
            -------------------------------------------------

--------------------------------------------------------------------

2. Support iob offload to l2 driver to avoid unnecessary memory copy

Support send/receive iob vectors directly between the NICs and l3/l4
stack to avoid unnecessary memory copies, especially on hardware that
supports Scatter/gather, which can greatly improve performance.

new interface to support iob offload:

  ------------------------------------------
  |    IOB version     |     original      |
  |----------------------------------------|
  |  devif_iob_poll()  |   devif_poll()    |
  |       ...          |       ...         |
  ------------------------------------------

--------------------------------------------------------------------

1> NIC hardware support Scatter/gather transfer

TX:

                tcp_poll()/udp_poll()/pkt_poll()/...(l3|l4)
                           /              \
                          /                \
devif_poll_[l3|l4]_connections()     devif_iob_send() (nocopy:udp/icmp/...)
           /                                   \      (copy:tcp)
          /                                     \
  devif_iob_poll("NIC"_txpoll)                callback() // "NIC"_txpoll
                                                  |
                            dev->d_iob:           |
                                                ---------------         ---------------
                             io_data       iob1 |  |          |    iob3 |  |          |
                                    \           ---------------         ---------------
                                  ---------------  |       --------------- |
                             iob0 |  |          |  |  iob2 |  |          | |
                                  ---------------  |       --------------- |
                                     \             |          /           /
                                        \          |       /           /
                                   ----------------------------------------------
                    NICs io vector |    |    |    |    |    |    |    |    |    |
                                   ----------------------------------------------

RX:

  [tcp|udp|icmp|...]ipv[4|6]_data_handler()(iob_concat/append to readahead)
                    |
                    |
      [tcp|udp|icmp|...]_ipv[4|6]_in()/...
                    |
                    |
          pkt/ipv[4/6]_input()/...
                    |
                    |
     NICs io vector receive(iov_base to each iobs)

--------------------------------------------------------------------

2> CONFIG_IOB_BUFSIZE is greater than MTU:

TX:

"(CONFIG_IOB_BUFSIZE) > (MAX_NETDEV_PKTSIZE + CONFIG_NET_GUARDSIZE + CONFIG_NET_LL_GUARDSIZE)"

                tcp_poll()/udp_poll()/pkt_poll()/...(l3|l4)
                           /              \
                          /                \
devif_poll_[l3|l4]_connections()     devif_iob_send() (nocopy:udp/icmp/...)
           /                                   \      (copy:tcp)
          /                                     \
  devif_iob_poll("NIC"_txpoll)                callback() // "NIC"_txpoll
                                                  |
                                             "NIC"_send()
                          (dev->d_iob->io_data[CONFIG_NET_LL_GUARDSIZE - NET_LL_HDRLEN(dev)])

RX:

  [tcp|udp|icmp|...]ipv[4|6]_data_handler()(iob_concat/append to readahead)
                    |
                    |
      [tcp|udp|icmp|...]_ipv[4|6]_in()/...
                    |
                    |
          pkt/ipv[4/6]_input()/...
                    |
                    |
     NICs io vector receive(iov_base to io_data)

--------------------------------------------------------------------

3> Compatible with all old flat buffer NICs

TX:
                tcp_poll()/udp_poll()/pkt_poll()/...(l3|l4)
                           /              \
                          /                \
devif_poll_[l3|l4]_connections()     devif_iob_send() (nocopy:udp/icmp/...)
           /                                   \      (copy:tcp)
          /                                     \
  devif_iob_poll(devif_poll_callback())  devif_poll_callback() /* new interface, gather iobs to flat buffer */
       /                                           \
      /                                             \
 devif_poll("NIC"_txpoll)                     "NIC"_send()(dev->d_buf)

RX:

  [tcp|udp|icmp|...]ipv[4|6]_data_handler()(iob_concat/append to readahead)
                    |
                    |
      [tcp|udp|icmp|...]_ipv[4|6]_in()/...
                    |
                    |
               netdev_input()  /* new interface, Scatter/gather flat/iob buffer */
                    |
                    |
          pkt/ipv[4|6]_input()/...
                    |
                    |
    NICs io vector receive(Orignal flat buffer)

3. Iperf passthrough on NuttX simulator:

  -------------------------------------------------
  |  Protocol      | Server | Client |            |
  |-----------------------------------------------|
  |  TCP           |  813   |   834  |  Mbits/sec |
  |  TCP(Offload)  | 1720   |  1100  |  Mbits/sec |
  |  UDP           |   22   |   757  |  Mbits/sec |
  |  UDP(Offload)  |   25   |  1250  |  Mbits/sec |
  -------------------------------------------------

Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-03 11:47:04 +08:00
liyi 391b501639 net: extract l3 header build code into new functions 
Signed-off-by: liyi <liyi25@xiaomi.com>
 2022-11-29 18:36:15 +08:00
chao an d54a20b393 net/tcp/udp: remove all domain assertion 
fix build break if enable CONFIG_NET_IPv6 only

In file included from tcp/tcp_sendfile.c:38:
tcp/tcp_sendfile.c: In function ‘sendfile_eventhandler’:
tcp/tcp_sendfile.c:173:27: error: ‘struct tcp_conn_s’ has no member named ‘domain’
  173 |           DEBUGASSERT(conn->domain == PF_INET6);
      |                           ^~

Signed-off-by: chao an <anchao@xiaomi.com>
 2022-11-29 17:28:36 +08:00
chao an 3caa551ff4 net: remove psock reference from connect 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-11-24 22:57:42 +08:00
Xiang Xiao 7f380533a3 net/udp: NET_BROADCAST shouldn't configurable if NET_UDP_NO_STACK enable 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-11-22 20:45:26 +09:00
anjiahao d07792a343 Initialize global mutext/sem by NXMUTEX_INITIALIZER and SEM_INITIALIZER 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-11-14 09:34:04 +09:00
zhanghongyu ab15887a0b tcp: find bound device when laddr is ANY 
icmp: find bound device when s_boundto is not zero

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2022-11-12 18:36:09 +08:00
Zhe Weng a3a669a5f6 net/nat: Add UDP support 
Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
 2022-11-11 14:36:55 +08:00
chao an a8d3286258 net: move device buffer define to common header 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-10-28 00:32:16 -04:00
anjiahao 5724c6b2e4 sem:remove sem default protocl 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
 2022-10-22 14:50:48 +08:00
anjiahao d1d46335df Replace nxsem API when used as a lock with nxmutex API 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-10-17 15:59:46 +09:00
Xiang Xiao 40ef5bc6db libc: Move queue.h from include to include/nuttx 
to avoid the conflict with libuv's queue.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-09-26 08:04:58 +02:00
wangbowen6 344c8be049 poll: add poll_notify() api and call it in all drivers 
Signed-off-by: wangbowen6 <wangbowen6@xiaomi.com>
 2022-09-26 12:06:32 +08:00
Xiang Xiao ed85055edb udp: Remove the unnessary check of addr size in udp_readahead 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-09-09 17:21:33 +02:00
Xiang Xiao 7f26b92130 udp: Don't accumulate the receive length in psock_udp_recvfrom 
since udp_recvfrom_newdata is called no more than once

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-09-09 17:21:33 +02:00
zhanghongyu 9bff29d7e7 udp: add IPVx_PKTINFO related support 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2022-09-07 10:49:47 +08:00
Xiang Xiao e0bb281e7a net: Align the prototype of sock_intf_s::si_ioctl with file_operations::ioctl 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-09-06 22:46:37 +08:00
chao.an 162fcd10ca net: cleanup pvconn reference to avoid confuse 
More reference:
https://github.com/apache/incubator-nuttx/pull/5252
https://github.com/apache/incubator-nuttx/pull/5434

Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-08-26 20:58:11 +08:00
chao.an 9cb17841d8 net/sockopt: move BINDTODEVICE to socket level 
rename the UDP_BINDTODEVICE to SO_BINDTODEVICE to follow the linux
style to be compatible with non-UDP protocol binding requirements

Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-08-25 17:56:52 +08:00
Xiang Xiao ba9486de4a iob: Remove iob_user_e enum and related code 
since it is impossible to track producer and consumer
correctly if TCP/IP stack pass IOB directly to netdev

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-08-15 08:41:20 +03:00
zhanghongyu fc35cf4737 udp: Use s_sndtimeo as the actual timeout time 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2022-07-26 12:06:14 +03:00
chao.an 8ae8c10954 net/poll: fix race condition if connect free before poll teardown 
Net poll teardown is not protected by net lock, if the conn is released
before teardown, the assertion failure will be triggered during free dev
callback, this patch will add the net lock around net poll teardown to
fix race condition

nuttx/libs/libc/assert/lib_assert.c:36
nuttx/net/devif/devif_callback.c:85
nuttx/net/tcp/tcp_netpoll.c:405
nuttx/fs/vfs/fs_poll.c:244
nuttx/fs/vfs/fs_poll.c:500

Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-07-09 19:11:42 +08:00
Xiang Xiao 9072eecc30 sched/wqueue: Change the return type of work_notifier_teardown to void 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-05-14 00:35:29 +03:00
Michael Jung 61f3bd10a5 Fix udp recvfrom to correctly return addrlen 
According to POSIX the length of the source address of the received
message shall be stored in the object pointed to by the address_len
argument.

This patch fixes two places where this did not happen correctly.

Signed-off-by: Michael Jung <michael.jung@secore.ly>
 2022-04-28 20:25:38 +08:00
zhanghongyu c50d7e174f net: tcp/udp/icmp/icmpv6 add FIONSPACE support 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
 2022-04-02 13:39:38 +08:00
chao.an c2ba11d971 net/udp: clear the connection structure after free 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-03-16 13:46:02 +08:00
Xiang Xiao 7598070508 net: Remove the unnecessary initialization code 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-03-12 19:24:17 +02:00
chao.an eac13a113d net/udp: remove psock hook to avoid invalid reference 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-02-10 15:04:33 -03:00
chao.an 9317626c32 net/inet: move socket linger into socket_conn_s 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-02-10 15:04:33 -03:00
chao.an 3fce144aeb net/inet: move recv/send timeout into socket_conn_s 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-02-10 15:04:33 -03:00
chao.an cc6add58dc net/inet: move socket options into socket_conn_s 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-02-10 15:04:33 -03:00