Merge branch 'master' of https://github.com/F-Stack/f-stack into master

Author: jfb8856606

doc/F-Stack_Release_Note.md

@@ -2,6 +2,16 @@
 
  F-Stack is an open source network framework based on DPDK.
 
+2021.09 F-Stack v1.21.1
+
+   1. F-Stack lib:
+
+  - lo port is added 127.0.0.1 when freebsd init.
+
+   2. DPDK:
+
+  - MLX5: modify if_indextoname syscall to support F-Stack tools.
+
 2021.01 F-Stack v1.21
 
     1. F-Stack lib:

dpdk/drivers/net/mlx5/mlx5_ethdev.c

@@ -24,6 +24,7 @@
 #include <stdalign.h>
 #include <sys/un.h>
 #include <time.h>
+#include <dlfcn.h>
 
 #include <rte_atomic.h>
 #include <rte_ethdev_driver.h>
@@ -1640,6 +1641,7 @@ mlx5_dev_to_eswitch_info(struct rte_eth_dev *dev)
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
+static int (*real_if_indextoname)(unsigned int, char *);
 int
 mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 {
@@ -1659,7 +1661,16 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	char c;
 	int ret;
 
-	if (!if_indextoname(ifindex, ifname)) {
+	// for ff tools
+	if (!real_if_indextoname) {
+		real_if_indextoname = dlsym(RTLD_NEXT, "if_indextoname");
+		if (!real_if_indextoname) {
+			rte_errno = errno;
+			return -rte_errno;
+		}
+	}
+
+	if (!real_if_indextoname(ifindex, ifname)) {
 		rte_errno = errno;
 		return -rte_errno;
 	}

freebsd/net/if_vxlan.c

@@ -2481,7 +2481,7 @@ vxlan_rcv_udp_packet(struct mbuf *m, int offset, struct inpcb *inpcb,
 	 * the behavior of the Linux implementation.
 	 */
 	if (vxh->vxlh_flags != htonl(VXLAN_HDR_FLAGS_VALID_VNI) ||
-	    vxh->vxlh_vni & ~htonl(VXLAN_VNI_MASK))
+	    vxh->vxlh_vni & ~VXLAN_VNI_MASK)
 		goto out;
 
 	vni = ntohl(vxh->vxlh_vni) >> VXLAN_HDR_VNI_SHIFT;

lib/ff_freebsd_init.c

@@ -47,6 +47,14 @@
 #include "ff_api.h"
 #include "ff_config.h"
 
+#include <sys/socketvar.h>
+#include <sys/sockio.h>
+#include <net/if.h>
+#include <net/if_var.h>
+#include <netinet/in_var.h>
+
+int lo_set_defaultaddr(void);
+
 int ff_freebsd_init(void);
 
 extern void mutex_init(void);
@@ -64,6 +72,52 @@ extern cpuset_t all_cpus;
 
 long physmem;
 
+int lo_set_defaultaddr(void)
+{
+    struct in_aliasreq req;
+    char *addr="127.0.0.1";
+    char *netmask="255.0.0.0";
+    struct ifnet *ifp=NULL;
+    int ret;
+	
+    IFNET_WLOCK();
+    TAILQ_FOREACH(ifp, &V_ifnet, if_link)
+        if ( (ifp->if_flags & IFF_LOOPBACK) != 0 )
+            break;
+    IFNET_WUNLOCK();
+
+    if(ifp == NULL)
+        return -1;
+ 
+    bzero(&req, sizeof req);
+    strcpy(req.ifra_name, ifp->if_xname);
+	
+    struct sockaddr_in sa;
+    bzero(&sa, sizeof(sa));
+	
+    sa.sin_len = sizeof(sa);
+    sa.sin_family = AF_INET;
+    
+    inet_pton(AF_INET, addr, &sa.sin_addr.s_addr);
+    bcopy(&sa, &req.ifra_addr, sizeof(sa));
+
+    inet_pton(AF_INET, netmask, &sa.sin_addr.s_addr);
+    bcopy(&sa, &req.ifra_mask, sizeof(sa));
+
+    //sa.sin_addr.s_addr = sc->broadcast;
+    //bcopy(&sa, &req.ifra_broadaddr, sizeof(sa));
+
+    struct socket *so = NULL;
+    ret = socreate(AF_INET, &so, SOCK_DGRAM, 0, curthread->td_ucred, curthread);
+    if(ret != 0)
+        return ret;
+
+    ret = ifioctl(so, SIOCAIFADDR, (caddr_t)&req, curthread);
+    sofree(so);
+
+    return ret;
+}
+
 int
 ff_freebsd_init(void)
 {
@@ -125,5 +179,9 @@ ff_freebsd_init(void)
         cur = cur->next;
     }
 
+    error = lo_set_defaultaddr();
+    if(error != 0)
+        printf("set loopback port default addr failed!");
+
     return (0);
 }