Remove the code for rte_kni.ko, only retain virtio.

Author: jfb8856606

config.ini

@@ -251,9 +251,7 @@ rss_tbl=0 192.168.1.1 192.168.2.1 80;0 192.168.1.1 192.168.2.1 443
 # all packets that do not belong to the following tcp_port and udp_port
 # will transmit to kernel; if method=accept, all packets that belong to
 # the following tcp_port and udp_port will transmit to kernel.
-#	type: exception path type, 0 means kni(must set meson -Ddisable_libs=flow_classif to re-enable kni in DPDK first), 1 means virtio_user(linux only)
 #[kni]
-#type=1
 #enable=1
 #method=reject
 # The format is same as port_list

lib/Makefile

@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (c) 2013 Patrick Kelsey. All rights reserved.
 # Copyright (C) 2017-2021 THL A29 Limited, a Tencent company.
 # All rights reserved.
@@ -31,9 +31,9 @@ HOST_OS:=$(shell uname -s)
 #DEBUG=-O0 -gdwarf-2 -g3 -Wno-format-truncation
 
 # No DPDK KNI support on FreeBSD
+# Enable KNI, via viritio only, no longer support rte_kni.ko.
 ifneq ($(TGT_OS),FreeBSD)
 FF_KNI=1
-#FF_KNI_KNI=1
 endif
 
 #FF_FLOW_ISOLATE=1
@@ -79,17 +79,13 @@ endif
 ifndef DEBUG
 HOST_CFLAGS = -O2 -frename-registers  -funswitch-loops -fweb -Wno-format-truncation
 else
-HOST_CFLAGS = ${DEBUG} 
+HOST_CFLAGS = ${DEBUG}
 endif
 
 ifdef FF_KNI
 HOST_CFLAGS+= -DFF_KNI
 endif
 
-ifdef FF_KNI_KNI
-HOST_CFLAGS+= -DFF_KNI_KNI
-endif
-
 HOST_CFLAGS+= ${DPDK_CFLAGS}
 HOST_CFLAGS+= ${CONF_CFLAGS}
 
@@ -124,7 +120,7 @@ CFLAGS+= -DINET
 GCCVERGE10 = $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 10)
 ifeq "$(GCCVERGE10)" "1"
     CFLAGS+= -Wno-error=stringop-overflow
-endif 
+endif
 
 GCCVERGE11 = $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 11)
 ifeq "$(GCCVERGE11)" "1"
@@ -288,7 +284,7 @@ FF_HOST_SRCS+=              \
 	ff_dpdk_pcap.c      \
 	ff_epoll.c          \
 	ff_log.c            \
-	ff_init.c	
+	ff_init.c
 
 ifdef FF_KNI
 FF_HOST_SRCS+=              \
@@ -578,7 +574,7 @@ EXTRA_TCP_STACKS_SRCS+=		\
 	bbr.c
 endif
 
- 
+
 ifneq ($(TGT_OS),FreeBSD)
 ifndef FF_KNI
 FF_HOST_SRCS+=         \
@@ -677,7 +673,7 @@ all: libfstack.a
 libfstack.a: machine_includes ff_api.symlist ${MHEADERS} ${MSRCS} ${HOST_OBJS} ${ASM_OBJS} ${OBJS}
 	${LD} -d -r -o $*.ro ${ASM_OBJS} ${OBJS}
 	nm $*.ro  | grep -v ' U ' | cut -d ' ' -f 3 > $*_localize_list.tmp
-	objcopy --localize-symbols=$*_localize_list.tmp $*.ro 
+	objcopy --localize-symbols=$*_localize_list.tmp $*.ro
 	rm $*_localize_list.tmp
 	objcopy --globalize-symbols=ff_api.symlist $*.ro
 	rm -f $@

lib/ff_config.c

@@ -988,8 +988,6 @@ ini_parse_handler(void* user, const char* section, const char* name,
         pconfig->dpdk.symmetric_rss = atoi(value);
     } else if (MATCH("kni", "enable")) {
         pconfig->kni.enable= atoi(value);
-    } else if (MATCH("kni", "type")) {
-        pconfig->kni.type= atoi(value);
     } else if (MATCH("kni", "console_packets_ratelimit")) {
         pconfig->kni.console_packets_ratelimit= atoi(value);
     } else if (MATCH("kni", "general_packets_ratelimit")) {
@@ -1311,12 +1309,6 @@ ff_check_config(struct ff_config *cfg)
                          lcore_id, pc->port_id);
                 return -1;
             }
-
-            if (cfg->kni.type != KNI_TYPE_KNI && cfg->kni.type != KNI_TYPE_VIRTIO) {
-                fprintf(stderr,
-                         "kni type value must be 0 or 1, now is:%d\n", cfg->kni.type);
-                return -1;
-            }
         }
     }
 

lib/ff_config.h

@@ -57,10 +57,6 @@ extern char *dpdk_argv[DPDK_CONFIG_NUM + 1];
 
 #define VIP_MAX_NUM 64
 
-/* exception path(KNI) type */
-#define KNI_TYPE_KNI        0
-#define KNI_TYPE_VIRTIO     1
-
 /* ff_rss_check table args */
 /* remote IP:PORT */
 #define FF_RSS_TBL_MAX_SADDR        (4)
@@ -313,7 +309,6 @@ struct ff_config {
 
     struct {
         int enable;
-        int type;
         int console_packets_ratelimit;
         int general_packets_ratelimit;
         int kernel_packets_ratelimit;

lib/ff_dpdk_if.c

@@ -545,7 +545,7 @@ init_kni(void)
 
     knictl_action = get_kni_action(ff_global_cfg.kni.kni_action);
 
-    ff_kni_init(nb_ports, ff_global_cfg.kni.type, ff_global_cfg.kni.tcp_port,
+    ff_kni_init(nb_ports, ff_global_cfg.kni.tcp_port,
         ff_global_cfg.kni.udp_port);
 
     unsigned socket_id = lcore_conf.socket_id;
@@ -555,7 +555,7 @@ init_kni(void)
     int i, ret;
     for (i = 0; i < nb_ports; i++) {
         uint16_t port_id = ff_global_cfg.dpdk.portid_list[i];
-        ff_kni_alloc(port_id, socket_id, ff_global_cfg.kni.type, i, mbuf_pool, KNI_QUEUE_SIZE);
+        ff_kni_alloc(port_id, socket_id, i, KNI_QUEUE_SIZE);
     }
 
     return 0;
@@ -601,12 +601,7 @@ init_port_start(void)
     total_nb_ports = nb_ports;
 #ifdef FF_KNI
     if (enable_kni && rte_eal_process_type() == RTE_PROC_PRIMARY) {
-#ifdef FF_KNI_KNI
-        if (ff_global_cfg.kni.type == KNI_TYPE_VIRTIO)
-#endif
-        {
             total_nb_ports *= 2;  /* one more virtio_user port for kernel per port */
-        }
     }
 #endif