From 737595f75328d06ba4f1fb12dd39c233b9919259 Mon Sep 17 00:00:00 2001 From: Xiaoping Fan Date: Fri, 26 Feb 2016 15:01:53 -0800 Subject: [PATCH 2/2] net: patch linux kernel to support shortcut-fe Change-Id: Icaa7c172a06df1c3bc89ff89814d1136772fe217 Signed-off-by: Xiaoping Fan --- include/linux/if_bridge.h | 3 +++ include/linux/skbuff.h | 4 +++ include/net/netfilter/nf_conntrack_ecache.h | 2 ++ net/Kconfig | 3 +++ net/bridge/br_if.c | 20 +++++++++++++++ net/core/dev.c | 27 +++++++++++++++++++++ net/netfilter/nf_conntrack_ecache.c | 24 +++++++++++++++++- 7 files changed, 86 insertions(+), 1 deletion(-) --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -72,6 +72,9 @@ void brioctl_set(int (*hook)(struct net int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd, struct ifreq *ifr, void __user *uarg); +extern void br_dev_update_stats(struct net_device *dev, + struct rtnl_link_stats64 *nlstats); + #if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING) int br_multicast_list_adjacent(struct net_device *dev, struct list_head *br_ip_list); --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1011,6 +1011,9 @@ struct sk_buff { __u8 csum_not_inet:1; #endif __u8 unreadable:1; +#ifdef CONFIG_SHORTCUT_FE + __u8 fast_forwarded:1; +#endif #if defined(CONFIG_NET_SCHED) || defined(CONFIG_NET_XGRESS) __u16 tc_index; /* traffic control index */ #endif --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h @@ -68,6 +68,8 @@ struct nf_ct_event_notifier { #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); +extern int nf_conntrack_register_chain_notifier(struct net *net, struct notifier_block *nb); +extern int nf_conntrack_unregister_chain_notifier(struct net *net, struct notifier_block *nb); #else int nf_conntrack_register_notifier(struct net *net, const struct nf_ct_event_notifier *nb); --- a/net/Kconfig +++ b/net/Kconfig @@ -518,6 +518,9 @@ config FAILOVER migration of VMs with direct attached VFs by failing over to the paravirtual datapath when the VF is unplugged. +config SHORTCUT_FE + bool "Enables kernel network stack path for Shortcut Forwarding Engine" + config ETHTOOL_NETLINK bool "Netlink interface for ethtool" select DIMLIB --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -764,6 +764,26 @@ void br_port_flags_change(struct net_bri br_recalculate_neigh_suppress_enabled(br); } +void br_dev_update_stats(struct net_device *dev, + struct rtnl_link_stats64 *nlstats) +{ + struct pcpu_sw_netstats *stats; + + /* Is this a bridge? */ + if (!(dev->priv_flags & IFF_EBRIDGE)) + return; + + stats = this_cpu_ptr(dev->tstats); + + u64_stats_update_begin(&stats->syncp); + u64_stats_add(&stats->rx_packets, nlstats->rx_packets); + u64_stats_add(&stats->rx_bytes, nlstats->rx_bytes); + u64_stats_add(&stats->tx_packets, nlstats->tx_packets); + u64_stats_add(&stats->tx_bytes, nlstats->tx_bytes); + u64_stats_update_end(&stats->syncp); +} +EXPORT_SYMBOL_GPL(br_dev_update_stats); + bool br_port_flag_is_set(const struct net_device *dev, unsigned long flag) { struct net_bridge_port *p; --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3643,8 +3643,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 (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); +#ifdef CONFIG_SHORTCUT_FE + } +#endif #ifdef CONFIG_ETHERNET_PACKET_MANGLE if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb))) @@ -5493,6 +5502,11 @@ void netdev_rx_handler_unregister(struct } EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); +#ifdef CONFIG_SHORTCUT_FE +int (*athrs_fast_nat_recv)(struct sk_buff *skb) __rcu __read_mostly; +EXPORT_SYMBOL_GPL(athrs_fast_nat_recv); +#endif + /* * Limit the use of PFMEMALLOC reserves to those protocols that implement * the special handling of PFMEMALLOC skbs. @@ -5541,6 +5555,10 @@ static int __netif_receive_skb_core(stru int ret = NET_RX_DROP; __be16 type; +#ifdef CONFIG_SHORTCUT_FE + int (*fast_recv)(struct sk_buff *skb); +#endif + net_timestamp_check(!READ_ONCE(net_hotdata.tstamp_prequeue), skb); trace_netif_receive_skb(skb); @@ -5579,6 +5597,16 @@ another_round: goto out; } +#ifdef CONFIG_SHORTCUT_FE + fast_recv = rcu_dereference(athrs_fast_nat_recv); + if (fast_recv) { + if (fast_recv(skb)) { + ret = NET_RX_SUCCESS; + goto out; + } + } +#endif + if (skb_skip_tc_classify(skb)) goto skip_classify; --- a/net/netfilter/nf_conntrack_ecache.c +++ b/net/netfilter/nf_conntrack_ecache.c @@ -143,12 +143,24 @@ static int __nf_conntrack_eventmask_repo rcu_read_lock(); notify = rcu_dereference(net->ct.nf_conntrack_event_cb); - if (!notify) { +#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS + if (!notify && !rcu_dereference_raw(net->ct.nf_conntrack_chain.head)) +#else + if (!notify) +#endif + { rcu_read_unlock(); return 0; } +#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS + ret = atomic_notifier_call_chain(&net->ct.nf_conntrack_chain, + events | missed, &item); + if (notify) + ret = notify->ct_event(events | missed, item); +#else ret = notify->ct_event(events | missed, item); +#endif rcu_read_unlock(); if (likely(ret >= 0 && missed == 0)) @@ -339,6 +351,11 @@ int nf_conntrack_register_notifier(struc { return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); } +int nf_conntrack_register_chain_notifier(struct net *net, struct notifier_block *nb) +{ + return atomic_notifier_chain_register(&net->ct.nf_conntrack_chain, nb); +} +EXPORT_SYMBOL_GPL(nf_conntrack_register_chain_notifier); #else int nf_conntrack_register_notifier(struct net *net, const struct nf_ct_event_notifier *new) @@ -369,6 +386,11 @@ int nf_conntrack_unregister_notifier(str { return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb); } +int nf_conntrack_unregister_chain_notifier(struct net *net, struct notifier_block *nb) +{ + return atomic_notifier_chain_unregister(&net->ct.nf_conntrack_chain, nb); +} +EXPORT_SYMBOL_GPL(nf_conntrack_unregister_chain_notifier); #else void nf_conntrack_unregister_notifier(struct net *net) {