feat(rss): add IPv6 RSS hash/port-range support (scheme A, independent v6 path)

Add ff_rss_check6/ff_rss_tbl6_*/ff_rss_adjust_sport6 with an independent v6 static table and thash ctx (36B tuple, sport@256bit), plus IPv6 rule parsing in rss_tbl config. Wire v6 into in_pcb_lport_dest as a parallel sa_family branch and into in6_pcbconnect/in6_pcbladdr, keeping the v4 RSS path byte-identical (diff +98/-0). Mandatory ff_rss_check6 re-verification; adds v6 unit tests + hit-rate probe (full-loop 100% landing).

Author: jfb8856606

freebsd/netinet/in_pcb.c

@@ -782,6 +782,10 @@ in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa,
 	struct ifnet *ifp = NULL;
 	uint16_t rss_sel;
 	int rss_fast;
+#ifdef INET6
+	u_short rss6_first, rss6_last, *rss6_portrange;
+	static int rss_tbl6_init = 0;
+#endif
 
 	lookupflags &= ~INPLOOKUP_LPORT_RSS_CHECK;
 #endif
@@ -848,6 +852,62 @@ in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa,
 	dorandom = (V_ipport_randomized && first != last) ? 1 : 0;
 
 	if (rss_check_flag) {
+#ifdef INET6
+	if (lsa->sa_family == AF_INET6) {
+		/* 0.2 v6 RSS: parallel to v4, uses v6 table/check/adjust. */
+		if (rss_tbl6_init == 0) {
+			rss_ret = ff_rss_tbl6_set_portrange(first, last);
+			rss_tbl6_init = (rss_ret < 0) ? -1 : 1;
+		}
+
+		if (rss_tbl6_init == 1) {
+			rss_ret = ff_rss_tbl6_get_portrange(faddr6->s6_addr,
+			    laddr6->s6_addr, fport, &rss6_first, &rss6_last,
+			    &rss6_portrange);
+			if (rss_ret < 0) {
+				if (rss_ret != -ENOENT)
+					rss_tbl6_init = -1;
+			} else {
+				rss_match = 1;
+				count = rss6_last - rss6_first + 1;
+				if (dorandom)
+					rss6_portrange[0] = rss6_first +
+					    (arc4random() % count);
+			}
+		}
+
+		if (!rss_match) {
+			lsa->sa_len = sizeof(struct sockaddr_in6);
+			ifa = ifa_ifwithnet(lsa, 0, RT_ALL_FIBS);
+			if (ifa == NULL) {
+				fsa->sa_len = sizeof(struct sockaddr_in6);
+				ifa = ifa_ifwithnet(fsa, 0, RT_ALL_FIBS);
+				if (ifa == NULL)
+					return (EADDRNOTAVAIL);
+			}
+			ifp = ifa->ifa_ifp;
+
+			if (!(ifp->if_softc == NULL &&
+			    (ifp->if_flags & IFF_LOOPBACK))) {
+				for (rss_fast = 0; rss_fast < 8; rss_fast++) {
+					if (ff_rss_adjust_sport6(ifp->if_softc,
+					    faddr6->s6_addr, laddr6->s6_addr,
+					    fport, &rss_sel) != 0)
+						break;
+					lport = htons(rss_sel);
+					if (in6_pcblookup_local(pcbinfo,
+					    &inp->in6p_laddr, lport, RT_ALL_FIBS,
+					    lookupflags, cred) == NULL) {
+						*lastport = rss_sel;
+						*lportp = lport;
+						return (0);
+					}
+				}
+			}
+		}
+	} else
+#endif
+	{
 		if (rss_tbl_init == 0) {
 			rss_ret = ff_rss_tbl_set_portrange(first, last);
 			rss_tbl_init = (rss_ret < 0) ? -1 : 1;
@@ -909,6 +969,7 @@ in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa,
 			}
 		}
 	}
+	}
 
 	if (!rss_check_flag || !rss_match) {
 		if (dorandom)
@@ -926,6 +987,15 @@ in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa,
 		if (count-- < 0)	/* completely used? */
 			return (EADDRNOTAVAIL);
 #ifdef FSTACK
+#ifdef INET6
+		if (rss_check_flag && rss_match && lsa->sa_family == AF_INET6) {
+			rss6_portrange[0]++;
+			if (rss6_portrange[0] < rss6_first ||
+			    rss6_portrange[0] > rss6_last)
+				rss6_portrange[0] = rss6_first;
+			*lastport = rss6_portrange[rss6_portrange[0]];
+		} else
+#endif
 		if (rss_check_flag && rss_match) {
 			rss_portrange[0]++;
 			if (rss_portrange[0] < rss_first ||
@@ -975,6 +1045,22 @@ in_pcb_lport_dest(const struct inpcb *inp, struct sockaddr *lsa,
 					tmpinp = in_pcblookup_local(pcbinfo,
 					    laddr, lport, RT_ALL_FIBS,
 					    lookupflags, cred);
+#endif
+#ifdef FSTACK
+				if (rss_check_flag && !rss_match &&
+				    tmpinp == NULL && laddr6 != NULL &&
+				    faddr6 != NULL) {
+					/* LOOPBACK does not support RSS. */
+					if (ifp->if_softc == NULL &&
+					    (ifp->if_flags & IFF_LOOPBACK))
+						break;
+					if (ff_rss_check6(ifp->if_softc,
+					    faddr6->s6_addr, laddr6->s6_addr,
+					    fport, lport))
+						break;
+					/* not local queue: keep searching */
+					tmpinp++;
+				}
 #endif
 			}
 #endif

freebsd/netinet6/in6_pcb.c

@@ -114,6 +114,10 @@
 #include <netinet6/in6_fib.h>
 #include <netinet6/scope6_var.h>
 
+#ifdef FSTACK
+#include "ff_host_interface.h"
+#endif
+
 SYSCTL_DECL(_net_inet6);
 SYSCTL_DECL(_net_inet6_ip6);
 VNET_DEFINE_STATIC(int, connect_in6addr_wild) = 1;
@@ -411,7 +415,15 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6,
 	if ((error = prison_remote_ip6(inp->inp_cred, &sin6->sin6_addr)) != 0)
 		return (error);
 
+#ifdef FSTACK
+	in6a = in6addr_any;
+	if (sas_required)
+		ff_in_pcbladdr(AF_INET6, &sin6->sin6_addr,
+		    sin6->sin6_port, &in6a);
+	if (sas_required && IN6_IS_ADDR_UNSPECIFIED(&in6a)) {
+#else
 	if (sas_required) {
+#endif
 		error = in6_selectsrc_socket(sin6, inp->in6p_outputopts,
 		    inp, inp->inp_cred, scope_ambiguous, &in6a, NULL);
 		if (error)
@@ -505,7 +517,11 @@ in6_pcbconnect(struct inpcb *inp, struct sockaddr_in6 *sin6, struct ucred *cred,
 			error = in_pcb_lport_dest(inp,
 			    (struct sockaddr *) &laddr6, &inp->inp_lport,
 			    (struct sockaddr *) sin6, sin6->sin6_port, cred,
+#ifdef FSTACK
+			    INPLOOKUP_WILDCARD | INPLOOKUP_LPORT_RSS_CHECK);
+#else
 			    INPLOOKUP_WILDCARD);
+#endif
 			if (error)
 				return (error);
 		}

lib/ff_config.c

@@ -910,8 +910,16 @@ rss_tbl_cfg_handler(struct ff_rss_check_cfg *cur)
 
         /* 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));
+        /* v6 if the address text contains ':', else v4 (v4 path unchanged) */
+        if (strchr(rss_tbl_4tuble_array[1], ':') != NULL) {
+            rss_tbl_cfg_p[i].family = AF_INET6;
+            inet_pton(AF_INET6, rss_tbl_4tuble_array[1], (void *)&(rss_tbl_cfg_p[i].daddr6));
+            inet_pton(AF_INET6, rss_tbl_4tuble_array[2], (void *)&(rss_tbl_cfg_p[i].saddr6));
+        } else {
+            rss_tbl_cfg_p[i].family = AF_INET;
+            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]));
     }
 

lib/ff_config.h

@@ -231,8 +231,11 @@ struct ff_bond_cfg {
 struct ff_rss_tbl_cfg {
     uint16_t port_id;
     uint16_t sport;
-    uint32_t daddr; /* local */
-    uint32_t saddr; /* remote */
+    uint32_t daddr; /* local, v4 */
+    uint32_t saddr; /* remote, v4 */
+    uint8_t family;       /* AF_INET (default) or AF_INET6 */
+    uint8_t daddr6[16];   /* local, v6 */
+    uint8_t saddr6[16];   /* remote, v6 */
 };
 
 struct ff_rss_check_cfg {