298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

shortcut-fe-cm: fixes unknown symbol issues (#8460)

Browse Source
This commit is contained in:
AmadeusGhost 2022-01-14 18:47:14 +08:00 committed by GitHub
parent 47266d39f7
commit 1e5e01caf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
package/lean/shortcut-fe/fast-classifier/Makefile
View File

@ -11,50 +11,50 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fast-classifier PKG_NAME:=fast-classifier
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_CONFIG_DEPENDS := CONFIG_IPV6
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define KernelPackage/$(PKG_NAME)/Default define KernelPackage/fast-classifier/Default
SECTION:=kernel SECTION:=kernel
CATEGORY:=Kernel modules CATEGORY:=Kernel modules
SUBMENU:=Network Support SUBMENU:=Network Support
DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
TITLE:=Kernel driver for FAST Classifier TITLE:=Kernel driver for FAST Classifier
FILES:=$(PKG_BUILD_DIR)/fast-classifier.ko FILES:=$(PKG_BUILD_DIR)/fast-classifier.ko
KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y \ KCONFIG:= \
CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \ CONFIG_NF_CONNTRACK_EVENTS=y \
CONFIG_NF_CONNTRACK_MARK=y \ CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
CONFIG_XFRM=y CONFIG_NF_CONNTRACK_MARK=y \
CONFIG_XFRM=y
CONFLICTS:=kmod-shortcut-fe-drv kmod-shortcut-fe-cm CONFLICTS:=kmod-shortcut-fe-drv kmod-shortcut-fe-cm
endef endef
define KernelPackage/$(PKG_NAME) define KernelPackage/fast-classifier
$(call KernelPackage/$(PKG_NAME)/Default) $(call KernelPackage/fast-classifier/Default)
endef endef
define KernelPackage/$(PKG_NAME)-noload define KernelPackage/fast-classifier-noload
$(call KernelPackage/$(PKG_NAME)/Default) $(call KernelPackage/fast-classifier/Default)
endef endef
define KernelPackage/$(PKG_NAME)/Default/description define KernelPackage/fast-classifier/Default/description
FAST Classifier talks to SFE to make decisions about offloading connections FAST Classifier talks to SFE to make decisions about offloading connections
endef endef
define KernelPackage/$(PKG_NAME)/description define KernelPackage/fast-classifier/description
$(call KernelPackage/$(PKG_NAME)/Default/description) $(call KernelPackage/fast-classifier/Default/description)
endef endef
define KernelPackage/$(PKG_NAME)-noload/description define KernelPackage/fast-classifier-noload/description
$(call KernelPackage/$(PKG_NAME)/Default/description) $(call KernelPackage/fast-classifier/Default/description)
This package does not load $(PKG_NAME) at boot by default This package does not load fast-classifier at boot by default
endef endef
define Package/fast-classifier-example define Package/fast-classifier-example
@ -67,18 +67,16 @@ Example user space program that communicates with fast
classifier kernel module classifier kernel module
endef endef
SFE_MAKE_OPTS:=SFE_SUPPORT_IPV6=$(if $(CONFIG_IPV6),y,n)
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) 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 define Build/Compile/kmod
+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" $(SFE_MAKE_OPTS) \ +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
$(PKG_MAKE_FLAGS) \ $(PKG_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
CONFIG_FAST_CLASSIFIER=m \ CONFIG_FAST_CLASSIFIER=m \
EXTRA_CFLAGS+="-DSFE_SUPPORT_IPV6" \
$(if $(HAVE_ECM),EXTRA_CFLAGS+="-DCONFIG_SFE_ECM" CONFIG_SFE_ECM=y,) \ $(if $(HAVE_ECM),EXTRA_CFLAGS+="-DCONFIG_SFE_ECM" CONFIG_SFE_ECM=y,) \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
modules modules
endef endef
@ -101,12 +99,11 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/ $(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/
endef endef
define Package/fast-classifier-example/install define Package/fast-classifier-example/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/sbin
$(CP) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/ $(CP) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
endef endef
$(eval $(call KernelPackage,$(PKG_NAME))) $(eval $(call KernelPackage,fast-classifier))
$(eval $(call KernelPackage,$(PKG_NAME)-noload)) #$(eval $(call KernelPackage,fast-classifier-noload))
#$(eval $(call BuildPackage,fast-classifier-example)) #$(eval $(call BuildPackage,fast-classifier-example))

19
package/lean/shortcut-fe/shortcut-fe/Makefile
View File

@ -11,6 +11,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
@ -23,10 +24,13 @@ define KernelPackage/shortcut-fe
SECTION:=kernel SECTION:=kernel
CATEGORY:=Kernel modules CATEGORY:=Kernel modules
SUBMENU:=Network Support SUBMENU:=Network Support
DEPENDS:=@IPV6 DEPENDS:=@IPV6 +kmod-nf-conntrack
TITLE:=Kernel driver for SFE TITLE:=Kernel driver for SFE
FILES:=$(PKG_BUILD_DIR)/shortcut-fe.ko $(if $(CONFIG_IPV6),$(PKG_BUILD_DIR)/shortcut-fe-ipv6.ko,) FILES:= \
KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y \ $(PKG_BUILD_DIR)/shortcut-fe.ko \
$(PKG_BUILD_DIR)/shortcut-fe-ipv6.ko
KCONFIG:= \
CONFIG_NF_CONNTRACK_EVENTS=y \
CONFIG_NF_CONNTRACK_TIMEOUT=y \ CONFIG_NF_CONNTRACK_TIMEOUT=y \
CONFIG_SHORTCUT_FE=y \ CONFIG_SHORTCUT_FE=y \
CONFIG_XFRM=y CONFIG_XFRM=y
@ -54,9 +58,10 @@ define KernelPackage/shortcut-fe-cm
DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
TITLE:=Kernel driver for SFE TITLE:=Kernel driver for SFE
FILES:=$(PKG_BUILD_DIR)/shortcut-fe-cm.ko FILES:=$(PKG_BUILD_DIR)/shortcut-fe-cm.ko
KCONFIG:=CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \ KCONFIG:= \
CONFIG_NF_CONNTRACK_EVENTS=y \ CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
CONFIG_XFRM=y CONFIG_NF_CONNTRACK_EVENTS=y \
CONFIG_XFRM=y
CONFLICTS:=kmod-shortcut-fe-drv CONFLICTS:=kmod-shortcut-fe-drv
endef endef
@ -69,7 +74,7 @@ define Build/Compile
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
$(PKG_MAKE_FLAGS) \ $(PKG_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
$(if $(CONFIG_IPV6),EXTRA_CFLAGS+="-DSFE_SUPPORT_IPV6" SFE_SUPPORT_IPV6=y,) \ EXTRA_CFLAGS+="-DSFE_SUPPORT_IPV6" SFE_SUPPORT_IPV6=y \
$(if $(HAVE_ECM),EXTRA_CFLAGS+="-DCONFIG_SFE_ECM" CONFIG_SFE_ECM=y,) \ $(if $(HAVE_ECM),EXTRA_CFLAGS+="-DCONFIG_SFE_ECM" CONFIG_SFE_ECM=y,) \
modules modules
endef endef

6
package/lean/shortcut-fe/shortcut-fe/src/sfe_cm.c
View File

@ -305,11 +305,11 @@ static unsigned int sfe_cm_post_routing(struct sk_buff *skb, int is_v4)
struct net_device *dest_dev; struct net_device *dest_dev;
struct net_device *src_dev_tmp; struct net_device *src_dev_tmp;
struct net_device *dest_dev_tmp; struct net_device *dest_dev_tmp;
struct sk_buff *tmp_skb = NULL;
struct net_device *src_br_dev = NULL; struct net_device *src_br_dev = NULL;
struct net_device *dest_br_dev = NULL; struct net_device *dest_br_dev = NULL;
struct nf_conntrack_tuple orig_tuple; struct nf_conntrack_tuple orig_tuple;
struct nf_conntrack_tuple reply_tuple; struct nf_conntrack_tuple reply_tuple;
struct sk_buff *tmp_skb = NULL;
SFE_NF_CONN_ACCT(acct); SFE_NF_CONN_ACCT(acct);
/* /*
@ -527,7 +527,7 @@ static unsigned int sfe_cm_post_routing(struct sk_buff *skb, int is_v4)
return NF_ACCEPT; return NF_ACCEPT;
} }
spin_unlock_bh(&ct->lock); spin_unlock_bh(&ct->lock);
/* /*
* Somehow, SFE is not playing nice with IPSec traffic. * Somehow, SFE is not playing nice with IPSec traffic.
* Do not accelerate for now. * Do not accelerate for now.
@ -934,7 +934,7 @@ static void sfe_cm_sync_rule(struct sfe_connection_sync *sis)
#else #else
timeouts = nf_ct_timeout_lookup(ct); timeouts = nf_ct_timeout_lookup(ct);
if (!timeouts) { if (!timeouts) {
timeouts = udp_get_timeouts(nf_ct_net(ct)); timeouts = nf_udp_pernet(nf_ct_net(ct))->timeouts;
} }
spin_lock_bh(&ct->lock); spin_lock_bh(&ct->lock);

12
package/lean/shortcut-fe/simulated-driver/Makefile
View File

@ -17,7 +17,6 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=shortcut-fe-simulated-driver PKG_NAME:=shortcut-fe-simulated-driver
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_CONFIG_DEPENDS := CONFIG_IPV6
PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/shortcut-fe PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/shortcut-fe
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
@ -32,14 +31,16 @@ define KernelPackage/shortcut-fe-drv
CATEGORY:=Kernel modules CATEGORY:=Kernel modules
SUBMENU:=Network Support SUBMENU:=Network Support
DEPENDS:=@TARGET_ipq806x||TARGET_ipq807x +kmod-shortcut-fe DEPENDS:=@TARGET_ipq806x||TARGET_ipq807x +kmod-shortcut-fe
KCONFIG:=CONFIG_NET_CLS_ACT=y \ KCONFIG:= \
CONFIG_XFRM=y CONFIG_NET_CLS_ACT=y \
CONFIG_XFRM=y
TITLE:=Simulated sfe driver for ECM TITLE:=Simulated sfe driver for ECM
FILES:=$(PKG_BUILD_DIR)/simulated-driver/shortcut-fe-drv.ko FILES:=$(PKG_BUILD_DIR)/simulated-driver/shortcut-fe-drv.ko
endef endef
define KernelPackage/shortcut-fe-drv/Description 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. Simulated sfe driver which act as an adapter to convert message
between a connection manager and the SFE core engine.
endef endef
define Build/Compile define Build/Compile
@ -47,8 +48,7 @@ define Build/Compile
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
$(PKG_MAKE_FLAGS) \ $(PKG_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)/simulated-driver" \ M="$(PKG_BUILD_DIR)/simulated-driver" \
$(if $(CONFIG_IPV6),EXTRA_CFLAGS+="-DSFE_SUPPORT_IPV6" SFE_SUPPORT_IPV6=y,) \ EXTRA_CFLAGS="-DSFE_SUPPORT_IPV6" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
modules modules
endef endef