improve l3 forwarding and alc performance

Author: bluenet13

ans/ans_main.c

@@ -602,7 +602,7 @@ static inline int ans_send_burst(struct ans_lcore_queue *qconf, uint16_t n, uint
     ret = rte_eth_tx_burst(port, queueid, m_table, n);
     if (unlikely(ret < n))
     {
-        ans_packet_stats(port, n - ret);
+        ans_eth_stats(port, n - ret);
 
         do
         {
@@ -624,7 +624,7 @@ static inline int ans_send_burst(struct ans_lcore_queue *qconf, uint16_t n, uint
 *@return values:
 *
 **********************************************************************/
-static inline int ans_send_single_packet(struct rte_mbuf *m, uint8_t port)
+static inline int ans_send_packet(uint8_t port, struct rte_mbuf *m)
 {
     uint32_t lcore_id;
     uint16_t len;
@@ -659,11 +659,21 @@ static inline int ans_send_single_packet(struct rte_mbuf *m, uint8_t port)
 *@return values:
 *
 **********************************************************************/
-static void ans_init_timer()
+static inline int ans_bypass_packet(uint8_t port_id, struct rte_mbuf *m)
 {
-    /* init RTE timer library */
-    rte_timer_subsystem_init();
-    return;
+    int ret = 0;
+
+    if(ans_user_conf.kni_on != 1)
+    {
+        rte_pktmbuf_free(m);
+        return 0 ;
+    }
+
+    ret = ans_kni_send_burst(&m, 1, port_id);
+    if(ret != 0 )
+        rte_pktmbuf_free(m);
+
+    return 0;
 }
 
 /**********************************************************************
@@ -677,20 +687,10 @@ static void ans_init_timer()
 *@return values:
 *
 **********************************************************************/
-static inline void ans_to_linux(unsigned port_id, struct rte_mbuf *m)
+static void ans_init_timer()
 {
-    int ret = 0;
-
-    if(ans_user_conf.kni_on != 1)
-    {
-        rte_pktmbuf_free(m);
-        return;
-    }
-
-    ret = ans_kni_send_burst(&m, 1, port_id);
-    if(ret != 0 )
-        rte_pktmbuf_free(m);
-
+    /* init RTE timer library */
+    rte_timer_subsystem_init();
     return;
 }
 
@@ -707,7 +707,6 @@ static inline void ans_to_linux(unsigned port_id, struct rte_mbuf *m)
 **********************************************************************/
 static int ans_main_loop(__attribute__((unused)) void *dummy)
 {
-    int ret;
     unsigned nb_ports;
     int i, j, nb_rx;
     unsigned lcore_id;
@@ -802,38 +801,8 @@ static int ans_main_loop(__attribute__((unused)) void *dummy)
             if (nb_rx == 0)
                 continue;
 
-            /* Prefetch first packets */
-            for (j = 0; j < PREFETCH_OFFSET && j < nb_rx; j++)
-            {
-                rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[j], void *));
-            }
-
-            /* Prefetch and forward already prefetched packets */
-            for (j = 0; j < (nb_rx - PREFETCH_OFFSET); j++)
-            {
-                rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[j + PREFETCH_OFFSET], void *));
-
-                /* add by ans_team ---start */
-
-                ret = ans_packet_handle(pkts_burst[j], portid);
-                if(ret == ANS_MBUF_CONTINUE)
-                    ans_to_linux(portid, pkts_burst[j]);
-
-                /* add by ans_team ---end */
-            }
-
-            /* Forward remaining prefetched packets */
-            for (; j < nb_rx; j++)
-            {
-
-                /* add by ans_team ---start */
-
-                ret = ans_packet_handle(pkts_burst[j], portid);
-               if(ret == ANS_MBUF_CONTINUE)
-                   ans_to_linux(portid, pkts_burst[j]);
-
-                /* add by ans_team ---end */
-            }
+            ans_eth_rx_burst(portid, pkts_burst, nb_rx);
+          
         }
 
         /* to support KNI, at 2014-12-15 */
@@ -935,20 +904,21 @@ int main(int argc, char **argv)
     printf("\ncore mask: %x, sockets number:%d, lcore number:%d \n", ans_user_conf.lcore_mask, ans_user_conf.socket_nb, ans_user_conf.lcore_nb);
 
     printf("start to init ans \n");
-    init_conf.max_sock_conn = ans_user_conf.lcore_nb * 128 * 1024;
+    init_conf.sock_nb = ans_user_conf.lcore_nb * 128 * 1024;
 
     init_conf.lcore_mask = ans_user_conf.lcore_mask;
     for(i = 0 ; i < MAX_NB_SOCKETS; i++)
     {
         init_conf.pktmbuf_pool[i] = ans_pktmbuf_pool[i];
     }
 
+    init_conf.port_send = ans_send_packet;
+    init_conf.port_bypass = ans_bypass_packet;
+
     ret = ans_initialize(&init_conf);
     if (ret != 0)
     rte_exit(EXIT_FAILURE, "Init ans failed \n");
 
-
-    ans_register(ans_send_single_packet);
     /* add by ans_team ---end */
 
     /* add by ans_team for testing ---start */

librte_ans/include/ans_errno.h

@@ -411,5 +411,7 @@
 #define ANS_FALSE   0
 #define ANS_TRUE    1
 
+#define ANS_PKT_DONE              0
+#define ANS_PKT_CONTINUE       1
 
 #endif

librte_ans/include/ans_init.h

@@ -50,14 +50,18 @@
  */
 struct ans_init_config 
 {
-    uint64_t lcore_mask;                                                                   /**< lcore which used to run ans */
-    uint32_t max_sock_conn;                                                            /**< support max sock connection */
-    cpu_set_t cpu_set;                                                                       /**< system default cpu set */
+    uint64_t lcore_mask;                                                           /**< lcore which used to run ans */
+    uint32_t sock_nb;                                                                /**< support max sock connection number */
+    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;
 
+   int (*port_send)(uint8_t port, struct rte_mbuf *m);                  /** callback for sending one mbuf to port */
+   
+   int (*port_bypass)(uint8_t port, struct rte_mbuf *m);              /** callback for bypassing one mbuf to linux */
+
+
+} __rte_cache_aligned;
 
-typedef int (*ans_send_packet_cb)(struct rte_mbuf *m, uint8_t port);
 
 /**
  * Init ans stack.
@@ -69,31 +73,24 @@ typedef int (*ans_send_packet_cb)(struct rte_mbuf *m, uint8_t port);
  */
 int ans_initialize(struct ans_init_config *user_conf);
 
-/**
- * Register packet send callback to ans stack.
- * @param send_cb     
- *   callback function.
- *
- * @return  0 - SUCCESS, non-zero - FAILURE
- *
- */
-int ans_register(ans_send_packet_cb send_cb);
-
 /**
  * Handle the received packets by ans stack
  *
- * @param m 
- *    packet buffer. 
  * @param portid  
  *    port id.
+ * @param rx_pkts 
+ *    packet buffer array. 
+ * @param nb_pkts  
+ *    packets number.
  *
- * @return  0 - SUCCESS, non-zero - FAILURE
+ * @return  void
  *
  */
- int ans_packet_handle(struct rte_mbuf *m, uint8_t portid);
+void ans_eth_rx_burst(uint8_t portid, struct rte_mbuf **rx_pkts, const uint16_t nb_pkts);
+
 
 /**
- * Handle the received packets by ans stack
+ * Statistics dropped packets by port
  *
  * @param portid  
  *    port id.
@@ -103,7 +100,7 @@ int ans_register(ans_send_packet_cb send_cb);
  * @return  
  *
  */
-void ans_packet_stats(uint8_t portid, uint16_t packets_nb);
+void ans_eth_stats(uint8_t portid, uint16_t packets_nb);
 
 /**
  * Handle ans internal message.

librte_ans/include/ans_ip_intf.h

@@ -71,10 +71,6 @@
  *
  */
 
-/* mbuf handle action */
-#define ANS_MBUF_DONE            0    /**< mbuf is handled by ans */
-#define ANS_MBUF_CONTINUE    1    /**<  mbuf isn't handled by ans */
-
 
 /**
  * Add an interface.