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

Author: jfb8856606

README.md

@@ -38,44 +38,59 @@ Currently, besides authorized DNS server of DNSPod, there are various products i
     yum install numactl-devel          # on Centos
     #sudo apt-get install libnuma-dev  # on Ubuntu
 
+    # Install dependencies (FreeBSD only)
+    #pkg install meson pkgconf py38-pyelftools
+
     cd f-stack
     # Compile DPDK
     cd dpdk/
     meson -Denable_kmods=true build
     ninja -C build
     ninja -C build install
 
-    # Set hugepage
+    # Set hugepage (Linux only)
     # single-node system
     echo 1024 > /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages
 
-    # or NUMA
+    # or NUMA (Linux only)
     echo 1024 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
     echo 1024 > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
 
-    # Using Hugepage with the DPDK
+    # Using Hugepage with the DPDK (Linux only)
     mkdir /mnt/huge
     mount -t hugetlbfs nodev /mnt/huge
 
-    # Close ASLR; it is necessary in multiple process
+    # Close ASLR; it is necessary in multiple process (Linux only)
     echo 0 > /proc/sys/kernel/randomize_va_space
 
     # Install python for running DPDK python scripts
     sudo apt install python # On ubuntu
+    #sudo pkg install python # On FreeBSD
 
     # Offload NIC
+    # For Linux:
     modprobe uio
     insmod /data/f-stack/dpdk/build/kernel/linux/igb_uio/igb_uio.ko
     insmod /data/f-stack/dpdk/build/kernel/linux/kni/rte_kni.ko carrier=on # carrier=on is necessary, otherwise need to be up `veth0` via `echo 1 > /sys/class/net/veth0/carrier`
     python dpdk-devbind.py --status
     ifconfig eth0 down
     python dpdk-devbind.py --bind=igb_uio eth0 # assuming that use 10GE NIC and eth0
 
+    # For FreeBSD:
+    # Refer DPDK FreeBSD guide to set tunables in /boot/loader.conf
+    # Below is an example used for our testing machine
+    #echo "hw.nic_uio.bdfs=\"2:0:0\"" >> /boot/loader.conf
+    #echo "hw.contigmem.num_buffers=1" >> /boot/loader.conf
+    #echo "hw.contigmem.buffer_size=1073741824" >> /boot/loader.conf
+    #kldload contigmem
+    #kldload nic_uio
+
     # On Ubuntu, use gawk instead of the default mawk.
     #sudo apt-get install gawk  # or execute `sudo update-alternatives --config awk` to choose gawk.
 
     # Install dependencies for F-Stack
-    sudo apt install gcc make libssl-dev # On ubuntu
+    sudo apt install gcc make libssl-dev                            # On ubuntu
+    #sudo pkg install gcc gmake openssl pkgconf libepoll-shim       # On FreeBSD
 
     # Upgrade pkg-config while version < 0.28
     #cd /data
@@ -92,14 +107,16 @@ Currently, besides authorized DNS server of DNSPod, there are various products i
     export FF_PATH=/data/f-stack
     export PKG_CONFIG_PATH=/usr/lib64/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib/pkgconfig
     cd /data/f-stack/lib/
-    make
+    make    # On Linux
+    #gmake   # On FreeBSD
 
     # Install F-STACK
     # libfstack.a will be installed to /usr/local/lib
     # ff_*.h will be installed to /usr/local/include
     # start.sh will be installed to /usr/local/bin/ff_start
     # config.ini will be installed to /etc/f-stack.conf
-    make install
+    make install    # On Linux
+    #gmake install   # On FreeBSD
 
 #### Nginx
 

config.ini

@@ -70,6 +70,9 @@ nb_vdev=0
 # Number of bond.
 nb_bond=0
 
+# log level for dpdk, optional
+# log_level=0
+
 # Each core write into own pcap file, which is open one time, close one time if enough.
 # Support dump the first snaplen bytes of each packet.
 # if pcap file is lager than savelen bytes, it will be closed and next file was dumped into.

dpdk/lib/librte_eal/freebsd/include/rte_os.h

@@ -14,6 +14,22 @@
 #include <pthread_np.h>
 
 typedef cpuset_t rte_cpuset_t;
+#if __FreeBSD_version >= 1301000
+#define RTE_CPU_AND(dst, src1, src2) do \
+{ \
+	cpuset_t tmp; \
+	CPU_COPY(src1, &tmp); \
+	CPU_AND(&tmp, &tmp, src2); \
+	CPU_COPY(&tmp, dst); \
+} while (0)
+#define RTE_CPU_OR(dst, src1, src2) do \
+{ \
+	cpuset_t tmp; \
+	CPU_COPY(src1, &tmp); \
+	CPU_OR(&tmp, &tmp, src2); \
+	CPU_COPY(&tmp, dst); \
+} while (0)
+#else
 #define RTE_CPU_AND(dst, src1, src2) do \
 { \
 	cpuset_t tmp; \
@@ -28,6 +44,7 @@ typedef cpuset_t rte_cpuset_t;
 	CPU_OR(&tmp, src2); \
 	CPU_COPY(&tmp, dst); \
 } while (0)
+#endif
 #define RTE_CPU_FILL(set) CPU_FILL(set)
 
 /* In FreeBSD 13 CPU_NAND macro is CPU_ANDNOT */
@@ -40,13 +57,24 @@ typedef cpuset_t rte_cpuset_t;
 	CPU_COPY(&tmp, dst); \
 } while (0)
 #else
+#if __FreeBSD_version >= 1301000
+#define RTE_CPU_NOT(dst, src) do \
+{ \
+	cpuset_t tmp; \
+	CPU_FILL(&tmp); \
+	CPU_ANDNOT(&tmp, &tmp, src); \
+	CPU_COPY(&tmp, dst); \
+} while (0)
+#else
 #define RTE_CPU_NOT(dst, src) do \
 { \
 	cpuset_t tmp; \
 	CPU_FILL(&tmp); \
 	CPU_ANDNOT(&tmp, src); \
 	CPU_COPY(&tmp, dst); \
 } while (0)
+
+#endif
 #endif
 
 #endif /* _RTE_OS_H_ */

lib/Makefile

@@ -21,12 +21,19 @@ PREFIX_INCLUDE=/usr/local/include
 PREFIX_BIN=/usr/local/bin
 F-STACK_CONF=/etc/f-stack.conf
 F-STACK_VERSION=1.22
+TGT_OS=$(shell uname)
+ifeq ($(TGT_OS),FreeBSD)
+CC=gcc
+endif
 
 HOST_OS:=$(shell uname -s)
 
 DEBUG=-O0 -gdwarf-2 -g3 -Wno-format-truncation
 
+# No DPDK KNI support on FreeBSD
+ifneq ($(TGT_OS),FreeBSD)
 FF_KNI=1
+endif
 
 #FF_FLOW_ISOLATE=1
 
@@ -59,6 +66,11 @@ INCLUDES+= -I./opt
 
 # Include search path for files that only include host OS headers
 HOST_INCLUDES= -I.
+# Use libepoll shim on FreeBSD
+ifeq ($(TGT_OS),FreeBSD)
+HOST_INCLUDES+= -I/usr/local/include/libepoll-shim
+endif
+
 ifndef DEBUG
 HOST_CFLAGS = -O2 -frename-registers  -funswitch-loops -fweb -Wno-format-truncation
 else
@@ -91,6 +103,16 @@ endif
 HOST_CFLAGS+= -DINET
 CFLAGS+= -DINET
 
+GCCVERGE10 = $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 10)
+ifeq "$(GCCVERGE10)" "1" 
+    CFLAGS+= -Wno-error=stringop-overflow
+endif 
+
+GCCVERGE11 = $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 11)
+ifeq "$(GCCVERGE11)" "1" 
+    CFLAGS+= -Wno-error=stringop-overread
+endif
+
 ifdef FF_INET6
 HOST_CFLAGS+= -DINET6
 CFLAGS+= -DINET6
@@ -524,11 +546,15 @@ EXTRA_TCP_STACKS_SRCS+=		\
 	bbr.c
 endif
 
+ 
+ifneq ($(TGT_OS),FreeBSD)
 ifndef FF_KNI
 FF_HOST_SRCS+=         \
         ff_dpdk_kni.c
-endif
-endif
+endif		#FF_KNI
+endif		#FreeBSD OS Check
+
+endif		#INET6
 
 ifdef FF_IPFW
 NETIPFW_SRCS+=             \

lib/ff_config.c

@@ -656,7 +656,9 @@ ini_parse_handler(void* user, const char* section, const char* name,
     printf("[%s]: %s=%s\n", section, name, value);
 
     #define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0
-    if (MATCH("dpdk", "channel")) {
+    if (MATCH("dpdk", "log_level")) {
+        pconfig->dpdk.log_level = atoi(value);
+    } else if (MATCH("dpdk", "channel")) {
         pconfig->dpdk.nb_channel = atoi(value);
     } else if (MATCH("dpdk", "memory")) {
         pconfig->dpdk.memory = atoi(value);
@@ -760,6 +762,10 @@ dpdk_args_setup(struct ff_config *cfg)
         sprintf(temp, "-m%d", cfg->dpdk.memory);
         dpdk_argv[n++] = strdup(temp);
     }
+    if (cfg->dpdk.log_level) {
+        sprintf(temp, "--log-level=%d", cfg->dpdk.log_level);
+        dpdk_argv[n++] = strdup(temp);
+    }
     if (cfg->dpdk.proc_type) {
         sprintf(temp, "--proc-type=%s", cfg->dpdk.proc_type);
         dpdk_argv[n++] = strdup(temp);

lib/ff_config.h

@@ -164,6 +164,9 @@ struct ff_config {
         int nb_ports;
         uint16_t max_portid;
         uint16_t *portid_list;
+
+        // load dpdk log level
+        uint16_t log_level;
         // MAP(portid => struct ff_port_cfg*)
         struct ff_port_cfg *port_cfgs;
         struct ff_vdev_cfg *vdev_cfgs;

lib/ff_dpdk_if.c

@@ -577,6 +577,9 @@ init_port_start(void)
         struct ff_port_cfg *pconf = &ff_global_cfg.dpdk.port_cfgs[u_port_id];
         uint16_t nb_queues = pconf->nb_lcores;
 
+		if (pconf->nb_slaves > 0) {
+        	rte_eth_bond_8023ad_dedicated_queues_enable(u_port_id);
+		}
         for (j=0; j<=pconf->nb_slaves; j++) {
             if (j < pconf->nb_slaves) {
                 port_id = pconf->slave_portid_list[j];
@@ -1179,7 +1182,8 @@ protocol_filter(const void *data, uint16_t len)
     if(ether_type == RTE_ETHER_TYPE_ARP)
         return FILTER_ARP;
 
-#ifdef INET6
+#if (!defined(__FreeBSD__) && defined(INET6) ) || \
+    ( defined(__FreeBSD__) && defined(INET6) && defined(FF_KNI))
     if (ether_type == RTE_ETHER_TYPE_IPV6) {
         return ff_kni_proto_filter(data,
             len, ether_type);

lib/ff_syscall_wrapper.c

@@ -90,6 +90,7 @@
 #define LINUX_IP_OPTIONS    4
 #define LINUX_IP_RECVTTL    12
 #define LINUX_IP_RECVTOS    13
+#define LINUX_IP_MINTTL     21
 
 #define LINUX_IP_MULTICAST_IF       32
 #define LINUX_IP_MULTICAST_TTL      33
@@ -403,6 +404,8 @@ ip_opt_convert(int optname)
             return IP_RECVTTL;
         case LINUX_IP_RECVTOS:
             return IP_RECVTOS;
+        case LINUX_IP_MINTTL:
+            return IP_MINTTL;
         default:
             return optname;
     }

redis-6.2.6/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Help us improve Redis by reporting a bug
+title: '[BUG]'
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A short description of the bug.
+
+**To reproduce**
+
+Steps to reproduce the behavior and/or a minimal code sample.
+
+**Expected behavior**
+
+A description of what you expected to happen.
+
+**Additional information**
+
+Any additional information that is relevant to the problem.

redis-6.2.6/.github/ISSUE_TEMPLATE/crash_report.md

@@ -0,0 +1,20 @@
+---
+name: Crash report
+about: Submit a crash report
+title: '[CRASH]'
+labels: ''
+assignees: ''
+
+---
+
+**Crash report**
+
+Paste the complete crash log between the quotes below. Please include a few lines from the log preceding the crash report to provide some context.
+
+```
+```
+
+**Aditional information**
+
+1. OS distribution and version
+2. Steps to reproduce (if any)

redis-6.2.6/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest a feature for Redis
+title: '[NEW]'
+labels: ''
+assignees: ''
+
+---
+
+**The problem/use-case that the feature addresses**
+
+A description of the problem that the feature will solve, or the use-case with which the feature will be used.
+
+**Description of the feature**
+
+A description of what you want to happen.
+
+**Alternatives you've considered**
+
+Any alternative solutions or features you've considered, including references to existing open and closed feature requests in this repository.
+
+**Additional information**
+
+Any additional information that is relevant to the feature request.

redis-6.2.6/.github/ISSUE_TEMPLATE/other_stuff.md

@@ -0,0 +1,8 @@
+---
+name: Other
+about: Can't find the right issue type? Use this one!
+title: ''
+labels: ''
+assignees: ''
+
+---

redis-6.2.6/.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,21 @@
+---
+name: Question
+about: Ask the Redis developers
+title: '[QUESTION]'
+labels: ''
+assignees: ''
+
+---
+
+Please keep in mind that this issue tracker should be used for reporting bugs or proposing improvements to the Redis server.
+
+Generally, questions about using Redis should be directed to the [community](https://redis.io/community):
+
+* [the mailing list](https://groups.google.com/forum/#!forum/redis-db)
+* [the `redis` tag at StackOverflow](http://stackoverflow.com/questions/tagged/redis)
+* [/r/redis subreddit](http://www.reddit.com/r/redis)
+* [the irc channel #redis](http://webchat.freenode.net/?channels=redis) on freenode
+
+It is also possible that your question was already asked here, so please do a quick issues search before submitting. Lastly, if your question is about one of Redis' [clients](https://redis.io/clients), you may to contact your client's developers for help.
+
+That said, please feel free to replace all this with your question :)