Add the feature fo ff_rss_check table to improve the performance of ff_rss_check().

More info see "rss_check" section in config.ini.

Author: jfb8856606

config.ini

@@ -207,6 +207,29 @@ gateway=192.168.1.1
 #up_delay=10
 #down_delay=50
 
+# ff_rss_check table config section
+# To enable or disable static ff_rss_check table.
+# If enable it, F-Stack will init the table while the APP is starting.
+# Then the APP connect to a sever as client, it will try select a local port from the inited table first.
+#
+# This feature will greatly improve the performance of selecting local port
+# when the F-Stack application actively access remote services as a client and not set keep-alive.
+# If the local port is idle, it only needs to be selected once,
+# and no longer needs to be selected multiple times (the average number of times is about the total number of processes).
+# And the performance of selecting available local ports at a time is also improved compared to ff_rss_check().
+# If get rss local port failed, it will be fallback to ff_rss_check().
+#
+#    enable : 0 means disable, 1 means enable. Default 0.
+#    rss_tbl : Set 4-tuple for ff_rss_check table, Required argumnet.
+#              <porit_id> <daddr(local addr)> <saddr(remote addr)> <sport(remote port)>
+#              Separated by space in one 4-tuple, and separated by semicolon between multi 4-tuples.
+#              The max supported num of 2-tuple with saddr and sport is 4 * 4 = 16.
+#              The max supported num of daddr with one same saddr and sport is 4.
+#              So the max combination num of 4-tuple is 16 * 4 = 64, other config will be ignored.
+[rss_check]
+enable=0
+rss_tbl=0 192.168.1.1 192.168.2.1 80;0 192.168.1.1 192.168.2.1 443
+
 # Kni config: if enabled and method=reject,
 # 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

freebsd/netinet/in_pcb.c

@@ -700,6 +700,17 @@ in_pcb_lport_dest(struct inpcb *inp, struct sockaddr *lsa, u_short *lportp,
 #ifdef INET6
 	struct in6_addr *laddr6 = NULL, *faddr6 = NULL;
 #endif
+#ifdef FSTACK
+	u_short rss_first, rss_last, *rss_portrange;
+	/* 0:not init, 1:init successed, -1:init failed */
+	static int rss_tbl_init = 0;
+	int rss_check_flag = lookupflags & INPLOOKUP_LPORT_RSS_CHECK;
+	int rss_ret, rss_port_idx, rss_match = 0;
+	struct ifaddr *ifa;
+	struct ifnet *ifp;
+
+	lookupflags = lookupflags & (~INPLOOKUP_LPORT_RSS_CHECK);
+#endif
 
 	pcbinfo = inp->inp_pcbinfo;
 
@@ -780,20 +791,81 @@ in_pcb_lport_dest(struct inpcb *inp, struct sockaddr *lsa, u_short *lportp,
 	tmpinp = NULL;
 	lport = *lportp;
 
+#ifdef FSTACK
+	if (rss_check_flag) {
+		if (rss_tbl_init == 0) {
+			rss_ret = ff_rss_tbl_set_portrange(first, last);
+			if (rss_ret < 0)
+				rss_tbl_init = -1;
+			else
+				rss_tbl_init = 1;
+		}
+
+		if (rss_tbl_init == 1) {
+			rss_ret = ff_rss_tbl_get_portrange(faddr.s_addr, laddr.s_addr, fport,
+			    &rss_first, &rss_last, &rss_portrange);
+			if (rss_ret < 0) {
+				if (rss_ret != -ENOENT)
+					rss_tbl_init = -1;
+			} else {
+				/* [0] store last port idx */
+				rss_match = 1;
+				count = rss_last - rss_first + 1;
+				if (dorandom)
+					rss_portrange[0] = rss_first + (arc4random() % (count));
+			}
+		}
+
+		if (!rss_match) {
+			lsa->sa_len = sizeof(struct sockaddr_in);
+			ifa = ifa_ifwithnet(lsa, 0, RT_ALL_FIBS);
+			if (ifa == NULL) {
+				fsa->sa_len = sizeof(struct sockaddr_in);
+				ifa = ifa_ifwithnet(fsa, 0, RT_ALL_FIBS);
+				if ( ifa == NULL )
+					return (EADDRNOTAVAIL);
+			}
+			ifp = ifa->ifa_ifp;
+		}
+	}
+
+	if (!rss_check_flag || !rss_match) {
+#endif
 	if (dorandom)
 		*lastport = first + (arc4random() % (last - first));
 
 	count = last - first;
+#ifdef FSTACK
+	}
+#endif
 
 	do {
 		if (count-- < 0)	/* completely used? */
 			return (EADDRNOTAVAIL);
+#ifdef FSTACK
+		if (rss_check_flag && rss_match) {
+			rss_portrange[0]++;
+			if (rss_portrange[0] < rss_first || rss_portrange[0] > rss_last)
+			    rss_portrange[0] = rss_first;
+			*lastport = rss_portrange[rss_portrange[0]];
+		}
+
+		if (!rss_check_flag || !rss_match) {
+#endif
 		++*lastport;
 		if (*lastport < first || *lastport > last)
 			*lastport = first;
+#ifdef FSTACK
+		}
+#endif
 		lport = htons(*lastport);
 
-		if (fsa != NULL) {
+#ifdef FSTACK
+		if (!rss_check_flag && fsa != NULL)
+#else
+		if (fsa != NULL)
+#endif
+		{
 #ifdef INET
 			if (lsa->sa_family == AF_INET) {
 				tmpinp = in_pcblookup_hash_locked(pcbinfo,
@@ -818,8 +890,26 @@ in_pcb_lport_dest(struct inpcb *inp, struct sockaddr *lsa, u_short *lportp,
 			else
 #endif
 #ifdef INET
+			{
 				tmpinp = in_pcblookup_local(pcbinfo, laddr,
 				    lport, lookupflags, cred);
+#ifdef FSTACK
+				if (rss_check_flag && !rss_match && tmpinp == NULL) {
+					int rss;
+					/* Note:
+					 * LOOPBACK not support rss.
+					 */
+					if ((ifp->if_softc == NULL) && (ifp->if_flags & IFF_LOOPBACK))
+						break;
+					rss = ff_rss_check(ifp->if_softc, faddr.s_addr, laddr.s_addr,
+					    fport, lport);
+					if (rss)
+						break;
+					else
+						tmpinp++; /* Set not NULL to find another lport */
+				}
+#endif
+			}
 #endif
 		}
 	} while (tmpinp != NULL);
@@ -1483,9 +1573,7 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam,
 			return (EADDRINUSE);
 		}
 	} else {
-#ifndef FSTACK
 		struct sockaddr_in lsin, fsin;
-
 		bzero(&lsin, sizeof(lsin));
 		bzero(&fsin, sizeof(fsin));
 		lsin.sin_family = AF_INET;
@@ -1494,52 +1582,13 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam,
 		fsin.sin_addr = faddr;
 		error = in_pcb_lport_dest(inp, (struct sockaddr *) &lsin,
 		    &lport, (struct sockaddr *)& fsin, fport, cred,
+#ifndef FSTACK
 		    INPLOOKUP_WILDCARD);
-		if (error)
-			return (error);
 #else
-		struct ifaddr *ifa;
-		struct ifnet *ifp;
-		struct sockaddr_in ifp_sin;
-		unsigned loop_count = 0;
-		bzero(&ifp_sin, sizeof(ifp_sin));
-		ifp_sin.sin_addr.s_addr = laddr.s_addr;
-		ifp_sin.sin_family = AF_INET;
-		ifp_sin.sin_len = sizeof(ifp_sin);
-		ifa = ifa_ifwithnet((struct sockaddr *)&ifp_sin, 0, RT_ALL_FIBS);
-		if (ifa == NULL) {
-			ifp_sin.sin_addr.s_addr = faddr.s_addr;
-			ifa = ifa_ifwithnet((struct sockaddr *)&ifp_sin, 0, RT_ALL_FIBS);
-			if ( ifa == NULL )
-				return (EADDRNOTAVAIL);
-		}
-		ifp = ifa->ifa_ifp;
-		while (lport == 0) {
-			int rss;
-			error = in_pcb_lport(inp, &laddr, &lport, cred, INPLOOKUP_WILDCARD);
-			if (error)
-				return (error);
-			/* Note:
-			 * LOOPBACK not support rss.
-			 */
-			if ((ifp->if_softc == NULL) && (ifp->if_flags & IFF_LOOPBACK))
-				break;
-			rss = ff_rss_check(ifp->if_softc, faddr.s_addr, laddr.s_addr,
-			    fport, lport);
-			if (rss) {
-				break;
-			}
-			lport = 0;
-			/* Note:
-			 * if all ports are completely used, just return.
-			 * this ugly code is not a correct way, it just lets loop quit.
-			 * we will fix it as soon as possible.
-			*/
-			if (++loop_count >= 65535) {
-				return (EADDRNOTAVAIL);
-			}
-		}
+		    INPLOOKUP_WILDCARD | INPLOOKUP_LPORT_RSS_CHECK);
 #endif
+		if (error)
+			return (error);
 	}
 	*laddrp = laddr.s_addr;
 	*lportp = lport;

freebsd/netinet/in_pcb.h

@@ -761,6 +761,9 @@ int	inp_so_options(const struct inpcb *inp);
 #define	INPLOOKUP_WILDCARD	0x00000001	/* Allow wildcard sockets. */
 #define	INPLOOKUP_RLOCKPCB	0x00000002	/* Return inpcb read-locked. */
 #define	INPLOOKUP_WLOCKPCB	0x00000004	/* Return inpcb write-locked. */
+#ifdef FSTACK
+#define	INPLOOKUP_LPORT_RSS_CHECK	0x80000000	/* F-Stack lport RSS check */
+#endif
 
 #define	INPLOOKUP_MASK	(INPLOOKUP_WILDCARD | INPLOOKUP_RLOCKPCB | \
 			    INPLOOKUP_WLOCKPCB)

lib/ff_api.symlist

@@ -68,4 +68,7 @@ ff_swi_net_excute
 ff_adapt_user_thread_add
 ff_adapt_user_thread_exit
 ff_switch_curthread
-ff_restore_curthread
+ff_restore_curthread
+ff_rss_tbl_init
+ff_veth_get_softc
+ff_veth_free_softc

lib/ff_config.c

@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <getopt.h>
 #include <ctype.h>
+#include <arpa/inet.h>
 #include <rte_config.h>
 #include <rte_string_fns.h>
 
@@ -515,7 +516,7 @@ ipfw_pr_cfg_handler(struct ff_port_cfg *cur_port_cfg, struct ff_vlan_cfg *cur_vl
                 vip_addr_str);
             free(vipfw_pr_cfg_p);
             return 1;
-        };
+        }
 
         vipfw_pr_cfg_p[i].addr = vip_addr_mask_array[0];
         vipfw_pr_cfg_p[i].netmask = vip_addr_mask_array[1];
@@ -855,6 +856,81 @@ bond_cfg_handler(struct ff_config *cfg, const char *section,
     return 1;
 }
 
+static int
+rss_tbl_cfg_handler(struct ff_config *cfg, struct ff_rss_check_cfg *cur)
+{
+    //vip cfg
+    int ret, nb_rss_tbl, i, j, k;
+    char *rss_tbl_array[FF_RSS_TBL_MAX_ENTRIES], *rss_tbl_4tuble_array[4], *rss_tbl_str;
+    struct ff_rss_tbl_cfg *rss_tbl_cfg_p;
+
+    rss_tbl_str = cur->rss_tbl_str;
+
+    ret = rte_strsplit(rss_tbl_str, strlen(rss_tbl_str), &rss_tbl_array[0], FF_RSS_TBL_MAX_ENTRIES, ';');
+    if (ret <= 0) {
+        fprintf(stdout, "rss_tbl_cfg_handler nb_rss_tbl is 0, not set rss_tbl or set invalid rss_tbl %s\n",
+            rss_tbl_str);
+        return 1;
+    }
+
+    nb_rss_tbl = ret;
+
+    rss_tbl_cfg_p = &cur->rss_tbl_cfgs[0];
+
+    for (i = 0; i < nb_rss_tbl; i++) {
+        rss_tbl_str = rss_tbl_array[i];
+        /* port_id, daddr(local), saddr(remote), sport */
+        ret = rte_strsplit(rss_tbl_str, strlen(rss_tbl_str), &rss_tbl_4tuble_array[0], 4, ' ');
+        if (ret != 4) {
+            fprintf(stdout, "rss_tbl_cfg_handler daddr/saddr/sport format error %s\n",
+                rss_tbl_str);
+            return 1;
+        }
+
+        /* Note: daddr must be include by port_id's addr or vip_addr, but here not check it now */
+        rss_tbl_cfg_p[i].port_id = atoi(rss_tbl_4tuble_array[0]);
+        inet_pton(AF_INET, rss_tbl_4tuble_array[1], (void *)&(rss_tbl_cfg_p[i].daddr));
+        inet_pton(AF_INET, rss_tbl_4tuble_array[2], (void *)&(rss_tbl_cfg_p[i].saddr));
+        rss_tbl_cfg_p[i].sport = htons(atoi(rss_tbl_4tuble_array[3]));
+    }
+
+    cur->nb_rss_tbl = nb_rss_tbl;
+
+    return 1;
+}
+
+static int
+rss_check_cfg_handler(struct ff_config *cfg, const char *section,
+    const char *name, const char *value)
+{
+    if (cfg->dpdk.port_cfgs == NULL && cfg->dpdk.vlan_cfgs == NULL) {
+        fprintf(stderr, "rss_check_cfg_handler: must config dpdk.port or dpdk.vlan first\n");
+        return 0;
+    }
+
+    if (cfg->dpdk.rss_check_cfgs == NULL) {
+        struct ff_rss_check_cfg *rcc = calloc(1, sizeof(struct ff_rss_check_cfg));
+        if (rcc == NULL) {
+            fprintf(stderr, "rss_check_cfg_handler malloc failed\n");
+            return 0;
+        }
+        cfg->dpdk.rss_check_cfgs = rcc;
+    }
+
+    struct ff_rss_check_cfg *cur = cfg->dpdk.rss_check_cfgs;
+
+    if (strcmp(name, "enable") == 0) {
+        cur->enable = atoi(value);
+    } else if (strcmp(name, "rss_tbl") == 0) {
+        cur->rss_tbl_str = strdup(value);
+        if (cur->rss_tbl_str) {
+            return rss_tbl_cfg_handler(cfg, cur);
+        }
+    }
+
+    return 1;
+}
+
 static int
 ini_parse_handler(void* user, const char* section, const char* name,
     const char* value)
@@ -955,6 +1031,8 @@ ini_parse_handler(void* user, const char* section, const char* name,
         } else if (strcmp(name, "savepath") == 0) {
             pconfig->pcap.save_path = strdup(value);
         }
+    } else if (strcmp(section, "rss_check") == 0) {
+        return rss_check_cfg_handler(pconfig, section, name, value);
     }
 
     return 1;