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

93 Commits

Author SHA1 Message Date
chao an e6b37f2b2d mm/iob: revert "modify iob to support header padding and alignment features" 
we don't need to implement l2 isolation through io_head, iob offload will use io_offset

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

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

Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-21 01:43:02 +08:00
chao an 6e380c0978 mm/iob: add a helper function to get iob count in chain 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-21 01:40:24 +08:00
chao an 4f239e145e Revert "mm/iob/contig: enhance iob contig to support iob chain" 
This reverts commit 56a4e90dc4.
 2022-12-19 01:32:05 +08:00
chao an 56a4e90dc4 mm/iob/contig: enhance iob contig to support iob chain 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-18 21:15:47 +08:00
chao an 881c9d9fac mm/iob: add support of partial bytes clone 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-14 21:37:20 +08:00
chao an d6d56c3372 mm/iob: add support of nonblock iob_clone 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-14 21:37:20 +08:00
chao an e2b00a9fcc mm/iob: reserved bytes should be updated after each iteration 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-12-07 21:24:25 +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
chao an cdaa2ba8d4 mm/iob: new function iob_update_pktlen() to update packet length of the iob 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-11-29 13:16:23 +08:00
chao an b452e2fddf mm/iob: new function iob_reserve() to adjust headroom offset 
Signed-off-by: chao an <anchao@xiaomi.com>
 2022-11-29 13:16:23 +08:00
yinshengkai 85f727f232 tools: replace INCDIR to Makefile variable 
In the past, header file paths were generated by the incdir command
Now they are generated by concatenating environment variables

In this way, when executing makefile, no shell command will be executed,
it will improve the speed of executing makfile
Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
 2022-11-03 19:59:55 +08:00
yinshengkai 95d9abcf58 tools: replace DEFINE script to Makefile variable 
In the past, predefined macros were generated by define.sh scripts
Now they are generated by concatenating environment variables

In this way, when executing makefile, no shell command will be executed,
it will improve the speed of executing makfile

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
 2022-11-03 19:59:55 +08:00
anjiahao e1ca516488 use SEM_INITIALIZER inside of NXSEM_INITIALIZER 
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 130b196876 Refine how to specify iob and ramlog data section 
1.Remove the default value(.bss)
2.Remove !ARCH_SIM dependence

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-08-25 14:05:17 +02: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
luojun1 bee9dcc73a Add Kconfig option, user can specify the location of g_iob_buffer 
Signed-off-by: luojun1 <luojun1@xiaomi.com>
 2022-08-14 21:00:28 +08:00
luojun1 4e62772be5 modify iob to support header padding and alignment features 
Signed-off-by: luojun1 <luojun1@xiaomi.com>
 2022-08-14 21:00:28 +08:00
Xiang Xiao c26bb35843 Remove the private NULL, TRUE and FALSE macros 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-07-31 22:12:57 +03:00
Xiang Xiao 1fb8c13e5e Replace nxsem_timedwait_uninterruptible with nxsem_tickwait_uninterruptible 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-05-15 13:55:58 +03: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
Xiang Xiao d9a442a859 mm/iob: Remove initialized static variable inside iob_initialize 
since it's impossible to call iob_initialize twice

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2022-03-12 15:06:39 -03:00
chao.an 0b18cfbd9a mm/iob: add support of alloc with timeout iob_timedalloc() 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2022-02-17 11:55:29 -03:00
Chery Dan 8d799f2148 Fix IOB functions 
The operations of struct iob_queue_s in qh_head & qh_tail are performed with interrupts disabled.

change iflags to flags

add header file ref
update for check
 2021-11-11 08:47:03 -06:00
YAMAMOTO Takashi 5b1f2dff5f iob_tryalloc: Fix throttled allocation 
If threads are blocking for throttled allocation,
g_throttle_sem.semcount doesn't represent the number of
usable IOBs well.

Note: For non-throttled allocations, the g_iob_committed mechanism
is a rescue. But there is no equivalent for throttled allocations.
 2021-08-02 11:25:55 -07:00
YAMAMOTO Takashi e96a870485 iob_tryalloc: Remove a wrong assertion 2021-08-02 11:25:55 -07:00
YAMAMOTO Takashi 7a580ae3bc iob_trimhead: fix an integer truncation 
I guess this fixes https://github.com/apache/incubator-nuttx/issues/4181
 2021-07-20 14:20:29 +08:00
chao.an ebf89ff63b mm/iob: add iob_get_queue_size() helper 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2021-07-05 06:20:52 -05:00
YAMAMOTO Takashi 314237588e Add iob_tailroom 
I plan to use this for tcp.
 2021-06-30 06:40:13 -05:00
YAMAMOTO Takashi 7599ca4e95 Kconfig: mention that IOB_NCHAINS is not used by TCP anymore 2021-06-30 06:40:13 -05:00
chao.an 2c51c29768 mm/iob: add an interface to support dequeue an iob from the queue 
Signed-off-by: chao.an <anchao@xiaomi.com>
 2021-06-10 10:45:30 -05:00
Xiang Xiao 2e54df0f35 Don't include assert.h from public header file 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2021-06-03 08:36:03 -07:00
Alin Jerpelea 3744eb8b5f mm: update licenses to Apache 
Gregory Nutt is the copyright holder for those files and he has submitted the
SGA as a result we can migrate the licenses to Apache.

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
 2021-05-27 08:07:25 +09:00
YAMAMOTO Takashi f8d56b9da2 iob_trimhead.c: Fix a comment typo 2021-03-16 02:07:34 -07:00
YAMAMOTO Takashi 6b9d2fef00 mm/iob/Kconfig: Fix a typo (other other -> other) 2021-03-16 02:07:34 -07:00
Gustavo Henrique Nihei 330eff36d7 sourcefiles: Fix relative path in file header 2021-03-09 23:18:28 +08:00
Alin Jerpelea acb8ad4c7b mm: nxstyle fixes 
Nxstyle fixes to pass CI

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
 2021-02-09 01:21:53 -08:00
Alin Jerpelea bcee9c391c mm: Author Gregory Nutt: update licenses to Apache 
Gregory Nutt has submitted the SGA and we can mograte the licenses
to Apache.

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
 2021-02-09 01:21:53 -08:00
Xiang Xiao 5eae32577e build: Move INCDIROPT to common place 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2020-05-18 15:02:55 -06:00
Gregory Nutt a569006fd8 sched/: Make more naming consistent 
Rename various functions per the quidelines of https://cwiki.apache.org/confluence/display/NUTTX/Naming+of+OS+Internal+Functions

    nxsem_setprotocol -> nxsem_set_protocol
    nxsem_getprotocol -> nxsem_get_protocol
    nxsem_getvalue -> nxsem_get_value
 2020-05-17 14:01:00 -03:00
Xiang Xiao d9d2fc0d0a debug: Reduce CONFIG_CPP_HAVE_VARARGS usage 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2020-05-05 08:27:58 -06:00
Gregory Nutt fd38623aac mm/iob/iob_clone.c: Correct newline character 
Another place where /n is used where \n was intended.
 2020-04-29 18:11:00 +01:00
Gregory Nutt 5c0e8e88b1 Revert "Makefile: move INCDIROPT to common place (#625)" 
This reverts commit b9ace36fcc.

This change was added by PR 625 but has a serious logic flaw.  It removes all occurrences of INCDIROPT and replaces it with a definition in tools/Config.mk:

    else ifeq ($(WINTOOL),y)
      DEFINE = "$(TOPDIR)/tools/define.sh"
      INCDIR = "$(TOPDIR)/tools/incdir.sh" -w

This logic flaw is the Config.mk is included in all Make.defs files BEFORE WINTOOL is defined.  As a result, the definition is wrong in many places when building under Cygwin with a Windows native toolchain.
 2020-03-26 08:50:29 -07:00
Xiang Xiao b9ace36fcc
Makefile: move INCDIROPT to common place (#625) 2020-03-26 08:09:59 -06:00
Nathan Hartman a5e643b0cd Fix typos in comments and documentation. 2020-03-16 20:01:11 -06:00
Xiang Xiao cde88cabcc Run codespell -w with the latest dictonary again 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
 2020-02-23 22:27:46 +01:00
Gregory Nutt 1382ea5447 mm/: Coding style clean-up 
Run tools/nxstyle against all C files under mm/ and correct coding standard violations.
 2020-02-13 15:16:53 +01:00
Xiang Xiao 5c80b94820 Replace #include <semaphore.h> to #include <nuttx/semaphore.h> 
Since the kernel side should call nxsem_xxx instead and remove the unused inclusion
 2020-02-01 08:27:30 -06:00
Xiang Xiao 80277d1630
Refine the preprocessor conditional guard style (#190) 2020-01-31 19:07:39 +01:00
chao.an a4aa8ae491 wqueue/notifier: update the work notifier usage 
usage changed after commit 90c52e6f8f

Change-Id: Ifb0d739b046a6794b5b3ac177f489fb9a1c5c799
Signed-off-by: chao.an <anchao@xiaomi.com>
 2020-01-21 14:16:19 +08:00