Merge branch 'dev'

Author: jfb8856606

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+      - dev
+
+jobs:
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    container:
+      image: shanakaprageeth/ubuntu24-dpdk:latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: |
+        apt-get -qq update
+        apt-get -qq install -y libssl-dev ninja-build
+        # using pre-built dpdk inside the container
+        cp -r /root/dpdk/build dpdk/build
+        cd dpdk
+        ninja -C build install
+    - name: Compile f-stack
+      run: |
+        cd lib/
+        make
+    - name: Archive production artifacts
+      if: github.ref_name == 'master' || github.ref_name == 'dev'
+      uses: actions/upload-artifact@v4
+      with:
+        name: build_output
+        path: |
+          dpdk/build
+          lib

LICENSE

@@ -40,7 +40,7 @@ BSD 3-Clause, Copyright (c) 2009, Ben Hoyt.All rights reserved.
 6.Nginx
 
 BSD 2-Clause, Copyright (C) 2002-2021 Igor Sysoev
-Copyright (C) 2011-2023 Nginx, Inc.
+Copyright (C) 2011-2025 Nginx, Inc.
 All rights reserved.
 
 7.Redis

README.md

@@ -1,5 +1,4 @@
-[![Build Status](https://travis-ci.org/F-Stack/f-stack.svg?branch=master)](https://travis-ci.org/F-Stack/f-stack)
-
+![Build Status](https://github.com/F-Stack/f-stack/actions/workflows/ci.yml/badge.svg?branch=dev)
 # F-Stack
 ![](F-Stack.png)
 
@@ -38,7 +37,6 @@ 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
 
-    pip3 install pyelftools --upgrade
     # Install python and modules for running DPDK python scripts
     pip3 install pyelftools --upgrade # RedHat/Centos
     sudo apt install python # On ubuntu
@@ -50,9 +48,8 @@ Currently, besides authorized DNS server of DNSPod, there are various products i
     cd f-stack
     # Compile DPDK
     cd dpdk/
-    # re-enable kni now, to remove kni later
-    # disable crypto/openssl for Redhat/Centos 7.x.
-    meson -Denable_kmods=true -Ddisable_libs=flow_classify -Ddisable_drivers=crypto/openssl build
+    # igb_uio is about 5% more efficient than vfio-pci, so continue using it.
+    meson -Denable_kmods=true build
     ninja -C build
     ninja -C build install
 
@@ -75,7 +72,6 @@ Currently, besides authorized DNS server of DNSPod, there are various products i
     # 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
@@ -149,7 +145,6 @@ for more details, see [nginx guide](https://github.com/F-Stack/f-stack/blob/mast
     sleep 10
     ifconfig veth0 <ipaddr>  netmask <netmask>  broadcast <broadcast> hw ether <mac addr>
     route add -net 0.0.0.0 gw <gateway> dev veth0
-    echo 1 > /sys/class/net/veth0/carrier # if `carrier=on` not set while `insmod rte_kni.ko` 
     # route add -net ...  # other route rules
 
 ## Nginx Testing Result
@@ -174,20 +169,31 @@ All of these test cases use CPUs' physical cores.
 
 
 CPS (Connection:close, Small data packet)  test result
+
 ![](CPS.png)
 
 CPS_Reuseport (Connection:close, Small data packet)  test result, This test case runs in a different test environment
+
 ![](CPS_Reuseport.png)
 
 RPS (Connection:Keep-Alive, Small data packet) test data
+
 ![](RPS.png)
 
 Bandwidth (Connection:Keep-Alive, 3.7k bytes data packet) test data
+
 ![](Bandwidth.png)
 
 ## Licenses
+
 See [LICENSE](LICENSE)
 
+## Wiki
+
+See [wiki page](https://github.com/F-Stack/f-stack/wiki).
+
+And more info see [deepwiki of F-Stack](https://deepwiki.com/F-Stack/f-stack), [powered by devin](https://devin.ai/).
+
 ## Join us
 
 Tencent Cloud F-Stack team developed F-Stack which is a general network framework based on DPDK and provides ultra high network performance. We are here looking for more and more talented people with great passion on technology to join us. You would have the chance to work with brightest minds on this planet and help Tencent cloud and F-stack continuously evolve. Send us your resume or refer your friend to us if you are interested in joining us.

VERSION

@@ -1 +1 @@
-1.24
+1.25

adapter/syscall/Makefile

@@ -1,4 +1,4 @@
-TOPDIR=..
+TOPDIR=../..
 
 ifeq ($(FF_PATH),)
 	FF_PATH=${TOPDIR}
@@ -17,10 +17,24 @@ endif
 # If disable it, one socket can use in all threads.
 #FF_THREAD_SOCKET=1
 
+# Epoll polling mode, now only support freebsd socket, not support FF_KERNEL_EVENT.  
+# If disable it, epoll use sem_wait.
+#FF_PRELOAD_POLLING_MODE=1
+
 # If enable FF_KERNEL_EVENT, epoll_create/epoll_clt/epoll_wait always call f-stack and system API at the same time.
 # Use for some scenarios similar to Nginx.
 #FF_KERNEL_EVENT=1
 
+# If enable FF_USE_THREAD_STRUCT_HANDLE, every ff_so_context has one struct thread  handle in fstack, fork will be supported
+# like linux kernel.
+#FF_USE_THREAD_STRUCT_HANDLE=1
+
+# If FF_PRELOAD_SUPPORT_SELECT is enabled, we can use select in LD_PRELOAD mode. 
+# However, we need to set the value of FF_KERNEL_MAX_FD_SELECT based on our requirements to ensure file descriptors 
+# (FDs) for the user-space protocol stack can be covered by the select interface.
+#FF_PRELOAD_SUPPORT_SELECT=1
+#FF_KERNEL_MAX_FD_SELECT=128
+
 PKGCONF ?= pkg-config
 
 ifndef DEBUG
@@ -41,6 +55,18 @@ ifdef FF_MULTI_SC
 	CFLAGS+= -DFF_MULTI_SC
 endif
 
+ifdef FF_PRELOAD_POLLING_MODE
+	CFLAGS+= -DFF_PRELOAD_POLLING_MODE
+endif
+
+ifdef FF_USE_THREAD_STRUCT_HANDLE
+	CFLAGS+= -DFF_USE_THREAD_STRUCT_HANDLE
+endif
+
+ifdef FF_PRELOAD_SUPPORT_SELECT
+	CFLAGS+= -DFF_PRELOAD_SUPPORT_SELECT -DFF_KERNEL_MAX_FD_SELECT=$(FF_KERNEL_MAX_FD_SELECT) -DFF_USE_THREAD_STRUCT_HANDLE 
+endif
+
 CFLAGS += -fPIC -Wall -Werror $(shell $(PKGCONF) --cflags libdpdk)
 
 INCLUDES= -I. -I${FF_PATH}/lib

adapter/syscall/ff_adapter.h

@@ -10,6 +10,8 @@
 int ff_adapter_init();
 //int __attribute__((constructor)) ff_adapter_init(int argc, char * const argv[]);
 
+int ff_adapter_child_process_init(void);
+
 void alarm_event_sem();
 
 /*-

adapter/syscall/ff_declare_syscalls.h

@@ -28,4 +28,5 @@ FF_SYSCALL_DECL(int, epoll_create, (int));
 FF_SYSCALL_DECL(int, epoll_ctl, (int, int, int, struct epoll_event *));
 FF_SYSCALL_DECL(int, epoll_wait, (int, struct epoll_event *, int, int));
 FF_SYSCALL_DECL(pid_t, fork, (void));
+FF_SYSCALL_DECL(int, select, (int , fd_set *, fd_set *, fd_set *, struct timeval *));
 #undef FF_SYSCALL_DECL