From b67acfdec381e3fd0bc4e9bb4c4a519af5191401 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 16 May 2018 16:57:48 +0800 Subject: [PATCH] pending SFE patch temp remove --- ...-linux-kernel-to-support-shortcut-fe.patch | 112 ------ ...ridge-APIs-needed-for-network-HW-acc.patch | 45 --- ...k-events-support-multiple-registrant.patch | 325 ------------------ 3 files changed, 482 deletions(-) delete mode 100644 target/linux/generic/hack-4.14/950-net-patch-linux-kernel-to-support-shortcut-fe.patch delete mode 100644 target/linux/generic/hack-4.14/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch delete mode 100644 target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch diff --git a/target/linux/generic/hack-4.14/950-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-4.14/950-net-patch-linux-kernel-to-support-shortcut-fe.patch deleted file mode 100644 index 46a76b2e2..000000000 --- a/target/linux/generic/hack-4.14/950-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: linux-4.14.18/include/linux/skbuff.h -=================================================================== ---- linux-4.14.18.orig/include/linux/skbuff.h -+++ linux-4.14.18/include/linux/skbuff.h -@@ -770,6 +770,9 @@ struct sk_buff { - #endif - __u8 ipvs_property:1; - __u8 inner_protocol_type:1; -+#ifdef CONFIG_SHORTCUT_FE -+ __u8 fast_forwarded:1; -+#endif - __u8 remcsum_offload:1; - #ifdef CONFIG_NET_SWITCHDEV - __u8 offload_fwd_mark:1; -Index: linux-4.14.18/net/Kconfig -=================================================================== ---- linux-4.14.18.orig/net/Kconfig -+++ linux-4.14.18/net/Kconfig -@@ -453,3 +453,5 @@ config HAVE_CBPF_JIT - # Extended BPF JIT (eBPF) - config HAVE_EBPF_JIT - bool -+config SHORTCUT_FE -+ bool "Enables kernel network stack path for Shortcut Forwarding Engine" -Index: linux-4.14.18/net/core/dev.c -=================================================================== ---- linux-4.14.18.orig/net/core/dev.c -+++ linux-4.14.18/net/core/dev.c -@@ -2972,8 +2972,17 @@ static int xmit_one(struct sk_buff *skb, - unsigned int len; - int rc; - -+#ifdef CONFIG_SHORTCUT_FE -+ /* If this skb has been fast forwarded then we don't want it to -+ * go to any taps (by definition we're trying to bypass them). -+ */ -+ if (!skb->fast_forwarded) { -+#endif - if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) - dev_queue_xmit_nit(skb, dev); -+#ifdef CONFIG_SHORTCUT_FE -+ } -+#endif - - len = skb->len; - trace_net_dev_start_xmit(skb, dev); -@@ -4267,6 +4276,11 @@ void netdev_rx_handler_unregister(struct - } - EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); - -+#ifdef CONFIG_SHORTCUT_FE -+int (*fast_nat_recv)(struct sk_buff *skb) __rcu __read_mostly; -+EXPORT_SYMBOL_GPL(fast_nat_recv); -+#endif -+ - /* - * Limit the use of PFMEMALLOC reserves to those protocols that implement - * the special handling of PFMEMALLOC skbs. -@@ -4314,6 +4328,9 @@ static int __netif_receive_skb_core(stru - bool deliver_exact = false; - int ret = NET_RX_DROP; - __be16 type; -+#ifdef CONFIG_SHORTCUT_FE -+ int (*fast_recv)(struct sk_buff *skb); -+#endif - - net_timestamp_check(!netdev_tstamp_prequeue, skb); - -@@ -4340,6 +4357,14 @@ another_round: - goto out; - } - -+#ifdef CONFIG_SHORTCUT_FE -+ fast_recv = rcu_dereference(fast_nat_recv); -+ if (fast_recv && fast_recv(skb)) { -+ ret = NET_RX_SUCCESS; -+ goto out; -+ } -+#endif -+ - if (skb_skip_tc_classify(skb)) - goto skip_classify; - -Index: linux-4.14.18/net/netfilter/nf_conntrack_proto_tcp.c -=================================================================== ---- linux-4.14.18.orig/net/netfilter/nf_conntrack_proto_tcp.c -+++ linux-4.14.18/net/netfilter/nf_conntrack_proto_tcp.c -@@ -33,10 +33,24 @@ - #include - #include - -+ /* Do not check the TCP window for incoming packets */ -+#ifdef CONFIG_SHORTCUT_FE -+int nf_ct_tcp_no_window_check __read_mostly = 0; -+EXPORT_SYMBOL_GPL(nf_ct_tcp_no_window_check); -+#else -+static int nf_ct_tcp_no_window_check __read_mostly = 1; -+#endif -+ - /* "Be conservative in what you do, - be liberal in what you accept from others." - If it's non-zero, we mark only out of window RST segments as INVALID. */ -+ -+#ifdef CONFIG_SHORTCUT_FE -+int nf_ct_tcp_be_liberal __read_mostly = 0; -+EXPORT_SYMBOL_GPL(nf_ct_tcp_be_liberal); -+#else - static int nf_ct_tcp_be_liberal __read_mostly = 0; -+#endif - - /* If it is set to zero, we disable picking up already established - connections. */ diff --git a/target/linux/generic/hack-4.14/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch b/target/linux/generic/hack-4.14/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch deleted file mode 100644 index 4401ac46a..000000000 --- a/target/linux/generic/hack-4.14/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: linux-4.14.18/include/linux/if_bridge.h -=================================================================== ---- linux-4.14.18.orig/include/linux/if_bridge.h -+++ linux-4.14.18/include/linux/if_bridge.h -@@ -53,6 +53,7 @@ struct br_ip_list { - #define BR_DEFAULT_AGEING_TIME (300 * HZ) - - extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); -+extern void br_dev_update_stats(struct net_device *dev, struct rtnl_link_stats64 *nlstats); - - typedef int br_should_route_hook_t(struct sk_buff *skb); - extern br_should_route_hook_t __rcu *br_should_route_hook; -Index: linux-4.14.18/net/bridge/br_if.c -=================================================================== ---- linux-4.14.18.orig/net/bridge/br_if.c -+++ linux-4.14.18/net/bridge/br_if.c -@@ -654,3 +654,28 @@ void br_port_flags_change(struct net_bri - if (mask & BR_AUTO_MASK) - nbp_update_port_count(br); - } -+ -+/* Update bridge statistics for bridge packets processed by offload engines */ -+void br_dev_update_stats(struct net_device *dev, struct rtnl_link_stats64 *nlstats) -+{ -+ struct net_bridge *br; -+ struct pcpu_sw_netstats *stats; -+ -+ /* -+ * Is this a bridge? -+ */ -+ if (!(dev->priv_flags & IFF_EBRIDGE)) { -+ return; -+ } -+ -+ br = netdev_priv(dev); -+ stats = this_cpu_ptr(br->stats); -+ -+ u64_stats_update_begin(&stats->syncp); -+ stats->rx_packets += nlstats->rx_packets; -+ stats->rx_bytes += nlstats->rx_bytes; -+ stats->tx_packets += nlstats->tx_packets; -+ stats->tx_bytes += nlstats->tx_bytes; -+ u64_stats_update_end(&stats->syncp); -+} -+EXPORT_SYMBOL_GPL(br_dev_update_stats); diff --git a/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch deleted file mode 100644 index 7a302e06a..000000000 --- a/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch +++ /dev/null @@ -1,325 +0,0 @@ -Index: linux-4.14.18/include/net/netfilter/nf_conntrack_ecache.h -=================================================================== ---- linux-4.14.18.orig/include/net/netfilter/nf_conntrack_ecache.h -+++ linux-4.14.18/include/net/netfilter/nf_conntrack_ecache.h -@@ -71,6 +71,10 @@ struct nf_ct_event { - int report; - }; - -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+extern int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb); -+extern int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb); -+#else - struct nf_ct_event_notifier { - int (*fcn)(unsigned int events, struct nf_ct_event *item); - }; -@@ -79,7 +83,7 @@ int nf_conntrack_register_notifier(struc - struct nf_ct_event_notifier *nb); - void nf_conntrack_unregister_notifier(struct net *net, - struct nf_ct_event_notifier *nb); -- -+#endif - void nf_ct_deliver_cached_events(struct nf_conn *ct); - int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, - u32 portid, int report); -@@ -87,12 +91,15 @@ int nf_conntrack_eventmask_report(unsign - static inline void - nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) - { -- struct net *net = nf_ct_net(ct); - struct nf_conntrack_ecache *e; -+#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+ struct net *net = nf_ct_net(ct); - - if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) - return; - -+#endif -+ - e = nf_ct_ecache_find(ct); - if (e == NULL) - return; -@@ -104,10 +111,12 @@ static inline int - nf_conntrack_event_report(enum ip_conntrack_events event, struct nf_conn *ct, - u32 portid, int report) - { -+#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS - const struct net *net = nf_ct_net(ct); - - if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) - return 0; -+#endif - - return nf_conntrack_eventmask_report(1 << event, ct, portid, report); - } -@@ -115,11 +124,14 @@ nf_conntrack_event_report(enum ip_conntr - static inline int - nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct) - { -+#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS - const struct net *net = nf_ct_net(ct); - - if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb)) - return 0; - -+#endif -+ - return nf_conntrack_eventmask_report(1 << event, ct, 0, 0); - } - -Index: linux-4.14.18/include/net/netns/conntrack.h -=================================================================== ---- linux-4.14.18.orig/include/net/netns/conntrack.h -+++ linux-4.14.18/include/net/netns/conntrack.h -@@ -114,7 +114,11 @@ struct netns_ct { - - struct ct_pcpu __percpu *pcpu_lists; - struct ip_conntrack_stat __percpu *stat; -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+ struct atomic_notifier_head nf_conntrack_chain; -+#else - struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb; -+#endif - struct nf_exp_event_notifier __rcu *nf_expect_event_cb; - struct nf_ip_net nf_ct_proto; - #if defined(CONFIG_NF_CONNTRACK_LABELS) -Index: linux-4.14.18/net/netfilter/Kconfig -=================================================================== ---- linux-4.14.18.orig/net/netfilter/Kconfig -+++ linux-4.14.18/net/netfilter/Kconfig -@@ -118,6 +118,14 @@ config NF_CONNTRACK_EVENTS - - If unsure, say `N'. - -+config NF_CONNTRACK_CHAIN_EVENTS -+ bool "Register multiple callbacks to ct events" -+ depends on NF_CONNTRACK_EVENTS -+ help -+ Support multiple registrations. -+ -+ If unsure, say `N'. -+ - config NF_CONNTRACK_TIMEOUT - bool 'Connection tracking timeout' - depends on NETFILTER_ADVANCED -Index: linux-4.14.18/net/netfilter/nf_conntrack_core.c -=================================================================== ---- linux-4.14.18.orig/net/netfilter/nf_conntrack_core.c -+++ linux-4.14.18/net/netfilter/nf_conntrack_core.c -@@ -2167,6 +2167,10 @@ int nf_conntrack_init_net(struct net *ne - ret = nf_conntrack_proto_pernet_init(net); - if (ret < 0) - goto err_proto; -+ -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+ ATOMIC_INIT_NOTIFIER_HEAD(&net->ct.nf_conntrack_chain); -+#endif - return 0; - - err_proto: -Index: linux-4.14.18/net/netfilter/nf_conntrack_ecache.c -=================================================================== ---- linux-4.14.18.orig/net/netfilter/nf_conntrack_ecache.c -+++ linux-4.14.18/net/netfilter/nf_conntrack_ecache.c -@@ -18,6 +18,9 @@ - #include - #include - #include -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+#include -+#endif - #include - #include - #include -@@ -117,6 +120,38 @@ static void ecache_work(struct work_stru - schedule_delayed_work(&ctnet->ecache_dwork, delay); - } - -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+int -+nf_conntrack_eventmask_report(unsigned int eventmask, -+ struct nf_conn *ct, -+ u32 portid, -+ int report) -+{ -+ struct nf_conntrack_ecache *e; -+ struct net *net = nf_ct_net(ct); -+ -+ e = nf_ct_ecache_find(ct); -+ if (e == NULL) -+ return 0; -+ -+ if (nf_ct_is_confirmed(ct)) { -+ struct nf_ct_event item = { -+ .ct = ct, -+ .portid = e->portid ? e->portid : portid, -+ .report = report -+ }; -+ /* This is a resent of a destroy event? If so, skip missed */ -+ unsigned long missed = e->portid ? 0 : e->missed; -+ -+ if (!((eventmask | missed) & e->ctmask)) -+ return 0; -+ -+ atomic_notifier_call_chain(&net->ct.nf_conntrack_chain, eventmask | missed, &item); -+ } -+ -+ return 0; -+} -+#else - int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, - u32 portid, int report) - { -@@ -171,10 +206,52 @@ out_unlock: - rcu_read_unlock(); - return ret; - } -+#endif - EXPORT_SYMBOL_GPL(nf_conntrack_eventmask_report); - - /* deliver cached events and clear cache entry - must be called with locally - * disabled softirqs */ -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+void nf_ct_deliver_cached_events(struct nf_conn *ct) -+{ -+ unsigned long events, missed; -+ struct nf_conntrack_ecache *e; -+ struct nf_ct_event item; -+ struct net *net = nf_ct_net(ct); -+ -+ e = nf_ct_ecache_find(ct); -+ if (e == NULL) -+ return; -+ -+ events = xchg(&e->cache, 0); -+ -+ if (!nf_ct_is_confirmed(ct) || nf_ct_is_dying(ct) || !events) -+ return; -+ -+ /* We make a copy of the missed event cache without taking -+ * the lock, thus we may send missed events twice. However, -+ * this does not harm and it happens very rarely. */ -+ missed = e->missed; -+ -+ if (!((events | missed) & e->ctmask)) -+ return; -+ -+ item.ct = ct; -+ item.portid = 0; -+ item.report = 0; -+ -+ atomic_notifier_call_chain(&net->ct.nf_conntrack_chain, -+ events | missed, -+ &item); -+ -+ if (likely(!missed)) -+ return; -+ -+ spin_lock_bh(&ct->lock); -+ e->missed &= ~missed; -+ spin_unlock_bh(&ct->lock); -+} -+#else - void nf_ct_deliver_cached_events(struct nf_conn *ct) - { - struct net *net = nf_ct_net(ct); -@@ -225,6 +302,7 @@ void nf_ct_deliver_cached_events(struct - out_unlock: - rcu_read_unlock(); - } -+#endif - EXPORT_SYMBOL_GPL(nf_ct_deliver_cached_events); - - void nf_ct_expect_event_report(enum ip_conntrack_expect_events event, -@@ -257,6 +335,12 @@ out_unlock: - rcu_read_unlock(); - } - -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb) -+{ -+ return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); -+} -+#else - int nf_conntrack_register_notifier(struct net *net, - struct nf_ct_event_notifier *new) - { -@@ -277,8 +361,15 @@ out_unlock: - mutex_unlock(&nf_ct_ecache_mutex); - return ret; - } -+#endif - EXPORT_SYMBOL_GPL(nf_conntrack_register_notifier); - -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb) -+{ -+ return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb); -+} -+#else - void nf_conntrack_unregister_notifier(struct net *net, - struct nf_ct_event_notifier *new) - { -@@ -292,6 +383,7 @@ void nf_conntrack_unregister_notifier(st - mutex_unlock(&nf_ct_ecache_mutex); - /* synchronize_rcu() is called from ctnetlink_exit. */ - } -+#endif - EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier); - - int nf_ct_expect_register_notifier(struct net *net, -Index: linux-4.14.18/net/netfilter/nf_conntrack_netlink.c -=================================================================== ---- linux-4.14.18.orig/net/netfilter/nf_conntrack_netlink.c -+++ linux-4.14.18/net/netfilter/nf_conntrack_netlink.c -@@ -28,6 +28,11 @@ - #include - #include - #include -+ -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+#include -+#endif -+ - #include - - #include -@@ -618,14 +623,22 @@ static size_t ctnetlink_nlmsg_size(const - ; - } - -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+static int ctnetlink_conntrack_event(struct notifier_block *this, -+ unsigned long events, void *ptr) -+#else - static int - ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item) -+#endif - { - const struct nf_conntrack_zone *zone; - struct net *net; - struct nlmsghdr *nlh; - struct nfgenmsg *nfmsg; - struct nlattr *nest_parms; -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+ struct nf_ct_event *item = (struct nf_ct_event *)ptr; -+#endif - struct nf_conn *ct = item->ct; - struct sk_buff *skb; - unsigned int type; -@@ -3290,9 +3303,15 @@ static int ctnetlink_stat_exp_cpu(struct - } - - #ifdef CONFIG_NF_CONNTRACK_EVENTS -+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS -+static struct notifier_block ctnl_notifier = { -+ .notifier_call = ctnetlink_conntrack_event, -+}; -+#else - static struct nf_ct_event_notifier ctnl_notifier = { - .fcn = ctnetlink_conntrack_event, - }; -+#endif - - static struct nf_exp_event_notifier ctnl_notifier_exp = { - .fcn = ctnetlink_expect_event,