developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 1 | From fd6e50fdeb1d943b889a5aa093790a798ae598d3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sam Shih <sam.shih@mediatek.com> |
| 3 | Date: Fri, 2 Jun 2023 13:06:29 +0800 |
| 4 | Subject: [PATCH] |
| 5 | [networking][999-2708-mtkhnat-add-support-for-virtual-interface-acceleration.patch] |
| 6 | |
| 7 | --- |
| 8 | include/net/netfilter/nf_flow_table.h | 3 +++ |
| 9 | net/8021q/vlan_dev.c | 1 + |
| 10 | net/ipv6/ip6_tunnel.c | 24 ++++++++++++++++++++++++ |
| 11 | net/ipv6/sit.c | 24 ++++++++++++++++++++++++ |
| 12 | 4 files changed, 52 insertions(+) |
| 13 | |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 14 | diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 15 | index 16dbf5461..4cb73a7cb 100644 |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 16 | --- a/include/net/netfilter/nf_flow_table.h |
| 17 | +++ b/include/net/netfilter/nf_flow_table.h |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 18 | @@ -94,9 +94,12 @@ struct flow_offload { |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 19 | #define FLOW_OFFLOAD_PATH_VLAN BIT(1) |
| 20 | #define FLOW_OFFLOAD_PATH_PPPOE BIT(2) |
| 21 | #define FLOW_OFFLOAD_PATH_DSA BIT(3) |
| 22 | +#define FLOW_OFFLOAD_PATH_DSLITE BIT(4) |
| 23 | +#define FLOW_OFFLOAD_PATH_6RD BIT(5) |
| 24 | |
| 25 | struct flow_offload_hw_path { |
| 26 | struct net_device *dev; |
| 27 | + struct net_device *virt_dev; |
| 28 | u32 flags; |
| 29 | |
| 30 | u8 eth_src[ETH_ALEN]; |
| 31 | diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 32 | index f973bec77..dbb3cea5c 100644 |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 33 | --- a/net/8021q/vlan_dev.c |
| 34 | +++ b/net/8021q/vlan_dev.c |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 35 | @@ -764,6 +764,7 @@ static int vlan_dev_flow_offload_check(struct flow_offload_hw_path *path) |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 36 | path->flags |= FLOW_OFFLOAD_PATH_VLAN; |
| 37 | path->vlan_proto = vlan->vlan_proto; |
| 38 | path->vlan_id = vlan->vlan_id; |
| 39 | + path->virt_dev = dev; |
| 40 | path->dev = vlan->real_dev; |
| 41 | |
| 42 | if (vlan->real_dev->netdev_ops->ndo_flow_offload_check) |
| 43 | diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 44 | index 71ef26e60..f8302fdd5 100644 |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 45 | --- a/net/ipv6/ip6_tunnel.c |
| 46 | +++ b/net/ipv6/ip6_tunnel.c |
| 47 | @@ -57,6 +57,11 @@ |
| 48 | #include <net/netns/generic.h> |
| 49 | #include <net/dst_metadata.h> |
| 50 | |
| 51 | +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| 52 | +#include <linux/netfilter.h> |
| 53 | +#include <net/netfilter/nf_flow_table.h> |
| 54 | +#endif |
| 55 | + |
| 56 | MODULE_AUTHOR("Ville Nuorvala"); |
| 57 | MODULE_DESCRIPTION("IPv6 tunneling device"); |
| 58 | MODULE_LICENSE("GPL"); |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 59 | @@ -1889,6 +1894,22 @@ int ip6_tnl_get_iflink(const struct net_device *dev) |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 60 | } |
| 61 | EXPORT_SYMBOL(ip6_tnl_get_iflink); |
| 62 | |
| 63 | +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| 64 | +static int ipip6_dev_flow_offload_check(struct flow_offload_hw_path *path) |
| 65 | +{ |
| 66 | + struct net_device *dev = path->dev; |
| 67 | + struct ip6_tnl *tnl = netdev_priv(dev); |
| 68 | + |
| 69 | + if (path->flags & FLOW_OFFLOAD_PATH_DSLITE) |
| 70 | + return -EEXIST; |
| 71 | + |
| 72 | + path->flags |= FLOW_OFFLOAD_PATH_DSLITE; |
| 73 | + path->dev = tnl->dev; |
| 74 | + |
| 75 | + return 0; |
| 76 | +} |
| 77 | +#endif /* CONFIG_NF_FLOW_TABLE */ |
| 78 | + |
| 79 | int ip6_tnl_encap_add_ops(const struct ip6_tnl_encap_ops *ops, |
| 80 | unsigned int num) |
| 81 | { |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 82 | @@ -1950,6 +1971,9 @@ static const struct net_device_ops ip6_tnl_netdev_ops = { |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 83 | .ndo_change_mtu = ip6_tnl_change_mtu, |
| 84 | .ndo_get_stats = ip6_get_stats, |
| 85 | .ndo_get_iflink = ip6_tnl_get_iflink, |
| 86 | +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| 87 | + .ndo_flow_offload_check = ipip6_dev_flow_offload_check, |
| 88 | +#endif |
| 89 | }; |
| 90 | |
| 91 | #define IPXIPX_FEATURES (NETIF_F_SG | \ |
| 92 | diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 93 | index 117960895..0844a95e3 100644 |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 94 | --- a/net/ipv6/sit.c |
| 95 | +++ b/net/ipv6/sit.c |
| 96 | @@ -52,6 +52,11 @@ |
| 97 | #include <net/net_namespace.h> |
| 98 | #include <net/netns/generic.h> |
| 99 | |
| 100 | +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| 101 | +#include <linux/netfilter.h> |
| 102 | +#include <net/netfilter/nf_flow_table.h> |
| 103 | +#endif |
| 104 | + |
| 105 | /* |
| 106 | This version of net/ipv6/sit.c is cloned of net/ipv4/ip_gre.c |
| 107 | |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 108 | @@ -1342,6 +1347,22 @@ done: |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 109 | return err; |
| 110 | } |
| 111 | |
| 112 | +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| 113 | +static int ipip6_dev_flow_offload_check(struct flow_offload_hw_path *path) |
| 114 | +{ |
| 115 | + struct net_device *dev = path->dev; |
| 116 | + struct ip_tunnel *tnl = netdev_priv(dev); |
| 117 | + |
| 118 | + if (path->flags & FLOW_OFFLOAD_PATH_6RD) |
| 119 | + return -EEXIST; |
| 120 | + |
| 121 | + path->flags |= FLOW_OFFLOAD_PATH_6RD; |
| 122 | + path->dev = tnl->dev; |
| 123 | + |
| 124 | + return 0; |
| 125 | +} |
| 126 | +#endif /* CONFIG_NF_FLOW_TABLE */ |
| 127 | + |
| 128 | static const struct net_device_ops ipip6_netdev_ops = { |
| 129 | .ndo_init = ipip6_tunnel_init, |
| 130 | .ndo_uninit = ipip6_tunnel_uninit, |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 131 | @@ -1349,6 +1370,9 @@ static const struct net_device_ops ipip6_netdev_ops = { |
developer | fd40db2 | 2021-04-29 10:08:25 +0800 | [diff] [blame] | 132 | .ndo_do_ioctl = ipip6_tunnel_ioctl, |
| 133 | .ndo_get_stats64 = ip_tunnel_get_stats64, |
| 134 | .ndo_get_iflink = ip_tunnel_get_iflink, |
| 135 | +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| 136 | + .ndo_flow_offload_check = ipip6_dev_flow_offload_check, |
| 137 | +#endif |
| 138 | }; |
| 139 | |
| 140 | static void ipip6_dev_free(struct net_device *dev) |
developer | 5d148cb | 2023-06-02 13:08:11 +0800 | [diff] [blame] | 141 | -- |
| 142 | 2.34.1 |
| 143 | |