support to sync ip/route from linux kernel

Author: bluenet13

ans/ans_kni.c

@@ -193,7 +193,7 @@ static int ans_kni_alloc(uint8_t port_id)
     return -1;
 
   memset(&conf, 0, sizeof(conf));
-  snprintf(conf.name, RTE_KNI_NAMESIZE,"keth%u", port_id);
+  snprintf(conf.name, RTE_KNI_NAMESIZE, "veth%u", port_id);
   conf.group_id = (uint16_t)port_id;
   conf.mbuf_size = MAX_PACKET_SZ;
 

ans/ans_main.c

@@ -861,7 +861,7 @@ int main(int argc, char **argv)
     /* parse application arguments (after the EAL ones) */
     ret = ans_parse_args(argc, argv, &ans_user_conf);
     if (ret < 0)
-      rte_exit(EXIT_FAILURE, "Invalid ODP parameters\n");
+      rte_exit(EXIT_FAILURE, "Invalid ANS parameters\n");
 
 
     if(ans_user_conf.jumbo_frame_on)
@@ -870,6 +870,11 @@ int main(int argc, char **argv)
         ans_port_conf.rxmode.max_rx_pkt_len = ans_user_conf.max_rx_pkt_len;
     }
 
+    if(ans_user_conf.ipsync_on && !ans_user_conf.kni_on)
+    {
+        rte_exit(EXIT_FAILURE, "ipsync is enable, kni shall be enable too.\n");
+    }
+
     ans_user_conf.lcore_nb = rte_lcore_count();
 
     if (ans_check_lcore_params(&ans_user_conf) < 0)
@@ -912,6 +917,7 @@ int main(int argc, char **argv)
         init_conf.pktmbuf_pool[i] = ans_pktmbuf_pool[i];
     }
 
+    init_conf.ip_sync = ans_user_conf.ipsync_on;
     init_conf.port_send = ans_send_packet;
     init_conf.port_bypass = ans_bypass_packet;
 
@@ -924,6 +930,7 @@ int main(int argc, char **argv)
     /* add by ans_team for testing ---start */
     uint8_t ifname[16];
     int portid;
+    uint16_t kni_id;
     struct ether_addr eth_addr;
 
     for(portid= 0; portid < nb_ports; portid++)
@@ -937,12 +944,13 @@ int main(int argc, char **argv)
 
         memset(ifname, 0, sizeof(ifname));
 
-        sprintf(ifname, "eth%d", portid);
-
-        printf("add %s device\r\n", ifname);
+        sprintf(ifname, "veth%d", portid);
+        kni_id = ans_kni_id_get(portid);
+        
+        printf("add %s device, kni id %d \n", ifname, kni_id);
         rte_eth_macaddr_get(portid, &eth_addr);
-
-        ans_iface_add(portid,  ifname, &eth_addr);
+        
+        ans_iface_add(portid, kni_id, ifname, &eth_addr);
 
         /* host byte order */
         int ip_addr = 0x0a000002;

ans/ans_main.h

@@ -70,10 +70,12 @@
 #define MAX_TX_QUEUE_PER_PORT RTE_MAX_ETHPORTS
 #define MAX_RX_QUEUE_PER_PORT 128
 
-#define CMD_LINE_OPT_CONFIG              "config"
-#define CMD_LINE_OPT_NO_NUMA          "no-numa"
-#define CMD_LINE_OPT_ENABLE_KNI      "enable-kni"
-#define CMD_LINE_OPT_ENABLE_JUMBO "enable-jumbo"
+#define CMD_LINE_OPT_CONFIG               "config"
+#define CMD_LINE_OPT_NO_NUMA            "no-numa"
+#define CMD_LINE_OPT_ENABLE_KNI        "enable-kni"
+#define CMD_LINE_OPT_ENABLE_JUMBO   "enable-jumbo"
+#define CMD_LINE_OPT_ENABLE_IPSYNC  "enable-ipsync"
+
 
 #define MAX_LCORE_PARAMS 512
 
@@ -106,6 +108,7 @@ struct ans_user_config
     uint32_t port_mask;
     uint8_t promiscuous_on;        /*  Ports set in promiscuous mode off by default. */
     uint8_t kni_on;                        /*  kni is disable by default. */
+    uint8_t ipsync_on;                 /*  ipsync is disable by default. sync ip/route from kernel, if ipsync is enable, kni shall also enable */
     uint8_t numa_on ;                  /* NUMA is enabled by default. */
     uint8_t jumbo_frame_on;
     uint16_t max_rx_pkt_len;

ans/ans_param.c

@@ -172,6 +172,7 @@ static void ans_print_usage(const char *prgname)
     "  --config (port,queue,lcore): rx queues configuration\n"
     "  --no-numa: optional, disable numa awareness\n"
     "  --enable-kni: optional, disable kni awareness\n"
+    "  --enable-ipsync: optional, sync ip/route from kernel kni interface\n"
     "  --enable-jumbo: enable jumbo frame"
     " which max packet len is PKTLEN in decimal (64-9600)\n",
     prgname);
@@ -326,6 +327,7 @@ int ans_parse_args(int argc, char **argv, struct ans_user_config *user_conf)
       {CMD_LINE_OPT_CONFIG, 1, 0, 0},
       {CMD_LINE_OPT_NO_NUMA, 0, 0, 0},
       {CMD_LINE_OPT_ENABLE_KNI, 0, 0, 0},
+      {CMD_LINE_OPT_ENABLE_IPSYNC, 0, 0, 0},
       {CMD_LINE_OPT_ENABLE_JUMBO, 0, 0, 0},
       {NULL, 0, 0, 0}
     };
@@ -357,48 +359,54 @@ int ans_parse_args(int argc, char **argv, struct ans_user_config *user_conf)
           /* long options */
           case 0:
             if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_CONFIG, sizeof (CMD_LINE_OPT_CONFIG)))
-               {
-              ret = ans_parse_config(optarg, user_conf);
-              if (ret)
-                            {
-                printf("Invalid config\n");
-                ans_print_usage(prgname);
-                return -1;
-              }
+            {
+                ret = ans_parse_config(optarg, user_conf);
+                if (ret)
+                {
+                    printf("Invalid config\n");
+                    ans_print_usage(prgname);
+                    return -1;
+                }
             }
 
             if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_NUMA, sizeof(CMD_LINE_OPT_NO_NUMA)))
-               {
-              printf("numa is disabled \n");
-              user_conf->numa_on = 0;
+            {
+                printf("numa is disabled \n");
+                user_conf->numa_on = 0;
             }
 
             if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_KNI, sizeof(CMD_LINE_OPT_ENABLE_KNI)))
-               {
-              printf("KNI is enable \n");
-              user_conf->kni_on = 1;
+            {
+                printf("KNI is enable \n");
+                user_conf->kni_on = 1;
             }
 
+            if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_IPSYNC, sizeof(CMD_LINE_OPT_ENABLE_IPSYNC)))
+            {
+                printf("IPSYNC is enable \n");
+                user_conf->ipsync_on = 1;
+            }
+            
             if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_JUMBO, sizeof (CMD_LINE_OPT_ENABLE_JUMBO)))
-               {
-              struct option lenopts = {"max-pkt-len", required_argument, 0, 0};
-
-              printf("jumbo frame is enabled - disabling simple TX path\n");
-                            user_conf->jumbo_frame_on = 1;
-
-              /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */
-                  if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index))
-                           {
-                ret = ans_parse_max_pkt_len(optarg);
-                if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN))
-                                   {
-                  printf("invalid packet length\n");
-                  ans_print_usage(prgname);
-                  return -1;
+            {
+                struct option lenopts = {"max-pkt-len", required_argument, 0, 0};
+
+                printf("jumbo frame is enabled - disabling simple TX path\n");
+                user_conf->jumbo_frame_on = 1;
+
+                /* if no max-pkt-len set, use the default value ETHER_MAX_LEN */
+                if (0 == getopt_long(argc, argvopt, "", &lenopts, &option_index))
+                {
+                    ret = ans_parse_max_pkt_len(optarg);
+                    if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN))
+                    {
+                        printf("invalid packet length\n");
+                        ans_print_usage(prgname);
+                        return -1;
+                    }
+                    user_conf->max_rx_pkt_len = ret;
                 }
-                                    user_conf->max_rx_pkt_len = ret;
-              }
-              printf("set jumbo frame max packet length to %u\n", (unsigned int)user_conf->max_rx_pkt_len);
+                printf("set jumbo frame max packet length to %u\n", (unsigned int)user_conf->max_rx_pkt_len);
             }
             break;
 

cli/anscli_main.c

@@ -59,7 +59,7 @@
 #include "anscli_intf.h"
 
 
-int main(void)
+int main(int argc, char **argv)
 {
     int ret;
     int     param_num = 8;
@@ -73,13 +73,17 @@ int main(void)
                                "--proc-type=secondary",
                                NULL};
 
-
     rte_log_set_global_level(RTE_LOG_ERR);
     ret = rte_eal_init(param_num, param);
     if (ret < 0)
         rte_panic("Cannot init EAL\n");
-
-    anscli_start();
-    
+    if(argc > 1)
+    {
+        anscli_start(argv[1]);
+    }
+    else
+    {
+        anscli_start(NULL);
+    }
     return 0;
 }

librte_ans/include/ans_errno.h

@@ -387,7 +387,8 @@
 #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_EACL                3004        /* Add ACL failed */
+#define  ANS_EACL                3004     /* Add ACL failed */
+#define  ANS_ENETLINK          3005    /* parse netlink message failed */
 
 
 #define ANS_ERRMEM        ANS_ENOMEM   /* Out of memory error.     */

librte_ans/include/ans_init.h

@@ -52,6 +52,7 @@ struct ans_init_config
 {
     uint64_t lcore_mask;                                                           /**< lcore which used to run ans */
     uint32_t sock_nb;                                                                /**< support max sock connection number */
+    uint8_t  ip_sync;                                                                 /**< 1: enable ip/route sync from kernel, otherwise disable sync */    
     cpu_set_t cpu_set;                                                              /**< system default cpu set */
     struct rte_mempool *pktmbuf_pool[ANS_MAX_NB_SOCKETS];     /**< mbuf pools for each sockets */
 

librte_ans/include/ans_ip_intf.h

@@ -77,6 +77,8 @@
  *
  * @param port      
  *   port of the interface 
+ * @param kni_index      
+ *   kni index in kernel 
  * @param if_name   
  *   name of the interface 
  * @param mac_addr  
@@ -85,7 +87,7 @@
  * @return  0 - SUCCESS, non-zero - FAILURE
  *
  */
-int ans_iface_add(uint8_t port, char *if_name, struct ether_addr *mac_addr);
+int ans_iface_add(uint8_t port, uint16_t kni_index, char *if_name, struct ether_addr *mac_addr);
 
 /**
  * Delete an interface.
@@ -130,9 +132,9 @@ int ans_iface_set_mtu(char *if_name, uint16_t mtu);
  * Routing table addition.
  *
  * @param dest_ipaddr  
- *   ip address of the destination for which the route is being added
+ *   ip address of the destination for which the route is being added, host byte order
  * @param gateway_addr 
- *   ip address of gateway
+ *   ip address of gateway, host byte order
  * @param netmask   
  *   netmask to be used with route
  *
@@ -145,7 +147,7 @@ int ans_add_route(uint32_t dest_ipaddr, uint8_t netmask, uint32_t gateway_addr);
  * Routing table deletion.
  *
  * @param dest_ipaddr  
- *   ip address of the destination for which the route is being deleted
+ *   ip address of the destination for which the route is being deleted, host byte order.
  * @param netmask   
  *   netmask to be used with route
  *
@@ -169,7 +171,7 @@ int ans_del_route(uint32_t dest_ipaddr, uint8_t netmask);
  * @param ifname  
  *   interface name
  * @param ip_addr   
- *   IP address
+ *   IP address, host byte order
  * @param netmask
  *   netmask length
  *
@@ -184,7 +186,7 @@ int ans_add_ipaddr(char *ifname, uint32_t ip_addr, uint8_t netmask);
  * @param ifname  
  *   interface name
  * @param ip_addr   
- *   IP address
+ *   IP address, host byte order
  * @param netmask
  *   netmask length
  *