mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
fix
This commit is contained in:
parent
17c9e49d07
commit
3c395ecf37
5 changed files with 231 additions and 0 deletions
109
fast-classifier/Makefile
Normal file
109
fast-classifier/Makefile
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
#
|
||||||
|
# Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
|
||||||
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
|
# above copyright notice and this permission notice appear in all copies.
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||||
|
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||||
|
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||||
|
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
#
|
||||||
|
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
|
PKG_NAME:=fast-classifier
|
||||||
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
define KernelPackage/fast-classifier/Default
|
||||||
|
SECTION:=kernel
|
||||||
|
CATEGORY:=Kernel modules
|
||||||
|
SUBMENU:=Network Support
|
||||||
|
DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
|
||||||
|
TITLE:=Kernel driver for FAST Classifier
|
||||||
|
FILES:=$(PKG_BUILD_DIR)/fast-classifier.ko
|
||||||
|
KCONFIG:= \
|
||||||
|
CONFIG_NF_CONNTRACK_EVENTS=y \
|
||||||
|
CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
|
||||||
|
CONFIG_NF_CONNTRACK_MARK=y \
|
||||||
|
CONFIG_XFRM=y
|
||||||
|
CONFLICTS:=kmod-shortcut-fe-drv kmod-shortcut-fe-cm
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/fast-classifier
|
||||||
|
$(call KernelPackage/fast-classifier/Default)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/fast-classifier-noload
|
||||||
|
$(call KernelPackage/fast-classifier/Default)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/fast-classifier/Default/description
|
||||||
|
FAST Classifier talks to SFE to make decisions about offloading connections
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/fast-classifier/description
|
||||||
|
$(call KernelPackage/fast-classifier/Default/description)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/fast-classifier-noload/description
|
||||||
|
$(call KernelPackage/fast-classifier/Default/description)
|
||||||
|
|
||||||
|
This package does not load fast-classifier at boot by default
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/fast-classifier-example
|
||||||
|
TITLE:=Example user space program for fast-classifier
|
||||||
|
DEPENDS:=+libnl +kmod-fast-classifier
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/fast-classifier-example/description
|
||||||
|
Example user space program that communicates with fast
|
||||||
|
classifier kernel module
|
||||||
|
endef
|
||||||
|
|
||||||
|
HAVE_ECM:=$(CONFIG_PACKAGE_kmod-qca-nss-ecm-premium)$(CONFIG_PACKAGE_kmod-qca-nss-ecm-noload)$(CONFIG_PACKAGE_kmod-qca-nss-ecm-premium-noload)$(CONFIG_PACKAGE_kmod-qca-nss-ecm-standard)
|
||||||
|
|
||||||
|
define Build/Compile/kmod
|
||||||
|
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
|
||||||
|
$(KERNEL_MAKE_FLAGS) \
|
||||||
|
$(PKG_MAKE_FLAGS) \
|
||||||
|
M="$(PKG_BUILD_DIR)" \
|
||||||
|
CONFIG_FAST_CLASSIFIER=m \
|
||||||
|
EXTRA_CFLAGS+="-DSFE_SUPPORT_IPV6" \
|
||||||
|
$(if $(HAVE_ECM),EXTRA_CFLAGS+="-DCONFIG_SFE_ECM" CONFIG_SFE_ECM=y,) \
|
||||||
|
modules
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Compile/example
|
||||||
|
$(TARGET_CC) -o $(PKG_BUILD_DIR)/userspace_fast_classifier \
|
||||||
|
-I $(PKG_BUILD_DIR) \
|
||||||
|
-I$(STAGING_DIR)/usr/include/libnl \
|
||||||
|
-I$(STAGING_DIR)/usr/include/libnl3 \
|
||||||
|
-lnl-genl-3 -lnl-3 \
|
||||||
|
$(PKG_BUILD_DIR)/nl_classifier_test.c
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Compile
|
||||||
|
$(Build/Compile/kmod)
|
||||||
|
$(if $(CONFIG_PACKAGE_fast-classifier-example),$(Build/Compile/example))
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/InstallDev
|
||||||
|
$(INSTALL_DIR) $(1)/usr/include
|
||||||
|
$(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/fast-classifier-example/install
|
||||||
|
$(INSTALL_DIR) $(1)/sbin
|
||||||
|
$(CP) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call KernelPackage,fast-classifier))
|
||||||
|
#$(eval $(call KernelPackage,fast-classifier-noload))
|
||||||
|
#$(eval $(call BuildPackage,fast-classifier-example))
|
51
shortcut-fe/files/etc/init.d/shortcut-fe
Normal file
51
shortcut-fe/files/etc/init.d/shortcut-fe
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
#!/bin/sh /etc/rc.common
|
||||||
|
#
|
||||||
|
# Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
|
||||||
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
|
# above copyright notice and this permission notice appear in all copies.
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||||
|
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||||
|
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||||
|
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
#
|
||||||
|
|
||||||
|
#SFE connection manager has a lower priority, it should be started after other connection manager
|
||||||
|
#to detect the existence of connection manager with higher priority
|
||||||
|
START=70
|
||||||
|
|
||||||
|
have_cm() {
|
||||||
|
[ -d "/sys/kernel/debug/ecm" ] && echo 1 && return
|
||||||
|
|
||||||
|
echo 0
|
||||||
|
}
|
||||||
|
|
||||||
|
#load shortcut-fe and connection manager
|
||||||
|
load_sfe() {
|
||||||
|
local kernel_version=$(uname -r)
|
||||||
|
|
||||||
|
[ -d "/sys/module/shortcut_fe" ] || insmod /lib/modules/$kernel_version/shortcut-fe.ko
|
||||||
|
[ -d "/sys/module/shortcut_fe_ipv6" ] || insmod /lib/modules/$kernel_version/shortcut-fe-ipv6.ko
|
||||||
|
|
||||||
|
[ -e "/lib/modules/$kernel_version/shortcut-fe-cm.ko" ] && {
|
||||||
|
[ -d /sys/module/shortcut_fe_cm ] || insmod /lib/modules/$kernel_version/shortcut-fe-cm.ko
|
||||||
|
}
|
||||||
|
[ -e "/lib/modules/$kernel_version/fast-classifier.ko" ] && {
|
||||||
|
[ -d /sys/module/fast_classifier ] || insmod /lib/modules/$kernel_version/fast-classifier.ko
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
start() {
|
||||||
|
[ "$(have_cm)" = "0" ] && load_sfe
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
[ -d "/sys/module/shortcut_fe_cm" ] && rmmod shortcut_fe_cm
|
||||||
|
[ -d "/sys/module/shortcut_fe_ipv6" ] && rmmod shortcut_fe_ipv6
|
||||||
|
[ -d "/sys/module/shortcut_fe" ] && rmmod shortcut_fe
|
||||||
|
[ -d "/sys/module/shortcut_fe_drv" ] && rmmod shortcut_fe_drv
|
||||||
|
[ -d "/sys/module/fast_classifier" ] && rmmod fast_classifier
|
||||||
|
}
|
60
simulated-driver/Makefile
Normal file
60
simulated-driver/Makefile
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015,2016 The Linux Foundation. All rights reserved.
|
||||||
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
|
# above copyright notice and this permission notice appear in all copies.
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||||
|
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||||
|
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||||
|
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||||
|
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||||
|
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||||
|
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
#
|
||||||
|
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
|
PKG_NAME:=shortcut-fe-simulated-driver
|
||||||
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
|
PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/shortcut-fe
|
||||||
|
PKG_SOURCE_PROTO:=git
|
||||||
|
PKG_SOURCE_DATE:=2021-03-17
|
||||||
|
PKG_SOURCE_VERSION:=697977d8d0ccf0ab596e5692d08608a75dd7f33d
|
||||||
|
PKG_MIRROR_HASH:=659fa82a431e15af797a6c7069faeee02810453ad8b576c51c29f95a1761a045
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
define KernelPackage/shortcut-fe-drv
|
||||||
|
SECTION:=kernel
|
||||||
|
CATEGORY:=Kernel modules
|
||||||
|
SUBMENU:=Network Support
|
||||||
|
DEPENDS:=@TARGET_ipq806x||TARGET_ipq807x +kmod-shortcut-fe
|
||||||
|
KCONFIG:= \
|
||||||
|
CONFIG_NET_CLS_ACT=y \
|
||||||
|
CONFIG_XFRM=y
|
||||||
|
TITLE:=Simulated sfe driver for ECM
|
||||||
|
FILES:=$(PKG_BUILD_DIR)/simulated-driver/shortcut-fe-drv.ko
|
||||||
|
endef
|
||||||
|
|
||||||
|
define KernelPackage/shortcut-fe-drv/Description
|
||||||
|
Simulated sfe driver which act as an adapter to convert message
|
||||||
|
between a connection manager and the SFE core engine.
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Compile
|
||||||
|
$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
|
||||||
|
$(KERNEL_MAKE_FLAGS) \
|
||||||
|
$(PKG_MAKE_FLAGS) \
|
||||||
|
M="$(PKG_BUILD_DIR)/simulated-driver" \
|
||||||
|
EXTRA_CFLAGS="-DSFE_SUPPORT_IPV6" \
|
||||||
|
modules
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/InstallDev
|
||||||
|
$(INSTALL_DIR) $(1)/usr/include/shortcut-fe
|
||||||
|
$(CP) -rf $(PKG_BUILD_DIR)/simulated-driver/sfe_drv.h $(1)/usr/include/shortcut-fe
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call KernelPackage,shortcut-fe-drv))
|
11
simulated-driver/patches/200-nss-qdisc-support.patch
Normal file
11
simulated-driver/patches/200-nss-qdisc-support.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- ./simulated-driver/sfe_drv.c.orig 2020-06-16 12:49:47.680153371 +0800
|
||||||
|
+++ ./simulated-driver/sfe_drv.c 2020-06-16 12:50:18.540153371 +0800
|
||||||
|
@@ -1167,7 +1167,7 @@ int sfe_drv_recv(struct sk_buff *skb)
|
||||||
|
* If ingress Qdisc configured, and packet not processed by ingress Qdisc yet
|
||||||
|
* We can not accelerate this packet.
|
||||||
|
*/
|
||||||
|
- if (dev->ingress_queue && !(skb->tc_verd & TC_NCLS)) {
|
||||||
|
+ if (dev->ingress_queue && !(skb->tc_verd_qca_nss & TC_NCLS)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
Loading…
Add table
Add a link
Reference in a new issue