support dpdk-17.05.2 and faster ip stack

bluenet13 · bluenet13 · commit 6d7169061a15 · 2017-10-05T09:15:27.000+08:00
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ ANS(accelerated network stack) is porting from [FreeBSD](http://freebsd.org) TCP
 - test: Example application with ANS for testing ANS tcp/ip stack
 
 Support environment
-  - EAL is based on dpdk-17.02.1;
+  - EAL is based on dpdk-17.05.2;
   - Development enviroment is based on x86_64-native-linuxapp-gcc;
   - linux version：
 4.4.0-45-generic (Ubuntu 16.04.1 LTS).
diff --git a/ans/ans_kni.c b/ans/ans_kni.c
@@ -145,7 +145,7 @@ int ans_kni_sendpkt_burst(struct rte_mbuf ** mbufs, unsigned nb_mbufs, unsigned
     if(unlikely(ring == NULL))
         return -ENOENT;
 
-    return rte_ring_enqueue_bulk(ring,(void **)mbufs,nb_mbufs);
+    return rte_ring_enqueue_bulk(ring,(void **)mbufs, nb_mbufs, NULL);
 }
 
 int ans_kni_init()
@@ -322,7 +322,7 @@ static void kni_ring_to_kni(struct kni_port_params *p)
     port_id = p->port_id;
 
     /* Burst rx from ring */
-    nb_rx = rte_ring_dequeue_burst(p->ring,(void **)&pkts_burst, PKT_BURST_SZ);
+    nb_rx = rte_ring_dequeue_burst(p->ring,(void **)&pkts_burst, PKT_BURST_SZ, NULL);
 
     if (unlikely(nb_rx > PKT_BURST_SZ))
     {
diff --git a/ans/ans_main.c b/ans/ans_main.c
@@ -78,7 +78,6 @@
 #include <rte_spinlock.h>
 
 #include "ans_init.h"
-#include "ans_enet_intf.h"
 #include "ans_ip_intf.h"
 
 /* add by ans_team -- end */
@@ -464,7 +463,7 @@ static int ans_init_ports(unsigned short nb_ports, struct ans_user_config  *user
             /* user default tx conf */
 
             /* txconf = &ans_tx_conf; */
-            txconf->txq_flags = 0;
+            txconf->txq_flags = 0;  /* enable NIC all TX offload */
 
             printf("\t lcore id:%u, tx queue id:%d, socket id:%d \n", lcore_id, queueid, socketid);
             printf("\t Conf-- tx pthresh:%d, tx hthresh:%d, tx wthresh:%d, txq_flags:0x%x \n", txconf->tx_thresh.pthresh,
@@ -746,7 +745,7 @@ static int ans_main_loop(__attribute__((unused)) void *dummy)
         cur_tsc = rte_rdtsc();
 
         /* add by ans_team ---start */
-        ans_message_handle(lcore_id, cur_tsc);
+        ans_message_handle(lcore_id);
         /* add by ans_team ---end */
 
 
@@ -970,28 +969,31 @@ int main(int argc, char **argv)
         printf("add %s device\r\n", ifname);
         rte_eth_macaddr_get(portid, &eth_addr);
 
-        ans_intf_add(portid,  ifname, &eth_addr);
+        ans_iface_add(portid,  ifname, &eth_addr);
 
-        int ip_addr = 0x0200000a;
+        /* host byte order */
+        int ip_addr = 0x0a000002;
         ip_addr += portid << 16;
 
         printf("add IP %x on device %s \n", ip_addr, ifname);
-        ans_intf_add_ipaddr((caddr_t)ifname, ip_addr, 0x00ffffff);
+        ans_add_ipaddr((char *)ifname, ip_addr, 24);
     }
+
+    printf("show all IPs: \n");
+    ans_show_ipaddr();
+    printf("\n");
+    
     /* add by ans_team ---end */
 
     /* add by ans_team for testing ---start */
-
-    printf("Show interface \n");
-    ans_intf_show();
-
+    
     int route_ret = 0;
     printf("add static route \r\n");
 
-    route_ret = ans_add_route(0x00000a0a, 1, 0x0500000a, 0x00ffffff, ANS_IP_RTF_GATEWAY);
-
-    ans_route_show_all();
+    /* host byte order */
+    route_ret = ans_add_route(0x0a0a0000, 24, 0x0a000005);
 
+    ans_show_route();
     printf("\n");
     /* add by ans_team ---end */
 
diff --git a/cli/Makefile b/cli/Makefile
@@ -42,17 +42,20 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
-ODP_PATH = $(RTE_ANS)
 
 # binary name
 APP = anscli
 
+
+
 # all source are stored in SRCS-y
-SRCS-y := anscli_main.c anscli_conf.c anscli_ring.c
+SRCS-y := anscli_main.c 
 
 CFLAGS += -O3
 #CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(ODP_PATH)/librte_ans/include
-CFLAGS += -I$(ODP_PATH)/shared
+CFLAGS += -I$(RTE_ANS)/librte_anscli/include
+
+LDLIBS += $(RTE_ANS)/librte_anscli/librte_anscli.a 
+
 
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/cli/anscli_main.c b/cli/anscli_main.c
@@ -48,15 +48,6 @@
   #endif
 #endif
 
-#include <cmdline_rdline.h>
-#include <cmdline_parse.h>
-#include <cmdline_parse_ipaddr.h>
-#include <cmdline_parse_num.h>
-#include <cmdline_parse_string.h>
-#include <cmdline.h>
-#include <cmdline_socket.h>
-
-
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_tailq.h>
@@ -65,14 +56,12 @@
 #include <rte_log.h>
 
 #include "anscli_main.h"
-#include "anscli_conf.h"
-#include "anscli_ring.h"
+#include "anscli_intf.h"
 
 
 int main(void)
 {
     int ret;
-    struct cmdline *cl;
     int     param_num = 8;
     char *param[] = {"anscli",
                                "-c",
@@ -85,22 +74,12 @@ int main(void)
                                NULL};
 
 
-    rte_set_log_level(RTE_LOG_ERR);
+    rte_log_set_global_level(RTE_LOG_ERR);
     ret = rte_eal_init(param_num, param);
     if (ret < 0)
         rte_panic("Cannot init EAL\n");
 
-    ret = anscli_ring_init();
-    if(ret != 0)
-        rte_panic("Cannot init ring\n");
-
-
-    cl = cmdline_stdin_new(ip_main_ctx, "ans> ");
-    if (cl == NULL)
-    rte_panic("Cannot create ans cmdline instance\n");
-
-    cmdline_interact(cl);
-    cmdline_stdin_exit(cl);
-
+    anscli_start();
+    
     return 0;
 }
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
@@ -40,8 +40,10 @@ There are many libraries, so their headers may be grouped by topics:
   [init]               (@ref ans_init.h)
 
 - **layers**:
-  [ethernet]           (@ref ans_enet_intf.h),
   [IP]                 (@ref ans_ip_intf.h)
 
 - **socket**:
   [anssock]            (@ref anssock_intf.h)
+
+- **cli**:
+  [anscli]            (@ref anscli_intf.h)
diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf
@@ -34,7 +34,8 @@ PROJECT_NAME            = ANS
 INPUT                   = doc/api/doxy-api-index.md \
                           librte_ans/include \
                           librte_anssock/include \
-
+													librte_anscli/include \
+													
 FILE_PATTERNS           = ans*.h \
                           cmdline.h
 PREDEFINED              = __DOXYGEN__ \
diff --git a/examples/http_server/Makefile b/examples/http_server/Makefile
@@ -50,7 +50,7 @@ CFLAGS += -O3 \
 
 LDLIBS += $(RTE_ANS)/librte_anssock/librte_anssock.a \
           -L$(RTE_SDK)/$(RTE_TARGET)/lib \
-          -Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic \
+          -Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool_ring -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic \
           -lrt -pthread -ldl
 
 OBJS = http_server.o 
diff --git a/examples/https_server/Makefile b/examples/https_server/Makefile
@@ -50,7 +50,7 @@ CFLAGS += -O3 -DLOAD_CERTIFICATE\
 
 LDLIBS += $(RTE_ANS)/librte_anssock/librte_anssock.a \
           -L$(RTE_SDK)/$(RTE_TARGET)/lib \
-          -Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic \
+          -Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool_ring -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic \
           -lrt -pthread -ldl \
           -lnsl -lresolv -rdynamic -lssl -lcrypto
          
diff --git a/examples/https_server/ans_module.c b/examples/https_server/ans_module.c
@@ -65,7 +65,6 @@
 #define __USE_GNU
 
 #include <unistd.h>
-#include <sched.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/syscall.h>
@@ -131,7 +130,7 @@ void ans_mod_init()
         real_##func = dlsym(RTLD_NEXT, #func); \
         assert(real_##func)
 
-	INIT_FUNCTION(socket);
+    INIT_FUNCTION(socket);
     INIT_FUNCTION(bind);
     INIT_FUNCTION(connect);
     INIT_FUNCTION(close);
@@ -385,7 +384,7 @@ ssize_t read(int fd, void *buf, size_t count)
     else
     {
         rc =real_read(fd, buf, count);
-        ANS_FD_DEBUG("linux fd %d read data len %ld  \n", fd, rc);
+   //     ANS_FD_DEBUG("linux fd %d read data len %ld  \n", fd, rc);
 
         return rc;
     }
@@ -793,7 +792,7 @@ ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
         fd -= ANS_FD_BASE;
 
         ANS_FD_DEBUG("ans fd %d readv with iovcnt %d \n", fd, iovcnt);
-				rc =anssock_readv(fd, iov, iovcnt);
+        rc =anssock_readv(fd, iov, iovcnt);
         return rc;
     } 
     else
diff --git a/install_deps.sh b/install_deps.sh
@@ -4,7 +4,7 @@ set -e
 
 if test -e ans 
 then
-    echo "Start to generate librte_ans.a/librte_anssock.a for -mnative."
+    echo "Start to generate librte_ans.a/librte_anssock.a/librte_anscli.a for -mnative."
 else
     echo "You must run this script in the top-level dpdk-ans directory"
     exit 1
@@ -28,8 +28,12 @@ if [ $NATIVE_MATCH = "core2" ] ; then
     cd $RTE_ANS/librte_anssock/
     rm -f librte_anssock.a
     ln -s librte_anssock_core2.a librte_anssock.a
-    
-    echo "Generate librte_ans.a/librte_anssock.a for core2 successfully."
+ 
+    cd $RTE_ANS/librte_anscli/
+    rm -f librte_anscli.a
+    ln -s librte_anscli_core2.a librte_anscli.a
+       
+    echo "Generate librte_ans.a/librte_anssock.a/librte_anscli.a for core2 successfully."
 
 elif [ $NATIVE_MATCH = "westmere" ] ; then
 
@@ -40,8 +44,12 @@ elif [ $NATIVE_MATCH = "westmere" ] ; then
     cd $RTE_ANS/librte_anssock/
     rm -f librte_anssock.a
     ln -s librte_anssock_westmere.a librte_anssock.a
-    
-    echo "Generate librte_ans.a/librte_anssock.a for westmere successfully."
+
+    cd $RTE_ANS/librte_anscli/
+    rm -f librte_anscli.a
+    ln -s librte_anscli_westmere.a librte_anscli.a
+        
+    echo "Generate librte_ans.a/librte_anssock.a/librte_anscli.a for westmere successfully."
     
 elif [ $NATIVE_MATCH = "sandybridge" ] ; then   
 
@@ -53,7 +61,11 @@ elif [ $NATIVE_MATCH = "sandybridge" ] ; then
     rm -f librte_anssock.a
     ln -s librte_anssock_sandybridge.a librte_anssock.a
 
-    echo "Generate librte_ans.a/librte_anssock.a for sandybridge successfully."
+    cd $RTE_ANS/librte_anscli/
+    rm -f librte_anscli.a
+    ln -s librte_anscli_sandybridge.a librte_anscli.a
+    
+    echo "Generate librte_ans.a/librte_anssock.a/librte_anscli.a for sandybridge successfully."
 
 elif [ $NATIVE_MATCH = "ivybridge" ] ; then 
 
@@ -64,8 +76,12 @@ elif [ $NATIVE_MATCH = "ivybridge" ] ; then
     cd $RTE_ANS/librte_anssock/
     rm -f librte_anssock.a
     ln -s librte_anssock_ivybridge.a librte_anssock.a
- 
-    echo "Generate librte_ans.a/librte_anssock.a for ivybridge successfully."
+
+    cd $RTE_ANS/librte_anscli/
+    rm -f librte_anscli.a
+    ln -s librte_anscli_ivybridge.a librte_anscli.a
+     
+    echo "Generate librte_ans.a/librte_anssock.a/librte_anscli.a for ivybridge successfully."
 
 elif [ $NATIVE_MATCH = "haswell" ] ; then   
 
@@ -77,7 +93,11 @@ elif [ $NATIVE_MATCH = "haswell" ] ; then
     rm -f librte_anssock.a
     ln -s librte_anssock_haswell.a librte_anssock.a
 
-    echo "Generate librte_ans.a/librte_anssock.a for haswell successfully."
+    cd $RTE_ANS/librte_anscli/
+    rm -f librte_anscli.a
+    ln -s librte_anscli_haswell.a librte_anscli.a
+
+    echo "Generate librte_ans.a/librte_anssock.a/librte_anscli.a for haswell successfully."
 
 elif [ $NATIVE_MATCH = "broadwell" ] ; then   
 
@@ -89,7 +109,11 @@ elif [ $NATIVE_MATCH = "broadwell" ] ; then
     rm -f librte_anssock.a
     ln -s librte_anssock_broadwell.a librte_anssock.a
   
-    echo "Generate librte_ans.a/librte_anssock.a for broadwell successfully."
+    cd $RTE_ANS/librte_anscli/
+    rm -f librte_anscli.a
+    ln -s librte_anscli_broadwell.a librte_anscli.a
+    
+    echo "Generate librte_ans.a/librte_anssock.a/librte_anscli.a for broadwell successfully."
 
 else 
 
diff --git a/librte_ans/include/ans_errno.h b/librte_ans/include/ans_errno.h
@@ -383,6 +383,11 @@
 
 #define  ANS_EIPFRAG          2000
 
+#define  ANS_EGATEWAY         3000    /* Invalid gateway */
+#define  ANS_EROUTE             3001    /* Add route failed */
+#define  ANS_EADDRESS         3002    /* Add ip address failed */
+#define  ANS_ENEIGHBOR       3003    /* Add neighbor route failed */
+
 
 #define ANS_ERRMEM        ANS_ENOMEM   /* Out of memory error.     */
 #define ANS_ERRBUF        ANS_ENOBUFS    /* Buffer error.            */
diff --git a/librte_ans/include/ans_init.h b/librte_ans/include/ans_init.h
@@ -52,7 +52,6 @@ struct ans_init_config
 {
     uint64_t lcore_mask;                                                                   /**< lcore which used to run ans */
     uint32_t max_sock_conn;                                                            /**< support max sock connection */
-    uint8_t   hw_rss;                                                                          /**< If HW RSS enable */
     cpu_set_t cpu_set;                                                                       /**< system default cpu set */
     struct rte_mempool *pktmbuf_pool[ANS_MAX_NB_SOCKETS];     /**< mbuf pools for each sockets */
 } __rte_cache_aligned;
@@ -99,13 +98,11 @@ int ans_register(ans_send_packet_cb send_cb);
  *
  * @param lcore_id
  *   current lcore id.
- * @param cur_tsc   
- *   current tsc.
  *
  * @return  
  *
  */
-void ans_message_handle(unsigned lcore_id, uint64_t cur_tsc);
+void ans_message_handle(unsigned lcore_id);
 
 
 #endif /* __ANS_INIT_H__ */
diff --git a/librte_ans/include/ans_ip_intf.h b/librte_ans/include/ans_ip_intf.h
diff --git a/librte_ans/librte_ans_broadwell.a b/librte_ans/librte_ans_broadwell.a
diff --git a/librte_ans/librte_ans_core2.a b/librte_ans/librte_ans_core2.a
diff --git a/librte_ans/librte_ans_haswell.a b/librte_ans/librte_ans_haswell.a

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ int ans_kni_sendpkt_burst(struct rte_mbuf ** mbufs, unsigned nb_mbufs, unsigned`
`145`	`145`	`if(unlikely(ring == NULL))`
`146`	`146`	`return -ENOENT;`
`147`	`147`
`148`		`- return rte_ring_enqueue_bulk(ring,(void **)mbufs,nb_mbufs);`
	`148`	`+ return rte_ring_enqueue_bulk(ring,(void **)mbufs, nb_mbufs, NULL);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`int ans_kni_init()`
`@@ -322,7 +322,7 @@ static void kni_ring_to_kni(struct kni_port_params *p)`
`322`	`322`	`port_id = p->port_id;`
`323`	`323`
`324`	`324`	`/* Burst rx from ring */`
`325`		`- nb_rx = rte_ring_dequeue_burst(p->ring,(void **)&pkts_burst, PKT_BURST_SZ);`
	`325`	`+ nb_rx = rte_ring_dequeue_burst(p->ring,(void **)&pkts_burst, PKT_BURST_SZ, NULL);`
`326`	`326`
`327`	`327`	`if (unlikely(nb_rx > PKT_BURST_SZ))`
`328`	`328`	`{`