kernel: add hardware offload patch for flow tables support

[openwrt/openwrt.git] / target / linux / generic / pending-4.14 / 644-net-pppoe-support-hardware-flow-table-offload.patch

diff --git a/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch
new file mode 100644 (file)
index 0000000..9259fe8
--- /dev/null
+++ b/target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch
@@ -0,0 +1,110 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Thu, 15 Mar 2018 21:15:00 +0100
+Subject: [PATCH] net: pppoe: support hardware flow table offload
+
+Pass on the PPPoE session ID and the remote MAC address
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/drivers/net/ppp/ppp_generic.c
++++ b/drivers/net/ppp/ppp_generic.c
+@@ -56,6 +56,9 @@
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
+ 
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_flow_table.h>
++
+ #define PPP_VERSION   "2.4.2"
+ 
+ /*
+@@ -1383,12 +1386,33 @@ static void ppp_dev_priv_destructor(stru
+               ppp_destroy_interface(ppp);
+ }
+ 
++static int ppp_flow_offload_check(struct flow_offload_hw_path *path)
++{
++      struct ppp *ppp = netdev_priv(path->dev);
++      struct ppp_channel *chan;
++      struct channel *pch;
++
++      if (ppp->flags & SC_MULTILINK)
++              return -EOPNOTSUPP;
++
++      if (list_empty(&ppp->channels))
++              return -ENODEV;
++
++      pch = list_first_entry(&ppp->channels, struct channel, clist);
++      chan = pch->chan;
++      if (!chan->ops->flow_offload_check)
++              return -EOPNOTSUPP;
++
++      return chan->ops->flow_offload_check(chan, path);
++}
++
+ static const struct net_device_ops ppp_netdev_ops = {
+       .ndo_init        = ppp_dev_init,
+       .ndo_uninit      = ppp_dev_uninit,
+       .ndo_start_xmit  = ppp_start_xmit,
+       .ndo_do_ioctl    = ppp_net_ioctl,
+       .ndo_get_stats64 = ppp_get_stats64,
++      .ndo_flow_offload_check = ppp_flow_offload_check,
+ };
+ 
+ static struct device_type ppp_type = {
+--- a/drivers/net/ppp/pppoe.c
++++ b/drivers/net/ppp/pppoe.c
+@@ -77,6 +77,8 @@
+ #include <linux/file.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
++#include <linux/netfilter.h>
++#include <net/netfilter/nf_flow_table.h>
+ 
+ #include <linux/nsproxy.h>
+ #include <net/net_namespace.h>
+@@ -970,8 +972,32 @@ static int pppoe_xmit(struct ppp_channel
+       return __pppoe_xmit(sk, skb);
+ }
+ 
++static int pppoe_flow_offload_check(struct ppp_channel *chan,
++                                  struct flow_offload_hw_path *path)
++{
++      struct sock *sk = (struct sock *)chan->private;
++      struct pppox_sock *po = pppox_sk(sk);
++      struct net_device *dev = po->pppoe_dev;
++
++      if (sock_flag(sk, SOCK_DEAD) ||
++          !(sk->sk_state & PPPOX_CONNECTED) || !dev)
++              return -ENODEV;
++
++      path->dev = po->pppoe_dev;
++      path->flags |= FLOW_OFFLOAD_PATH_PPPOE;
++      memcpy(path->eth_src, po->pppoe_dev->dev_addr, ETH_ALEN);
++      memcpy(path->eth_dest, po->pppoe_pa.remote, ETH_ALEN);
++      path->pppoe_sid = be16_to_cpu(po->num);
++
++      if (path->dev->netdev_ops->ndo_flow_offload_check)
++              return path->dev->netdev_ops->ndo_flow_offload_check(path);
++
++      return 0;
++}
++
+ static const struct ppp_channel_ops pppoe_chan_ops = {
+       .start_xmit = pppoe_xmit,
++      .flow_offload_check = pppoe_flow_offload_check,
+ };
+ 
+ static int pppoe_recvmsg(struct socket *sock, struct msghdr *m,
+--- a/include/linux/ppp_channel.h
++++ b/include/linux/ppp_channel.h
+@@ -32,6 +32,8 @@ struct ppp_channel_ops {
+       int     (*start_xmit)(struct ppp_channel *, struct sk_buff *);
+       /* Handle an ioctl call that has come in via /dev/ppp. */
+       int     (*ioctl)(struct ppp_channel *, unsigned int, unsigned long);
++
++      int     (*flow_offload_check)(struct ppp_channel *, struct flow_offload_hw_path *);
+ };
+ 
+ struct ppp_channel {