| From 6ad9bd65769003ab526e504577e0f747eba14287 Mon Sep 17 00:00:00 2001 |
| From: Bo Jiao <Bo.Jiao@mediatek.com> |
| Date: Wed, 22 Jun 2022 09:42:19 +0800 |
| Subject: [PATCH 1/8] |
| 9990-mt7622-backport-nf-hw-offload-framework-and-upstream-hnat-plus-xt-FLOWOFFLOAD-update-v2 |
| |
| --- |
| drivers/net/ethernet/mediatek/Makefile | 3 +- |
| drivers/net/ethernet/mediatek/mtk_eth_soc.c | 28 +- |
| drivers/net/ethernet/mediatek/mtk_eth_soc.h | 20 +- |
| drivers/net/ethernet/mediatek/mtk_ppe.c | 509 +++++++ |
| drivers/net/ethernet/mediatek/mtk_ppe.h | 288 ++++ |
| .../net/ethernet/mediatek/mtk_ppe_debugfs.c | 214 +++ |
| .../net/ethernet/mediatek/mtk_ppe_offload.c | 526 ++++++++ |
| drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 144 ++ |
| drivers/net/ppp/ppp_generic.c | 22 + |
| drivers/net/ppp/pppoe.c | 24 + |
| include/linux/netdevice.h | 60 + |
| include/linux/ppp_channel.h | 3 + |
| include/net/dsa.h | 10 + |
| include/net/flow_offload.h | 4 + |
| include/net/ip6_route.h | 5 +- |
| .../net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 - |
| include/net/netfilter/nf_conntrack.h | 12 + |
| include/net/netfilter/nf_conntrack_acct.h | 11 + |
| include/net/netfilter/nf_flow_table.h | 264 +++- |
| include/net/netns/conntrack.h | 6 + |
| .../linux/netfilter/nf_conntrack_common.h | 9 +- |
| include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h | 17 + |
| net/8021q/vlan_dev.c | 21 + |
| net/bridge/br_device.c | 49 + |
| net/bridge/br_private.h | 20 + |
| net/bridge/br_vlan.c | 55 + |
| net/core/dev.c | 46 + |
| net/dsa/dsa.c | 9 + |
| net/dsa/slave.c | 41 +- |
| net/ipv4/netfilter/Kconfig | 4 +- |
| net/ipv6/ip6_output.c | 2 +- |
| net/ipv6/netfilter/Kconfig | 3 +- |
| net/ipv6/route.c | 22 +- |
| net/netfilter/Kconfig | 14 +- |
| net/netfilter/Makefile | 4 +- |
| net/netfilter/nf_conntrack_core.c | 20 +- |
| net/netfilter/nf_conntrack_proto_tcp.c | 4 + |
| net/netfilter/nf_conntrack_proto_udp.c | 4 + |
| net/netfilter/nf_conntrack_standalone.c | 34 +- |
| net/netfilter/nf_flow_table_core.c | 446 +++--- |
| net/netfilter/nf_flow_table_ip.c | 455 ++++--- |
| net/netfilter/nf_flow_table_offload.c | 1191 +++++++++++++++++ |
| net/netfilter/xt_FLOWOFFLOAD.c | 719 ++++++++++ |
| 43 files changed, 4913 insertions(+), 432 deletions(-) |
| create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe.c |
| create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe.h |
| create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| create mode 100644 drivers/net/ethernet/mediatek/mtk_ppe_regs.h |
| create mode 100644 include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h |
| create mode 100644 net/netfilter/nf_flow_table_offload.c |
| create mode 100644 net/netfilter/xt_FLOWOFFLOAD.c |
| |
| diff --git a/drivers/net/ethernet/mediatek/Makefile b/drivers/net/ethernet/mediatek/Makefile |
| index 13c5b4e8f..0a6af99f1 100755 |
| --- a/drivers/net/ethernet/mediatek/Makefile |
| +++ b/drivers/net/ethernet/mediatek/Makefile |
| @@ -4,5 +4,6 @@ |
| # |
| |
| obj-$(CONFIG_NET_MEDIATEK_SOC) += mtk_eth.o |
| -mtk_eth-y := mtk_eth_soc.o mtk_sgmii.o mtk_usxgmii.o mtk_eth_path.o mtk_eth_dbg.o mtk_eth_reset.o |
| +mtk_eth-y := mtk_eth_soc.o mtk_sgmii.o mtk_usxgmii.o mtk_eth_path.o mtk_eth_dbg.o mtk_eth_reset.o \ |
| + mtk_ppe.o mtk_ppe_debugfs.o mtk_ppe_offload.o |
| obj-$(CONFIG_NET_MEDIATEK_HNAT) += mtk_hnat/ |
| diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| index 2b21f7ed0..819d8a0be 100755 |
| --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| @@ -3081,6 +3081,7 @@ static int mtk_open(struct net_device *d |
| struct mtk_phylink_priv *phylink_priv = &mac->phylink_priv; |
| int err, i; |
| struct device_node *phy_node; |
| + u32 gdm_config = MTK_GDMA_TO_PDMA; |
| |
| err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0); |
| if (err) { |
| @@ -3157,7 +3158,10 @@ static int mtk_open(struct net_device *d |
| if (!phy_node && eth->xgmii->regmap_sgmii[mac->id]) |
| regmap_write(eth->xgmii->regmap_sgmii[mac->id], SGMSYS_QPHY_PWR_STATE_CTRL, 0); |
| |
| - mtk_gdm_config(eth, mac->id, MTK_GDMA_TO_PDMA); |
| + if (eth->soc->offload_version && mtk_ppe_start(ð->ppe) == 0) |
| + gdm_config = MTK_GDMA_TO_PPE; |
| + |
| + mtk_gdm_config(eth, mac->id, gdm_config); |
| |
| return 0; |
| } |
| @@ -3238,6 +3242,9 @@ static int mtk_stop(struct net_device *d |
| |
| mtk_dma_free(eth); |
| |
| + if (eth->soc->offload_version) |
| + mtk_ppe_stop(ð->ppe); |
| + |
| return 0; |
| } |
| |
| @@ -3915,6 +3922,7 @@ static const struct net_device_ops mtk_n |
| #ifdef CONFIG_NET_POLL_CONTROLLER |
| .ndo_poll_controller = mtk_poll_controller, |
| #endif |
| + .ndo_setup_tc = mtk_eth_setup_tc, |
| }; |
| |
| static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) |
| @@ -4308,6 +4316,17 @@ static int mtk_probe(struct platform_dev |
| goto err_free_dev; |
| } |
| |
| + if (eth->soc->offload_version) { |
| + err = mtk_ppe_init(ð->ppe, eth->dev, |
| + eth->base + MTK_ETH_PPE_BASE, 2); |
| + if (err) |
| + goto err_free_dev; |
| + |
| + err = mtk_eth_offload_init(eth); |
| + if (err) |
| + goto err_free_dev; |
| + } |
| + |
| for (i = 0; i < MTK_MAX_DEVS; i++) { |
| if (!eth->netdev[i]) |
| continue; |
| @@ -4410,6 +4429,7 @@ static const struct mtk_soc_data mt2701_ |
| .required_clks = MT7623_CLKS_BITMAP, |
| .required_pctl = true, |
| .has_sram = false, |
| + .offload_version = 2, |
| .txrx = { |
| .txd_size = sizeof(struct mtk_tx_dma), |
| .rxd_size = sizeof(struct mtk_rx_dma), |
| @@ -4424,6 +4444,7 @@ static const struct mtk_soc_data mt7621_ |
| .required_clks = MT7621_CLKS_BITMAP, |
| .required_pctl = false, |
| .has_sram = false, |
| + .offload_version = 2, |
| .txrx = { |
| .txd_size = sizeof(struct mtk_tx_dma), |
| .rxd_size = sizeof(struct mtk_rx_dma), |
| @@ -4439,6 +4460,7 @@ static const struct mtk_soc_data mt7622_ |
| .required_clks = MT7622_CLKS_BITMAP, |
| .required_pctl = false, |
| .has_sram = false, |
| + .offload_version = 2, |
| .txrx = { |
| .txd_size = sizeof(struct mtk_tx_dma), |
| .rxd_size = sizeof(struct mtk_rx_dma), |
| @@ -4453,6 +4475,7 @@ static const struct mtk_soc_data mt7623_ |
| .required_clks = MT7623_CLKS_BITMAP, |
| .required_pctl = true, |
| .has_sram = false, |
| + .offload_version = 2, |
| .txrx = { |
| .txd_size = sizeof(struct mtk_tx_dma), |
| .rxd_size = sizeof(struct mtk_rx_dma), |
| diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| index b6380ffeb..349f98503 100755 |
| --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| @@ -15,6 +15,8 @@ |
| #include <linux/u64_stats_sync.h> |
| #include <linux/refcount.h> |
| #include <linux/phylink.h> |
| +#include <linux/rhashtable.h> |
| +#include "mtk_ppe.h" |
| |
| #define MTK_QDMA_PAGE_SIZE 2048 |
| #define MTK_MAX_RX_LENGTH 1536 |
| @@ -37,7 +39,8 @@ |
| NETIF_F_HW_VLAN_CTAG_TX | \ |
| NETIF_F_SG | NETIF_F_TSO | \ |
| NETIF_F_TSO6 | \ |
| - NETIF_F_IPV6_CSUM) |
| + NETIF_F_IPV6_CSUM |\ |
| + NETIF_F_HW_TC) |
| #define MTK_SET_FEATURES (NETIF_F_LRO | \ |
| NETIF_F_HW_VLAN_CTAG_RX) |
| #define MTK_HW_FEATURES_MT7628 (NETIF_F_SG | NETIF_F_RXCSUM) |
| @@ -107,6 +110,7 @@ |
| #define MTK_GDMA_TCS_EN BIT(21) |
| #define MTK_GDMA_UCS_EN BIT(20) |
| #define MTK_GDMA_TO_PDMA 0x0 |
| +#define MTK_GDMA_TO_PPE 0x4444 |
| #define MTK_GDMA_DROP_ALL 0x7777 |
| |
| /* Unicast Filter MAC Address Register - Low */ |
| @@ -547,6 +551,12 @@ |
| #define RX_DMA_TCI(_x) ((_x) & (VLAN_PRIO_MASK | VLAN_VID_MASK)) |
| #define RX_DMA_VPID(_x) (((_x) >> 16) & 0xffff) |
| |
| +/* QDMA descriptor rxd4 */ |
| +#define MTK_RXD4_FOE_ENTRY GENMASK(13, 0) |
| +#define MTK_RXD4_PPE_CPU_REASON GENMASK(18, 14) |
| +#define MTK_RXD4_SRC_PORT GENMASK(21, 19) |
| +#define MTK_RXD4_ALG GENMASK(31, 22) |
| + |
| /* QDMA descriptor rxd4 */ |
| #define RX_DMA_L4_VALID BIT(24) |
| #define RX_DMA_L4_VALID_PDMA BIT(30) /* when PDMA is used */ |
| @@ -1158,6 +1168,7 @@ struct mtk_soc_data { |
| u32 caps; |
| u32 required_clks; |
| bool required_pctl; |
| + u8 offload_version; |
| netdev_features_t hw_features; |
| bool has_sram; |
| }; |
| @@ -1271,6 +1282,9 @@ struct mtk_eth { |
| int ip_align; |
| spinlock_t syscfg0_lock; |
| struct timer_list mtk_dma_monitor_timer; |
| + |
| + struct mtk_ppe ppe; |
| + struct rhashtable flow_table; |
| }; |
| |
| /* struct mtk_mac - the structure that holds the info about the MACs of the |
| @@ -1319,4 +1333,8 @@ int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id); |
| void mtk_gdm_config(struct mtk_eth *eth, u32 config); |
| void ethsys_reset(struct mtk_eth *eth, u32 reset_bits); |
| |
| +int mtk_eth_offload_init(struct mtk_eth *eth); |
| +int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
| + void *type_data); |
| + |
| int mtk_mac2xgmii_id(struct mtk_eth *eth, int mac_id); |
| diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c |
| new file mode 100644 |
| index 000000000..66298e223 |
| --- /dev/null |
| +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c |
| @@ -0,0 +1,509 @@ |
| +// SPDX-License-Identifier: GPL-2.0-only |
| +/* Copyright (C) 2020 Felix Fietkau <nbd@nbd.name> */ |
| + |
| +#include <linux/kernel.h> |
| +#include <linux/io.h> |
| +#include <linux/iopoll.h> |
| +#include <linux/etherdevice.h> |
| +#include <linux/platform_device.h> |
| +#include "mtk_ppe.h" |
| +#include "mtk_ppe_regs.h" |
| + |
| +static void ppe_w32(struct mtk_ppe *ppe, u32 reg, u32 val) |
| +{ |
| + writel(val, ppe->base + reg); |
| +} |
| + |
| +static u32 ppe_r32(struct mtk_ppe *ppe, u32 reg) |
| +{ |
| + return readl(ppe->base + reg); |
| +} |
| + |
| +static u32 ppe_m32(struct mtk_ppe *ppe, u32 reg, u32 mask, u32 set) |
| +{ |
| + u32 val; |
| + |
| + val = ppe_r32(ppe, reg); |
| + val &= ~mask; |
| + val |= set; |
| + ppe_w32(ppe, reg, val); |
| + |
| + return val; |
| +} |
| + |
| +static u32 ppe_set(struct mtk_ppe *ppe, u32 reg, u32 val) |
| +{ |
| + return ppe_m32(ppe, reg, 0, val); |
| +} |
| + |
| +static u32 ppe_clear(struct mtk_ppe *ppe, u32 reg, u32 val) |
| +{ |
| + return ppe_m32(ppe, reg, val, 0); |
| +} |
| + |
| +static int mtk_ppe_wait_busy(struct mtk_ppe *ppe) |
| +{ |
| + int ret; |
| + u32 val; |
| + |
| + ret = readl_poll_timeout(ppe->base + MTK_PPE_GLO_CFG, val, |
| + !(val & MTK_PPE_GLO_CFG_BUSY), |
| + 20, MTK_PPE_WAIT_TIMEOUT_US); |
| + |
| + if (ret) |
| + dev_err(ppe->dev, "PPE table busy"); |
| + |
| + return ret; |
| +} |
| + |
| +static void mtk_ppe_cache_clear(struct mtk_ppe *ppe) |
| +{ |
| + ppe_set(ppe, MTK_PPE_CACHE_CTL, MTK_PPE_CACHE_CTL_CLEAR); |
| + ppe_clear(ppe, MTK_PPE_CACHE_CTL, MTK_PPE_CACHE_CTL_CLEAR); |
| +} |
| + |
| +static void mtk_ppe_cache_enable(struct mtk_ppe *ppe, bool enable) |
| +{ |
| + mtk_ppe_cache_clear(ppe); |
| + |
| + ppe_m32(ppe, MTK_PPE_CACHE_CTL, MTK_PPE_CACHE_CTL_EN, |
| + enable * MTK_PPE_CACHE_CTL_EN); |
| +} |
| + |
| +static u32 mtk_ppe_hash_entry(struct mtk_foe_entry *e) |
| +{ |
| + u32 hv1, hv2, hv3; |
| + u32 hash; |
| + |
| + switch (FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, e->ib1)) { |
| + case MTK_PPE_PKT_TYPE_BRIDGE: |
| + hv1 = e->bridge.src_mac_lo; |
| + hv1 ^= ((e->bridge.src_mac_hi & 0xffff) << 16); |
| + hv2 = e->bridge.src_mac_hi >> 16; |
| + hv2 ^= e->bridge.dest_mac_lo; |
| + hv3 = e->bridge.dest_mac_hi; |
| + break; |
| + case MTK_PPE_PKT_TYPE_IPV4_ROUTE: |
| + case MTK_PPE_PKT_TYPE_IPV4_HNAPT: |
| + hv1 = e->ipv4.orig.ports; |
| + hv2 = e->ipv4.orig.dest_ip; |
| + hv3 = e->ipv4.orig.src_ip; |
| + break; |
| + case MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T: |
| + case MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T: |
| + hv1 = e->ipv6.src_ip[3] ^ e->ipv6.dest_ip[3]; |
| + hv1 ^= e->ipv6.ports; |
| + |
| + hv2 = e->ipv6.src_ip[2] ^ e->ipv6.dest_ip[2]; |
| + hv2 ^= e->ipv6.dest_ip[0]; |
| + |
| + hv3 = e->ipv6.src_ip[1] ^ e->ipv6.dest_ip[1]; |
| + hv3 ^= e->ipv6.src_ip[0]; |
| + break; |
| + case MTK_PPE_PKT_TYPE_IPV4_DSLITE: |
| + case MTK_PPE_PKT_TYPE_IPV6_6RD: |
| + default: |
| + WARN_ON_ONCE(1); |
| + return MTK_PPE_HASH_MASK; |
| + } |
| + |
| + hash = (hv1 & hv2) | ((~hv1) & hv3); |
| + hash = (hash >> 24) | ((hash & 0xffffff) << 8); |
| + hash ^= hv1 ^ hv2 ^ hv3; |
| + hash ^= hash >> 16; |
| + hash <<= 1; |
| + hash &= MTK_PPE_ENTRIES - 1; |
| + |
| + return hash; |
| +} |
| + |
| +static inline struct mtk_foe_mac_info * |
| +mtk_foe_entry_l2(struct mtk_foe_entry *entry) |
| +{ |
| + int type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); |
| + |
| + if (type >= MTK_PPE_PKT_TYPE_IPV4_DSLITE) |
| + return &entry->ipv6.l2; |
| + |
| + return &entry->ipv4.l2; |
| +} |
| + |
| +static inline u32 * |
| +mtk_foe_entry_ib2(struct mtk_foe_entry *entry) |
| +{ |
| + int type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); |
| + |
| + if (type >= MTK_PPE_PKT_TYPE_IPV4_DSLITE) |
| + return &entry->ipv6.ib2; |
| + |
| + return &entry->ipv4.ib2; |
| +} |
| + |
| +int mtk_foe_entry_prepare(struct mtk_foe_entry *entry, int type, int l4proto, |
| + u8 pse_port, u8 *src_mac, u8 *dest_mac) |
| +{ |
| + struct mtk_foe_mac_info *l2; |
| + u32 ports_pad, val; |
| + |
| + memset(entry, 0, sizeof(*entry)); |
| + |
| + val = FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_BIND) | |
| + FIELD_PREP(MTK_FOE_IB1_PACKET_TYPE, type) | |
| + FIELD_PREP(MTK_FOE_IB1_UDP, l4proto == IPPROTO_UDP) | |
| + MTK_FOE_IB1_BIND_TTL | |
| + MTK_FOE_IB1_BIND_CACHE; |
| + entry->ib1 = val; |
| + |
| + val = FIELD_PREP(MTK_FOE_IB2_PORT_MG, 0x3f) | |
| + FIELD_PREP(MTK_FOE_IB2_PORT_AG, 0x1f) | |
| + FIELD_PREP(MTK_FOE_IB2_DEST_PORT, pse_port); |
| + |
| + if (is_multicast_ether_addr(dest_mac)) |
| + val |= MTK_FOE_IB2_MULTICAST; |
| + |
| + ports_pad = 0xa5a5a500 | (l4proto & 0xff); |
| + if (type == MTK_PPE_PKT_TYPE_IPV4_ROUTE) |
| + entry->ipv4.orig.ports = ports_pad; |
| + if (type == MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T) |
| + entry->ipv6.ports = ports_pad; |
| + |
| + if (type >= MTK_PPE_PKT_TYPE_IPV4_DSLITE) { |
| + entry->ipv6.ib2 = val; |
| + l2 = &entry->ipv6.l2; |
| + } else { |
| + entry->ipv4.ib2 = val; |
| + l2 = &entry->ipv4.l2; |
| + } |
| + |
| + l2->dest_mac_hi = get_unaligned_be32(dest_mac); |
| + l2->dest_mac_lo = get_unaligned_be16(dest_mac + 4); |
| + l2->src_mac_hi = get_unaligned_be32(src_mac); |
| + l2->src_mac_lo = get_unaligned_be16(src_mac + 4); |
| + |
| + if (type >= MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T) |
| + l2->etype = ETH_P_IPV6; |
| + else |
| + l2->etype = ETH_P_IP; |
| + |
| + return 0; |
| +} |
| + |
| +int mtk_foe_entry_set_pse_port(struct mtk_foe_entry *entry, u8 port) |
| +{ |
| + u32 *ib2 = mtk_foe_entry_ib2(entry); |
| + u32 val; |
| + |
| + val = *ib2; |
| + val &= ~MTK_FOE_IB2_DEST_PORT; |
| + val |= FIELD_PREP(MTK_FOE_IB2_DEST_PORT, port); |
| + *ib2 = val; |
| + |
| + return 0; |
| +} |
| + |
| +int mtk_foe_entry_set_ipv4_tuple(struct mtk_foe_entry *entry, bool egress, |
| + __be32 src_addr, __be16 src_port, |
| + __be32 dest_addr, __be16 dest_port) |
| +{ |
| + int type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); |
| + struct mtk_ipv4_tuple *t; |
| + |
| + switch (type) { |
| + case MTK_PPE_PKT_TYPE_IPV4_HNAPT: |
| + if (egress) { |
| + t = &entry->ipv4.new; |
| + break; |
| + } |
| + fallthrough; |
| + case MTK_PPE_PKT_TYPE_IPV4_DSLITE: |
| + case MTK_PPE_PKT_TYPE_IPV4_ROUTE: |
| + t = &entry->ipv4.orig; |
| + break; |
| + case MTK_PPE_PKT_TYPE_IPV6_6RD: |
| + entry->ipv6_6rd.tunnel_src_ip = be32_to_cpu(src_addr); |
| + entry->ipv6_6rd.tunnel_dest_ip = be32_to_cpu(dest_addr); |
| + return 0; |
| + default: |
| + WARN_ON_ONCE(1); |
| + return -EINVAL; |
| + } |
| + |
| + t->src_ip = be32_to_cpu(src_addr); |
| + t->dest_ip = be32_to_cpu(dest_addr); |
| + |
| + if (type == MTK_PPE_PKT_TYPE_IPV4_ROUTE) |
| + return 0; |
| + |
| + t->src_port = be16_to_cpu(src_port); |
| + t->dest_port = be16_to_cpu(dest_port); |
| + |
| + return 0; |
| +} |
| + |
| +int mtk_foe_entry_set_ipv6_tuple(struct mtk_foe_entry *entry, |
| + __be32 *src_addr, __be16 src_port, |
| + __be32 *dest_addr, __be16 dest_port) |
| +{ |
| + int type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); |
| + u32 *src, *dest; |
| + int i; |
| + |
| + switch (type) { |
| + case MTK_PPE_PKT_TYPE_IPV4_DSLITE: |
| + src = entry->dslite.tunnel_src_ip; |
| + dest = entry->dslite.tunnel_dest_ip; |
| + break; |
| + case MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T: |
| + case MTK_PPE_PKT_TYPE_IPV6_6RD: |
| + entry->ipv6.src_port = be16_to_cpu(src_port); |
| + entry->ipv6.dest_port = be16_to_cpu(dest_port); |
| + fallthrough; |
| + case MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T: |
| + src = entry->ipv6.src_ip; |
| + dest = entry->ipv6.dest_ip; |
| + break; |
| + default: |
| + WARN_ON_ONCE(1); |
| + return -EINVAL; |
| + } |
| + |
| + for (i = 0; i < 4; i++) |
| + src[i] = be32_to_cpu(src_addr[i]); |
| + for (i = 0; i < 4; i++) |
| + dest[i] = be32_to_cpu(dest_addr[i]); |
| + |
| + return 0; |
| +} |
| + |
| +int mtk_foe_entry_set_dsa(struct mtk_foe_entry *entry, int port) |
| +{ |
| + struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(entry); |
| + |
| + l2->etype = BIT(port); |
| + |
| + if (!(entry->ib1 & MTK_FOE_IB1_BIND_VLAN_LAYER)) |
| + entry->ib1 |= FIELD_PREP(MTK_FOE_IB1_BIND_VLAN_LAYER, 1); |
| + else |
| + l2->etype |= BIT(8); |
| + |
| + entry->ib1 &= ~MTK_FOE_IB1_BIND_VLAN_TAG; |
| + |
| + return 0; |
| +} |
| + |
| +int mtk_foe_entry_set_vlan(struct mtk_foe_entry *entry, int vid) |
| +{ |
| + struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(entry); |
| + |
| + switch (FIELD_GET(MTK_FOE_IB1_BIND_VLAN_LAYER, entry->ib1)) { |
| + case 0: |
| + entry->ib1 |= MTK_FOE_IB1_BIND_VLAN_TAG | |
| + FIELD_PREP(MTK_FOE_IB1_BIND_VLAN_LAYER, 1); |
| + l2->vlan1 = vid; |
| + return 0; |
| + case 1: |
| + if (!(entry->ib1 & MTK_FOE_IB1_BIND_VLAN_TAG)) { |
| + l2->vlan1 = vid; |
| + l2->etype |= BIT(8); |
| + } else { |
| + l2->vlan2 = vid; |
| + entry->ib1 += FIELD_PREP(MTK_FOE_IB1_BIND_VLAN_LAYER, 1); |
| + } |
| + return 0; |
| + default: |
| + return -ENOSPC; |
| + } |
| +} |
| + |
| +int mtk_foe_entry_set_pppoe(struct mtk_foe_entry *entry, int sid) |
| +{ |
| + struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(entry); |
| + |
| + if (!(entry->ib1 & MTK_FOE_IB1_BIND_VLAN_LAYER) || |
| + (entry->ib1 & MTK_FOE_IB1_BIND_VLAN_TAG)) |
| + l2->etype = ETH_P_PPP_SES; |
| + |
| + entry->ib1 |= MTK_FOE_IB1_BIND_PPPOE; |
| + l2->pppoe_id = sid; |
| + |
| + return 0; |
| +} |
| + |
| +static inline bool mtk_foe_entry_usable(struct mtk_foe_entry *entry) |
| +{ |
| + return !(entry->ib1 & MTK_FOE_IB1_STATIC) && |
| + FIELD_GET(MTK_FOE_IB1_STATE, entry->ib1) != MTK_FOE_STATE_BIND; |
| +} |
| + |
| +int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_foe_entry *entry, |
| + u16 timestamp) |
| +{ |
| + struct mtk_foe_entry *hwe; |
| + u32 hash; |
| + |
| + timestamp &= MTK_FOE_IB1_BIND_TIMESTAMP; |
| + entry->ib1 &= ~MTK_FOE_IB1_BIND_TIMESTAMP; |
| + entry->ib1 |= FIELD_PREP(MTK_FOE_IB1_BIND_TIMESTAMP, timestamp); |
| + |
| + hash = mtk_ppe_hash_entry(entry); |
| + hwe = &ppe->foe_table[hash]; |
| + if (!mtk_foe_entry_usable(hwe)) { |
| + hwe++; |
| + hash++; |
| + |
| + if (!mtk_foe_entry_usable(hwe)) |
| + return -ENOSPC; |
| + } |
| + |
| + memcpy(&hwe->data, &entry->data, sizeof(hwe->data)); |
| + wmb(); |
| + hwe->ib1 = entry->ib1; |
| + |
| + dma_wmb(); |
| + |
| + mtk_ppe_cache_clear(ppe); |
| + |
| + return hash; |
| +} |
| + |
| +int mtk_ppe_init(struct mtk_ppe *ppe, struct device *dev, void __iomem *base, |
| + int version) |
| +{ |
| + struct mtk_foe_entry *foe; |
| + |
| + /* need to allocate a separate device, since it PPE DMA access is |
| + * not coherent. |
| + */ |
| + ppe->base = base; |
| + ppe->dev = dev; |
| + ppe->version = version; |
| + |
| + foe = dmam_alloc_coherent(ppe->dev, MTK_PPE_ENTRIES * sizeof(*foe), |
| + &ppe->foe_phys, GFP_KERNEL); |
| + if (!foe) |
| + return -ENOMEM; |
| + |
| + ppe->foe_table = foe; |
| + |
| + mtk_ppe_debugfs_init(ppe); |
| + |
| + return 0; |
| +} |
| + |
| +static void mtk_ppe_init_foe_table(struct mtk_ppe *ppe) |
| +{ |
| + static const u8 skip[] = { 12, 25, 38, 51, 76, 89, 102 }; |
| + int i, k; |
| + |
| + memset(ppe->foe_table, 0, MTK_PPE_ENTRIES * sizeof(*ppe->foe_table)); |
| + |
| + if (!IS_ENABLED(CONFIG_SOC_MT7621)) |
| + return; |
| + |
| + /* skip all entries that cross the 1024 byte boundary */ |
| + for (i = 0; i < MTK_PPE_ENTRIES; i += 128) |
| + for (k = 0; k < ARRAY_SIZE(skip); k++) |
| + ppe->foe_table[i + skip[k]].ib1 |= MTK_FOE_IB1_STATIC; |
| +} |
| + |
| +int mtk_ppe_start(struct mtk_ppe *ppe) |
| +{ |
| + u32 val; |
| + |
| + mtk_ppe_init_foe_table(ppe); |
| + ppe_w32(ppe, MTK_PPE_TB_BASE, ppe->foe_phys); |
| + |
| + val = MTK_PPE_TB_CFG_ENTRY_80B | |
| + MTK_PPE_TB_CFG_AGE_NON_L4 | |
| + MTK_PPE_TB_CFG_AGE_UNBIND | |
| + MTK_PPE_TB_CFG_AGE_TCP | |
| + MTK_PPE_TB_CFG_AGE_UDP | |
| + MTK_PPE_TB_CFG_AGE_TCP_FIN | |
| + FIELD_PREP(MTK_PPE_TB_CFG_SEARCH_MISS, |
| + MTK_PPE_SEARCH_MISS_ACTION_FORWARD_BUILD) | |
| + FIELD_PREP(MTK_PPE_TB_CFG_KEEPALIVE, |
| + MTK_PPE_KEEPALIVE_DISABLE) | |
| + FIELD_PREP(MTK_PPE_TB_CFG_HASH_MODE, 1) | |
| + FIELD_PREP(MTK_PPE_TB_CFG_SCAN_MODE, |
| + MTK_PPE_SCAN_MODE_KEEPALIVE_AGE) | |
| + FIELD_PREP(MTK_PPE_TB_CFG_ENTRY_NUM, |
| + MTK_PPE_ENTRIES_SHIFT); |
| + ppe_w32(ppe, MTK_PPE_TB_CFG, val); |
| + |
| + ppe_w32(ppe, MTK_PPE_IP_PROTO_CHK, |
| + MTK_PPE_IP_PROTO_CHK_IPV4 | MTK_PPE_IP_PROTO_CHK_IPV6); |
| + |
| + mtk_ppe_cache_enable(ppe, true); |
| + |
| + val = MTK_PPE_FLOW_CFG_IP4_TCP_FRAG | |
| + MTK_PPE_FLOW_CFG_IP4_UDP_FRAG | |
| + MTK_PPE_FLOW_CFG_IP6_3T_ROUTE | |
| + MTK_PPE_FLOW_CFG_IP6_5T_ROUTE | |
| + MTK_PPE_FLOW_CFG_IP6_6RD | |
| + MTK_PPE_FLOW_CFG_IP4_NAT | |
| + MTK_PPE_FLOW_CFG_IP4_NAPT | |
| + MTK_PPE_FLOW_CFG_IP4_DSLITE | |
| + MTK_PPE_FLOW_CFG_L2_BRIDGE | |
| + MTK_PPE_FLOW_CFG_IP4_NAT_FRAG; |
| + ppe_w32(ppe, MTK_PPE_FLOW_CFG, val); |
| + |
| + val = FIELD_PREP(MTK_PPE_UNBIND_AGE_MIN_PACKETS, 1000) | |
| + FIELD_PREP(MTK_PPE_UNBIND_AGE_DELTA, 3); |
| + ppe_w32(ppe, MTK_PPE_UNBIND_AGE, val); |
| + |
| + val = FIELD_PREP(MTK_PPE_BIND_AGE0_DELTA_UDP, 30) | |
| + FIELD_PREP(MTK_PPE_BIND_AGE0_DELTA_NON_L4, 1); |
| + ppe_w32(ppe, MTK_PPE_BIND_AGE0, val); |
| + |
| + val = FIELD_PREP(MTK_PPE_BIND_AGE1_DELTA_TCP_FIN, 1) | |
| + FIELD_PREP(MTK_PPE_BIND_AGE1_DELTA_TCP, 30); |
| + ppe_w32(ppe, MTK_PPE_BIND_AGE1, val); |
| + |
| + val = MTK_PPE_BIND_LIMIT0_QUARTER | MTK_PPE_BIND_LIMIT0_HALF; |
| + ppe_w32(ppe, MTK_PPE_BIND_LIMIT0, val); |
| + |
| + val = MTK_PPE_BIND_LIMIT1_FULL | |
| + FIELD_PREP(MTK_PPE_BIND_LIMIT1_NON_L4, 1); |
| + ppe_w32(ppe, MTK_PPE_BIND_LIMIT1, val); |
| + |
| + val = FIELD_PREP(MTK_PPE_BIND_RATE_BIND, 30) | |
| + FIELD_PREP(MTK_PPE_BIND_RATE_PREBIND, 1); |
| + ppe_w32(ppe, MTK_PPE_BIND_RATE, val); |
| + |
| + /* enable PPE */ |
| + val = MTK_PPE_GLO_CFG_EN | |
| + MTK_PPE_GLO_CFG_IP4_L4_CS_DROP | |
| + MTK_PPE_GLO_CFG_IP4_CS_DROP | |
| + MTK_PPE_GLO_CFG_FLOW_DROP_UPDATE; |
| + ppe_w32(ppe, MTK_PPE_GLO_CFG, val); |
| + |
| + ppe_w32(ppe, MTK_PPE_DEFAULT_CPU_PORT, 0); |
| + |
| + return 0; |
| +} |
| + |
| +int mtk_ppe_stop(struct mtk_ppe *ppe) |
| +{ |
| + u32 val; |
| + int i; |
| + |
| + for (i = 0; i < MTK_PPE_ENTRIES; i++) |
| + ppe->foe_table[i].ib1 = FIELD_PREP(MTK_FOE_IB1_STATE, |
| + MTK_FOE_STATE_INVALID); |
| + |
| + mtk_ppe_cache_enable(ppe, false); |
| + |
| + /* disable offload engine */ |
| + ppe_clear(ppe, MTK_PPE_GLO_CFG, MTK_PPE_GLO_CFG_EN); |
| + ppe_w32(ppe, MTK_PPE_FLOW_CFG, 0); |
| + |
| + /* disable aging */ |
| + val = MTK_PPE_TB_CFG_AGE_NON_L4 | |
| + MTK_PPE_TB_CFG_AGE_UNBIND | |
| + MTK_PPE_TB_CFG_AGE_TCP | |
| + MTK_PPE_TB_CFG_AGE_UDP | |
| + MTK_PPE_TB_CFG_AGE_TCP_FIN; |
| + ppe_clear(ppe, MTK_PPE_TB_CFG, val); |
| + |
| + return mtk_ppe_wait_busy(ppe); |
| +} |
| diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h |
| new file mode 100644 |
| index 000000000..242fb8f2a |
| --- /dev/null |
| +++ b/drivers/net/ethernet/mediatek/mtk_ppe.h |
| @@ -0,0 +1,288 @@ |
| +// SPDX-License-Identifier: GPL-2.0-only |
| +/* Copyright (C) 2020 Felix Fietkau <nbd@nbd.name> */ |
| + |
| +#ifndef __MTK_PPE_H |
| +#define __MTK_PPE_H |
| + |
| +#include <linux/kernel.h> |
| +#include <linux/bitfield.h> |
| + |
| +#define MTK_ETH_PPE_BASE 0xc00 |
| + |
| +#define MTK_PPE_ENTRIES_SHIFT 3 |
| +#define MTK_PPE_ENTRIES (1024 << MTK_PPE_ENTRIES_SHIFT) |
| +#define MTK_PPE_HASH_MASK (MTK_PPE_ENTRIES - 1) |
| +#define MTK_PPE_WAIT_TIMEOUT_US 1000000 |
| + |
| +#define MTK_FOE_IB1_UNBIND_TIMESTAMP GENMASK(7, 0) |
| +#define MTK_FOE_IB1_UNBIND_PACKETS GENMASK(23, 8) |
| +#define MTK_FOE_IB1_UNBIND_PREBIND BIT(24) |
| + |
| +#define MTK_FOE_IB1_BIND_TIMESTAMP GENMASK(14, 0) |
| +#define MTK_FOE_IB1_BIND_KEEPALIVE BIT(15) |
| +#define MTK_FOE_IB1_BIND_VLAN_LAYER GENMASK(18, 16) |
| +#define MTK_FOE_IB1_BIND_PPPOE BIT(19) |
| +#define MTK_FOE_IB1_BIND_VLAN_TAG BIT(20) |
| +#define MTK_FOE_IB1_BIND_PKT_SAMPLE BIT(21) |
| +#define MTK_FOE_IB1_BIND_CACHE BIT(22) |
| +#define MTK_FOE_IB1_BIND_TUNNEL_DECAP BIT(23) |
| +#define MTK_FOE_IB1_BIND_TTL BIT(24) |
| + |
| +#define MTK_FOE_IB1_PACKET_TYPE GENMASK(27, 25) |
| +#define MTK_FOE_IB1_STATE GENMASK(29, 28) |
| +#define MTK_FOE_IB1_UDP BIT(30) |
| +#define MTK_FOE_IB1_STATIC BIT(31) |
| + |
| +enum { |
| + MTK_PPE_PKT_TYPE_IPV4_HNAPT = 0, |
| + MTK_PPE_PKT_TYPE_IPV4_ROUTE = 1, |
| + MTK_PPE_PKT_TYPE_BRIDGE = 2, |
| + MTK_PPE_PKT_TYPE_IPV4_DSLITE = 3, |
| + MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T = 4, |
| + MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T = 5, |
| + MTK_PPE_PKT_TYPE_IPV6_6RD = 7, |
| +}; |
| + |
| +#define MTK_FOE_IB2_QID GENMASK(3, 0) |
| +#define MTK_FOE_IB2_PSE_QOS BIT(4) |
| +#define MTK_FOE_IB2_DEST_PORT GENMASK(7, 5) |
| +#define MTK_FOE_IB2_MULTICAST BIT(8) |
| + |
| +#define MTK_FOE_IB2_WHNAT_QID2 GENMASK(13, 12) |
| +#define MTK_FOE_IB2_WHNAT_DEVIDX BIT(16) |
| +#define MTK_FOE_IB2_WHNAT_NAT BIT(17) |
| + |
| +#define MTK_FOE_IB2_PORT_MG GENMASK(17, 12) |
| + |
| +#define MTK_FOE_IB2_PORT_AG GENMASK(23, 18) |
| + |
| +#define MTK_FOE_IB2_DSCP GENMASK(31, 24) |
| + |
| +#define MTK_FOE_VLAN2_WHNAT_BSS GEMMASK(5, 0) |
| +#define MTK_FOE_VLAN2_WHNAT_WCID GENMASK(13, 6) |
| +#define MTK_FOE_VLAN2_WHNAT_RING GENMASK(15, 14) |
| + |
| +enum { |
| + MTK_FOE_STATE_INVALID, |
| + MTK_FOE_STATE_UNBIND, |
| + MTK_FOE_STATE_BIND, |
| + MTK_FOE_STATE_FIN |
| +}; |
| + |
| +struct mtk_foe_mac_info { |
| + u16 vlan1; |
| + u16 etype; |
| + |
| + u32 dest_mac_hi; |
| + |
| + u16 vlan2; |
| + u16 dest_mac_lo; |
| + |
| + u32 src_mac_hi; |
| + |
| + u16 pppoe_id; |
| + u16 src_mac_lo; |
| +}; |
| + |
| +struct mtk_foe_bridge { |
| + u32 dest_mac_hi; |
| + |
| + u16 src_mac_lo; |
| + u16 dest_mac_lo; |
| + |
| + u32 src_mac_hi; |
| + |
| + u32 ib2; |
| + |
| + u32 _rsv[5]; |
| + |
| + u32 udf_tsid; |
| + struct mtk_foe_mac_info l2; |
| +}; |
| + |
| +struct mtk_ipv4_tuple { |
| + u32 src_ip; |
| + u32 dest_ip; |
| + union { |
| + struct { |
| + u16 dest_port; |
| + u16 src_port; |
| + }; |
| + struct { |
| + u8 protocol; |
| + u8 _pad[3]; /* fill with 0xa5a5a5 */ |
| + }; |
| + u32 ports; |
| + }; |
| +}; |
| + |
| +struct mtk_foe_ipv4 { |
| + struct mtk_ipv4_tuple orig; |
| + |
| + u32 ib2; |
| + |
| + struct mtk_ipv4_tuple new; |
| + |
| + u16 timestamp; |
| + u16 _rsv0[3]; |
| + |
| + u32 udf_tsid; |
| + |
| + struct mtk_foe_mac_info l2; |
| +}; |
| + |
| +struct mtk_foe_ipv4_dslite { |
| + struct mtk_ipv4_tuple ip4; |
| + |
| + u32 tunnel_src_ip[4]; |
| + u32 tunnel_dest_ip[4]; |
| + |
| + u8 flow_label[3]; |
| + u8 priority; |
| + |
| + u32 udf_tsid; |
| + |
| + u32 ib2; |
| + |
| + struct mtk_foe_mac_info l2; |
| +}; |
| + |
| +struct mtk_foe_ipv6 { |
| + u32 src_ip[4]; |
| + u32 dest_ip[4]; |
| + |
| + union { |
| + struct { |
| + u8 protocol; |
| + u8 _pad[3]; /* fill with 0xa5a5a5 */ |
| + }; /* 3-tuple */ |
| + struct { |
| + u16 dest_port; |
| + u16 src_port; |
| + }; /* 5-tuple */ |
| + u32 ports; |
| + }; |
| + |
| + u32 _rsv[3]; |
| + |
| + u32 udf; |
| + |
| + u32 ib2; |
| + struct mtk_foe_mac_info l2; |
| +}; |
| + |
| +struct mtk_foe_ipv6_6rd { |
| + u32 src_ip[4]; |
| + u32 dest_ip[4]; |
| + u16 dest_port; |
| + u16 src_port; |
| + |
| + u32 tunnel_src_ip; |
| + u32 tunnel_dest_ip; |
| + |
| + u16 hdr_csum; |
| + u8 dscp; |
| + u8 ttl; |
| + |
| + u8 flag; |
| + u8 pad; |
| + u8 per_flow_6rd_id; |
| + u8 pad2; |
| + |
| + u32 ib2; |
| + struct mtk_foe_mac_info l2; |
| +}; |
| + |
| +struct mtk_foe_entry { |
| + u32 ib1; |
| + |
| + union { |
| + struct mtk_foe_bridge bridge; |
| + struct mtk_foe_ipv4 ipv4; |
| + struct mtk_foe_ipv4_dslite dslite; |
| + struct mtk_foe_ipv6 ipv6; |
| + struct mtk_foe_ipv6_6rd ipv6_6rd; |
| + u32 data[19]; |
| + }; |
| +}; |
| + |
| +enum { |
| + MTK_PPE_CPU_REASON_TTL_EXCEEDED = 0x02, |
| + MTK_PPE_CPU_REASON_OPTION_HEADER = 0x03, |
| + MTK_PPE_CPU_REASON_NO_FLOW = 0x07, |
| + MTK_PPE_CPU_REASON_IPV4_FRAG = 0x08, |
| + MTK_PPE_CPU_REASON_IPV4_DSLITE_FRAG = 0x09, |
| + MTK_PPE_CPU_REASON_IPV4_DSLITE_NO_TCP_UDP = 0x0a, |
| + MTK_PPE_CPU_REASON_IPV6_6RD_NO_TCP_UDP = 0x0b, |
| + MTK_PPE_CPU_REASON_TCP_FIN_SYN_RST = 0x0c, |
| + MTK_PPE_CPU_REASON_UN_HIT = 0x0d, |
| + MTK_PPE_CPU_REASON_HIT_UNBIND = 0x0e, |
| + MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED = 0x0f, |
| + MTK_PPE_CPU_REASON_HIT_BIND_TCP_FIN = 0x10, |
| + MTK_PPE_CPU_REASON_HIT_TTL_1 = 0x11, |
| + MTK_PPE_CPU_REASON_HIT_BIND_VLAN_VIOLATION = 0x12, |
| + MTK_PPE_CPU_REASON_KEEPALIVE_UC_OLD_HDR = 0x13, |
| + MTK_PPE_CPU_REASON_KEEPALIVE_MC_NEW_HDR = 0x14, |
| + MTK_PPE_CPU_REASON_KEEPALIVE_DUP_OLD_HDR = 0x15, |
| + MTK_PPE_CPU_REASON_HIT_BIND_FORCE_CPU = 0x16, |
| + MTK_PPE_CPU_REASON_TUNNEL_OPTION_HEADER = 0x17, |
| + MTK_PPE_CPU_REASON_MULTICAST_TO_CPU = 0x18, |
| + MTK_PPE_CPU_REASON_MULTICAST_TO_GMAC1_CPU = 0x19, |
| + MTK_PPE_CPU_REASON_HIT_PRE_BIND = 0x1a, |
| + MTK_PPE_CPU_REASON_PACKET_SAMPLING = 0x1b, |
| + MTK_PPE_CPU_REASON_EXCEED_MTU = 0x1c, |
| + MTK_PPE_CPU_REASON_PPE_BYPASS = 0x1e, |
| + MTK_PPE_CPU_REASON_INVALID = 0x1f, |
| +}; |
| + |
| +struct mtk_ppe { |
| + struct device *dev; |
| + void __iomem *base; |
| + int version; |
| + |
| + struct mtk_foe_entry *foe_table; |
| + dma_addr_t foe_phys; |
| + |
| + void *acct_table; |
| +}; |
| + |
| +int mtk_ppe_init(struct mtk_ppe *ppe, struct device *dev, void __iomem *base, |
| + int version); |
| +int mtk_ppe_start(struct mtk_ppe *ppe); |
| +int mtk_ppe_stop(struct mtk_ppe *ppe); |
| + |
| +static inline void |
| +mtk_foe_entry_clear(struct mtk_ppe *ppe, u16 hash) |
| +{ |
| + ppe->foe_table[hash].ib1 = 0; |
| + dma_wmb(); |
| +} |
| + |
| +static inline int |
| +mtk_foe_entry_timestamp(struct mtk_ppe *ppe, u16 hash) |
| +{ |
| + u32 ib1 = READ_ONCE(ppe->foe_table[hash].ib1); |
| + |
| + if (FIELD_GET(MTK_FOE_IB1_STATE, ib1) != MTK_FOE_STATE_BIND) |
| + return -1; |
| + |
| + return FIELD_GET(MTK_FOE_IB1_BIND_TIMESTAMP, ib1); |
| +} |
| + |
| +int mtk_foe_entry_prepare(struct mtk_foe_entry *entry, int type, int l4proto, |
| + u8 pse_port, u8 *src_mac, u8 *dest_mac); |
| +int mtk_foe_entry_set_pse_port(struct mtk_foe_entry *entry, u8 port); |
| +int mtk_foe_entry_set_ipv4_tuple(struct mtk_foe_entry *entry, bool orig, |
| + __be32 src_addr, __be16 src_port, |
| + __be32 dest_addr, __be16 dest_port); |
| +int mtk_foe_entry_set_ipv6_tuple(struct mtk_foe_entry *entry, |
| + __be32 *src_addr, __be16 src_port, |
| + __be32 *dest_addr, __be16 dest_port); |
| +int mtk_foe_entry_set_dsa(struct mtk_foe_entry *entry, int port); |
| +int mtk_foe_entry_set_vlan(struct mtk_foe_entry *entry, int vid); |
| +int mtk_foe_entry_set_pppoe(struct mtk_foe_entry *entry, int sid); |
| +int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_foe_entry *entry, |
| + u16 timestamp); |
| +int mtk_ppe_debugfs_init(struct mtk_ppe *ppe); |
| + |
| +#endif |
| diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| new file mode 100644 |
| index 000000000..d4b482340 |
| --- /dev/null |
| +++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| @@ -0,0 +1,214 @@ |
| +// SPDX-License-Identifier: GPL-2.0-only |
| +/* Copyright (C) 2020 Felix Fietkau <nbd@nbd.name> */ |
| + |
| +#include <linux/kernel.h> |
| +#include <linux/debugfs.h> |
| +#include "mtk_eth_soc.h" |
| + |
| +struct mtk_flow_addr_info |
| +{ |
| + void *src, *dest; |
| + u16 *src_port, *dest_port; |
| + bool ipv6; |
| +}; |
| + |
| +static const char *mtk_foe_entry_state_str(int state) |
| +{ |
| + static const char * const state_str[] = { |
| + [MTK_FOE_STATE_INVALID] = "INV", |
| + [MTK_FOE_STATE_UNBIND] = "UNB", |
| + [MTK_FOE_STATE_BIND] = "BND", |
| + [MTK_FOE_STATE_FIN] = "FIN", |
| + }; |
| + |
| + if (state >= ARRAY_SIZE(state_str) || !state_str[state]) |
| + return "UNK"; |
| + |
| + return state_str[state]; |
| +} |
| + |
| +static const char *mtk_foe_pkt_type_str(int type) |
| +{ |
| + static const char * const type_str[] = { |
| + [MTK_PPE_PKT_TYPE_IPV4_HNAPT] = "IPv4 5T", |
| + [MTK_PPE_PKT_TYPE_IPV4_ROUTE] = "IPv4 3T", |
| + [MTK_PPE_PKT_TYPE_BRIDGE] = "L2", |
| + [MTK_PPE_PKT_TYPE_IPV4_DSLITE] = "DS-LITE", |
| + [MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T] = "IPv6 3T", |
| + [MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T] = "IPv6 5T", |
| + [MTK_PPE_PKT_TYPE_IPV6_6RD] = "6RD", |
| + }; |
| + |
| + if (type >= ARRAY_SIZE(type_str) || !type_str[type]) |
| + return "UNKNOWN"; |
| + |
| + return type_str[type]; |
| +} |
| + |
| +static void |
| +mtk_print_addr(struct seq_file *m, u32 *addr, bool ipv6) |
| +{ |
| + u32 n_addr[4]; |
| + int i; |
| + |
| + if (!ipv6) { |
| + seq_printf(m, "%pI4h", addr); |
| + return; |
| + } |
| + |
| + for (i = 0; i < ARRAY_SIZE(n_addr); i++) |
| + n_addr[i] = htonl(addr[i]); |
| + seq_printf(m, "%pI6", n_addr); |
| +} |
| + |
| +static void |
| +mtk_print_addr_info(struct seq_file *m, struct mtk_flow_addr_info *ai) |
| +{ |
| + mtk_print_addr(m, ai->src, ai->ipv6); |
| + if (ai->src_port) |
| + seq_printf(m, ":%d", *ai->src_port); |
| + seq_printf(m, "->"); |
| + mtk_print_addr(m, ai->dest, ai->ipv6); |
| + if (ai->dest_port) |
| + seq_printf(m, ":%d", *ai->dest_port); |
| +} |
| + |
| +static int |
| +mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| +{ |
| + struct mtk_ppe *ppe = m->private; |
| + int i; |
| + |
| + for (i = 0; i < MTK_PPE_ENTRIES; i++) { |
| + struct mtk_foe_entry *entry = &ppe->foe_table[i]; |
| + struct mtk_foe_mac_info *l2; |
| + struct mtk_flow_addr_info ai = {}; |
| + unsigned char h_source[ETH_ALEN]; |
| + unsigned char h_dest[ETH_ALEN]; |
| + int type, state; |
| + u32 ib2; |
| + |
| + |
| + state = FIELD_GET(MTK_FOE_IB1_STATE, entry->ib1); |
| + if (!state) |
| + continue; |
| + |
| + if (bind && state != MTK_FOE_STATE_BIND) |
| + continue; |
| + |
| + type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->ib1); |
| + seq_printf(m, "%05x %s %7s", i, |
| + mtk_foe_entry_state_str(state), |
| + mtk_foe_pkt_type_str(type)); |
| + |
| + switch (type) { |
| + case MTK_PPE_PKT_TYPE_IPV4_HNAPT: |
| + case MTK_PPE_PKT_TYPE_IPV4_DSLITE: |
| + ai.src_port = &entry->ipv4.orig.src_port; |
| + ai.dest_port = &entry->ipv4.orig.dest_port; |
| + fallthrough; |
| + case MTK_PPE_PKT_TYPE_IPV4_ROUTE: |
| + ai.src = &entry->ipv4.orig.src_ip; |
| + ai.dest = &entry->ipv4.orig.dest_ip; |
| + break; |
| + case MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T: |
| + ai.src_port = &entry->ipv6.src_port; |
| + ai.dest_port = &entry->ipv6.dest_port; |
| + fallthrough; |
| + case MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T: |
| + case MTK_PPE_PKT_TYPE_IPV6_6RD: |
| + ai.src = &entry->ipv6.src_ip; |
| + ai.dest = &entry->ipv6.dest_ip; |
| + ai.ipv6 = true; |
| + break; |
| + } |
| + |
| + seq_printf(m, " orig="); |
| + mtk_print_addr_info(m, &ai); |
| + |
| + switch (type) { |
| + case MTK_PPE_PKT_TYPE_IPV4_HNAPT: |
| + case MTK_PPE_PKT_TYPE_IPV4_DSLITE: |
| + ai.src_port = &entry->ipv4.new.src_port; |
| + ai.dest_port = &entry->ipv4.new.dest_port; |
| + fallthrough; |
| + case MTK_PPE_PKT_TYPE_IPV4_ROUTE: |
| + ai.src = &entry->ipv4.new.src_ip; |
| + ai.dest = &entry->ipv4.new.dest_ip; |
| + seq_printf(m, " new="); |
| + mtk_print_addr_info(m, &ai); |
| + break; |
| + } |
| + |
| + if (type >= MTK_PPE_PKT_TYPE_IPV4_DSLITE) { |
| + l2 = &entry->ipv6.l2; |
| + ib2 = entry->ipv6.ib2; |
| + } else { |
| + l2 = &entry->ipv4.l2; |
| + ib2 = entry->ipv4.ib2; |
| + } |
| + |
| + *((__be32 *)h_source) = htonl(l2->src_mac_hi); |
| + *((__be16 *)&h_source[4]) = htons(l2->src_mac_lo); |
| + *((__be32 *)h_dest) = htonl(l2->dest_mac_hi); |
| + *((__be16 *)&h_dest[4]) = htons(l2->dest_mac_lo); |
| + |
| + seq_printf(m, " eth=%pM->%pM etype=%04x" |
| + " vlan=%d,%d ib1=%08x ib2=%08x\n", |
| + h_source, h_dest, ntohs(l2->etype), |
| + l2->vlan1, l2->vlan2, entry->ib1, ib2); |
| + } |
| + |
| + return 0; |
| +} |
| + |
| +static int |
| +mtk_ppe_debugfs_foe_show_all(struct seq_file *m, void *private) |
| +{ |
| + return mtk_ppe_debugfs_foe_show(m, private, false); |
| +} |
| + |
| +static int |
| +mtk_ppe_debugfs_foe_show_bind(struct seq_file *m, void *private) |
| +{ |
| + return mtk_ppe_debugfs_foe_show(m, private, true); |
| +} |
| + |
| +static int |
| +mtk_ppe_debugfs_foe_open_all(struct inode *inode, struct file *file) |
| +{ |
| + return single_open(file, mtk_ppe_debugfs_foe_show_all, |
| + inode->i_private); |
| +} |
| + |
| +static int |
| +mtk_ppe_debugfs_foe_open_bind(struct inode *inode, struct file *file) |
| +{ |
| + return single_open(file, mtk_ppe_debugfs_foe_show_bind, |
| + inode->i_private); |
| +} |
| + |
| +int mtk_ppe_debugfs_init(struct mtk_ppe *ppe) |
| +{ |
| + static const struct file_operations fops_all = { |
| + .open = mtk_ppe_debugfs_foe_open_all, |
| + .read = seq_read, |
| + .llseek = seq_lseek, |
| + .release = single_release, |
| + }; |
| + |
| + static const struct file_operations fops_bind = { |
| + .open = mtk_ppe_debugfs_foe_open_bind, |
| + .read = seq_read, |
| + .llseek = seq_lseek, |
| + .release = single_release, |
| + }; |
| + |
| + struct dentry *root; |
| + |
| + root = debugfs_create_dir("mtk_ppe", NULL); |
| + debugfs_create_file("entries", S_IRUGO, root, ppe, &fops_all); |
| + debugfs_create_file("bind", S_IRUGO, root, ppe, &fops_bind); |
| + |
| + return 0; |
| +} |
| diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| new file mode 100644 |
| index 000000000..4294f0c74 |
| --- /dev/null |
| +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| @@ -0,0 +1,541 @@ |
| +// SPDX-License-Identifier: GPL-2.0-only |
| +/* |
| + * Copyright (C) 2020 Felix Fietkau <nbd@nbd.name> |
| + */ |
| + |
| +#include <linux/if_ether.h> |
| +#include <linux/rhashtable.h> |
| +#include <linux/ip.h> |
| +#include <linux/ipv6.h> |
| +#include <net/flow_offload.h> |
| +#include <net/pkt_cls.h> |
| +#include <net/dsa.h> |
| +#include "mtk_eth_soc.h" |
| + |
| +struct mtk_flow_data { |
| + struct ethhdr eth; |
| + |
| + union { |
| + struct { |
| + __be32 src_addr; |
| + __be32 dst_addr; |
| + } v4; |
| + |
| + struct { |
| + struct in6_addr src_addr; |
| + struct in6_addr dst_addr; |
| + } v6; |
| + }; |
| + |
| + __be16 src_port; |
| + __be16 dst_port; |
| + |
| + struct { |
| + u16 id; |
| + __be16 proto; |
| + u8 num; |
| + } vlan; |
| + struct { |
| + u16 sid; |
| + u8 num; |
| + } pppoe; |
| +}; |
| + |
| +struct mtk_flow_entry { |
| + struct rhash_head node; |
| + unsigned long cookie; |
| + u16 hash; |
| +}; |
| + |
| +static const struct rhashtable_params mtk_flow_ht_params = { |
| + .head_offset = offsetof(struct mtk_flow_entry, node), |
| + .key_offset = offsetof(struct mtk_flow_entry, cookie), |
| + .key_len = sizeof(unsigned long), |
| + .automatic_shrinking = true, |
| +}; |
| + |
| +static u32 |
| +mtk_eth_timestamp(struct mtk_eth *eth) |
| +{ |
| + return mtk_r32(eth, 0x0010) & MTK_FOE_IB1_BIND_TIMESTAMP; |
| +} |
| + |
| +static int |
| +mtk_flow_set_ipv4_addr(struct mtk_foe_entry *foe, struct mtk_flow_data *data, |
| + bool egress) |
| +{ |
| + return mtk_foe_entry_set_ipv4_tuple(foe, egress, |
| + data->v4.src_addr, data->src_port, |
| + data->v4.dst_addr, data->dst_port); |
| +} |
| + |
| +static int |
| +mtk_flow_set_ipv6_addr(struct mtk_foe_entry *foe, struct mtk_flow_data *data) |
| +{ |
| + return mtk_foe_entry_set_ipv6_tuple(foe, |
| + data->v6.src_addr.s6_addr32, data->src_port, |
| + data->v6.dst_addr.s6_addr32, data->dst_port); |
| +} |
| + |
| +static void |
| +mtk_flow_offload_mangle_eth(const struct flow_action_entry *act, void *eth) |
| +{ |
| + void *dest = eth + act->mangle.offset; |
| + const void *src = &act->mangle.val; |
| + |
| + if (act->mangle.offset > 8) |
| + return; |
| + |
| + if (act->mangle.mask == 0xffff) { |
| + src += 2; |
| + dest += 2; |
| + } |
| + |
| + memcpy(dest, src, act->mangle.mask ? 2 : 4); |
| +} |
| + |
| + |
| +static int |
| +mtk_flow_mangle_ports(const struct flow_action_entry *act, |
| + struct mtk_flow_data *data) |
| +{ |
| + u32 val = ntohl(act->mangle.val); |
| + |
| + switch (act->mangle.offset) { |
| + case 0: |
| + if (act->mangle.mask == ~htonl(0xffff)) |
| + data->dst_port = cpu_to_be16(val); |
| + else |
| + data->src_port = cpu_to_be16(val >> 16); |
| + break; |
| + case 2: |
| + data->dst_port = cpu_to_be16(val); |
| + break; |
| + default: |
| + return -EINVAL; |
| + } |
| + |
| + return 0; |
| +} |
| + |
| +static int |
| +mtk_flow_mangle_ipv4(const struct flow_action_entry *act, |
| + struct mtk_flow_data *data) |
| +{ |
| + __be32 *dest; |
| + |
| + switch (act->mangle.offset) { |
| + case offsetof(struct iphdr, saddr): |
| + dest = &data->v4.src_addr; |
| + break; |
| + case offsetof(struct iphdr, daddr): |
| + dest = &data->v4.dst_addr; |
| + break; |
| + default: |
| + return -EINVAL; |
| + } |
| + |
| + memcpy(dest, &act->mangle.val, sizeof(u32)); |
| + |
| + return 0; |
| +} |
| + |
| +static int |
| +mtk_flow_get_dsa_port(struct net_device **dev) |
| +{ |
| +#if IS_ENABLED(CONFIG_NET_DSA) |
| + struct dsa_port *dp; |
| + |
| + dp = dsa_port_from_netdev(*dev); |
| + if (IS_ERR(dp)) |
| + return -ENODEV; |
| + |
| + if (dp->cpu_dp->tag_ops->proto != DSA_TAG_PROTO_MTK) |
| + return -ENODEV; |
| + |
| + *dev = dp->cpu_dp->master; |
| + |
| + return dp->index; |
| +#else |
| + return -ENODEV; |
| +#endif |
| +} |
| + |
| +static int |
| +mtk_flow_set_output_device(struct mtk_eth *eth, struct mtk_foe_entry *foe, |
| + struct net_device *dev) |
| +{ |
| + int pse_port, dsa_port; |
| + |
| + dsa_port = mtk_flow_get_dsa_port(&dev); |
| + if (dsa_port >= 0) |
| + mtk_foe_entry_set_dsa(foe, dsa_port); |
| + |
| + if (dev == eth->netdev[0]) |
| + pse_port = PSE_GDM1_PORT; |
| + else if (dev == eth->netdev[1]) |
| + pse_port = PSE_GDM2_PORT; |
| + else |
| + return -EOPNOTSUPP; |
| + |
| + mtk_foe_entry_set_pse_port(foe, pse_port); |
| + |
| + return 0; |
| +} |
| + |
| +static int |
| +mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
| +{ |
| + struct flow_rule *rule = flow_cls_offload_flow_rule(f); |
| + struct flow_action_entry *act; |
| + struct mtk_flow_data data = {}; |
| + struct mtk_foe_entry foe; |
| + struct net_device *odev = NULL; |
| + struct mtk_flow_entry *entry; |
| + int offload_type = 0; |
| + u16 addr_type = 0; |
| + u32 timestamp; |
| + u8 l4proto = 0; |
| + int err = 0; |
| + int hash; |
| + int i; |
| + |
| + if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) |
| + return -EEXIST; |
| + |
| + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) { |
| + struct flow_match_meta match; |
| + |
| + flow_rule_match_meta(rule, &match); |
| + } else { |
| + return -EOPNOTSUPP; |
| + } |
| + |
| + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) { |
| + struct flow_match_control match; |
| + |
| + flow_rule_match_control(rule, &match); |
| + addr_type = match.key->addr_type; |
| + } else { |
| + return -EOPNOTSUPP; |
| + } |
| + |
| + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) { |
| + struct flow_match_basic match; |
| + |
| + flow_rule_match_basic(rule, &match); |
| + l4proto = match.key->ip_proto; |
| + } else { |
| + return -EOPNOTSUPP; |
| + } |
| + |
| + flow_action_for_each(i, act, &rule->action) { |
| + switch (act->id) { |
| + case FLOW_ACTION_MANGLE: |
| + if (act->mangle.htype == FLOW_ACT_MANGLE_HDR_TYPE_ETH) |
| + mtk_flow_offload_mangle_eth(act, &data.eth); |
| + break; |
| + case FLOW_ACTION_REDIRECT: |
| + odev = act->dev; |
| + break; |
| + case FLOW_ACTION_CSUM: |
| + break; |
| + case FLOW_ACTION_VLAN_PUSH: |
| + if (data.vlan.num == 1 || |
| + act->vlan.proto != htons(ETH_P_8021Q)) |
| + return -EOPNOTSUPP; |
| + |
| + data.vlan.id = act->vlan.vid; |
| + data.vlan.proto = act->vlan.proto; |
| + data.vlan.num++; |
| + break; |
| + case FLOW_ACTION_VLAN_POP: |
| + break; |
| + case FLOW_ACTION_PPPOE_PUSH: |
| + if (data.pppoe.num == 1) |
| + return -EOPNOTSUPP; |
| + |
| + data.pppoe.sid = act->pppoe.sid; |
| + data.pppoe.num++; |
| + break; |
| + default: |
| + return -EOPNOTSUPP; |
| + } |
| + } |
| + |
| + switch (addr_type) { |
| + case FLOW_DISSECTOR_KEY_IPV4_ADDRS: |
| + offload_type = MTK_PPE_PKT_TYPE_IPV4_HNAPT; |
| + break; |
| + case FLOW_DISSECTOR_KEY_IPV6_ADDRS: |
| + offload_type = MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T; |
| + break; |
| + default: |
| + return -EOPNOTSUPP; |
| + } |
| + |
| + if (!is_valid_ether_addr(data.eth.h_source) || |
| + !is_valid_ether_addr(data.eth.h_dest)) |
| + return -EINVAL; |
| + |
| + err = mtk_foe_entry_prepare(&foe, offload_type, l4proto, 0, |
| + data.eth.h_source, |
| + data.eth.h_dest); |
| + if (err) |
| + return err; |
| + |
| + if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) { |
| + struct flow_match_ports ports; |
| + |
| + flow_rule_match_ports(rule, &ports); |
| + data.src_port = ports.key->src; |
| + data.dst_port = ports.key->dst; |
| + } else { |
| + return -EOPNOTSUPP; |
| + } |
| + |
| + if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) { |
| + struct flow_match_ipv4_addrs addrs; |
| + |
| + flow_rule_match_ipv4_addrs(rule, &addrs); |
| + |
| + data.v4.src_addr = addrs.key->src; |
| + data.v4.dst_addr = addrs.key->dst; |
| + |
| + mtk_flow_set_ipv4_addr(&foe, &data, false); |
| + } |
| + |
| + if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) { |
| + struct flow_match_ipv6_addrs addrs; |
| + |
| + flow_rule_match_ipv6_addrs(rule, &addrs); |
| + |
| + data.v6.src_addr = addrs.key->src; |
| + data.v6.dst_addr = addrs.key->dst; |
| + |
| + mtk_flow_set_ipv6_addr(&foe, &data); |
| + } |
| + |
| + flow_action_for_each(i, act, &rule->action) { |
| + if (act->id != FLOW_ACTION_MANGLE) |
| + continue; |
| + |
| + switch (act->mangle.htype) { |
| + case FLOW_ACT_MANGLE_HDR_TYPE_TCP: |
| + case FLOW_ACT_MANGLE_HDR_TYPE_UDP: |
| + err = mtk_flow_mangle_ports(act, &data); |
| + break; |
| + case FLOW_ACT_MANGLE_HDR_TYPE_IP4: |
| + err = mtk_flow_mangle_ipv4(act, &data); |
| + break; |
| + case FLOW_ACT_MANGLE_HDR_TYPE_ETH: |
| + /* handled earlier */ |
| + break; |
| + default: |
| + return -EOPNOTSUPP; |
| + } |
| + |
| + if (err) |
| + return err; |
| + } |
| + |
| + if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) { |
| + err = mtk_flow_set_ipv4_addr(&foe, &data, true); |
| + if (err) |
| + return err; |
| + } |
| + |
| + if (data.vlan.num == 1) { |
| + if (data.vlan.proto != htons(ETH_P_8021Q)) |
| + return -EOPNOTSUPP; |
| + |
| + mtk_foe_entry_set_vlan(&foe, data.vlan.id); |
| + } |
| + if (data.pppoe.num == 1) |
| + mtk_foe_entry_set_pppoe(&foe, data.pppoe.sid); |
| + |
| + err = mtk_flow_set_output_device(eth, &foe, odev); |
| + if (err) |
| + return err; |
| + |
| + entry = kzalloc(sizeof(*entry), GFP_KERNEL); |
| + if (!entry) |
| + return -ENOMEM; |
| + |
| + entry->cookie = f->cookie; |
| + timestamp = mtk_eth_timestamp(eth); |
| + hash = mtk_foe_entry_commit(ð->ppe, &foe, timestamp); |
| + if (hash < 0) { |
| + err = hash; |
| + goto free; |
| + } |
| + |
| + entry->hash = hash; |
| + err = rhashtable_insert_fast(ð->flow_table, &entry->node, |
| + mtk_flow_ht_params); |
| + if (err < 0) |
| + goto clear_flow; |
| + |
| + return 0; |
| +clear_flow: |
| + mtk_foe_entry_clear(ð->ppe, hash); |
| +free: |
| + kfree(entry); |
| + return err; |
| +} |
| + |
| +static int |
| +mtk_flow_offload_destroy(struct mtk_eth *eth, struct flow_cls_offload *f) |
| +{ |
| + struct mtk_flow_entry *entry; |
| + |
| + entry = rhashtable_lookup(ð->flow_table, &f->cookie, |
| + mtk_flow_ht_params); |
| + if (!entry) |
| + return -ENOENT; |
| + |
| + mtk_foe_entry_clear(ð->ppe, entry->hash); |
| + rhashtable_remove_fast(ð->flow_table, &entry->node, |
| + mtk_flow_ht_params); |
| + kfree(entry); |
| + |
| + return 0; |
| +} |
| + |
| +static int |
| +mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f) |
| +{ |
| + struct mtk_flow_entry *entry; |
| + int timestamp; |
| + u32 idle; |
| + |
| + entry = rhashtable_lookup(ð->flow_table, &f->cookie, |
| + mtk_flow_ht_params); |
| + if (!entry) |
| + return -ENOENT; |
| + |
| + timestamp = mtk_foe_entry_timestamp(ð->ppe, entry->hash); |
| + if (timestamp < 0) |
| + return -ETIMEDOUT; |
| + |
| + idle = mtk_eth_timestamp(eth) - timestamp; |
| + f->stats.lastused = jiffies - idle * HZ; |
| + |
| + return 0; |
| +} |
| + |
| +static DEFINE_MUTEX(mtk_flow_offload_mutex); |
| + |
| +static int |
| +mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv) |
| +{ |
| + struct flow_cls_offload *cls = type_data; |
| + struct net_device *dev = cb_priv; |
| + struct mtk_mac *mac = netdev_priv(dev); |
| + struct mtk_eth *eth = mac->hw; |
| + int err; |
| + |
| + if (!tc_can_offload(dev)) |
| + return -EOPNOTSUPP; |
| + |
| + if (type != TC_SETUP_CLSFLOWER) |
| + return -EOPNOTSUPP; |
| + |
| + mutex_lock(&mtk_flow_offload_mutex); |
| + switch (cls->command) { |
| + case FLOW_CLS_REPLACE: |
| + err = mtk_flow_offload_replace(eth, cls); |
| + break; |
| + case FLOW_CLS_DESTROY: |
| + err = mtk_flow_offload_destroy(eth, cls); |
| + break; |
| + case FLOW_CLS_STATS: |
| + err = mtk_flow_offload_stats(eth, cls); |
| + break; |
| + default: |
| + err = -EOPNOTSUPP; |
| + break; |
| + } |
| + mutex_unlock(&mtk_flow_offload_mutex); |
| + |
| + return err; |
| +} |
| + |
| +static int |
| +mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f) |
| +{ |
| + struct mtk_mac *mac = netdev_priv(dev); |
| + struct mtk_eth *eth = mac->hw; |
| + struct nf_flowtable *flowtable; |
| + static LIST_HEAD(block_cb_list); |
| + struct flow_block_cb *block_cb; |
| + flow_setup_cb_t *cb; |
| + int err = 0; |
| + |
| + flowtable = container_of(f->block, struct nf_flowtable, flow_block); |
| + |
| + if (!eth->ppe.foe_table) |
| + return -EOPNOTSUPP; |
| + |
| + if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) |
| + return -EOPNOTSUPP; |
| + |
| + cb = mtk_eth_setup_tc_block_cb; |
| + f->driver_block_list = &block_cb_list; |
| + |
| + down_write(&flowtable->flow_block_lock); |
| + |
| + switch (f->command) { |
| + case FLOW_BLOCK_BIND: |
| + block_cb = flow_block_cb_lookup(f->block, cb, dev); |
| + if (block_cb) { |
| + flow_block_cb_incref(block_cb); |
| + goto unlock; |
| + } |
| + block_cb = flow_block_cb_alloc(cb, dev, dev, NULL); |
| + if (IS_ERR(block_cb)) { |
| + err = PTR_ERR(block_cb); |
| + goto unlock; |
| + } |
| + |
| + flow_block_cb_add(block_cb, f); |
| + list_add_tail(&block_cb->driver_list, &block_cb_list); |
| + break; |
| + case FLOW_BLOCK_UNBIND: |
| + block_cb = flow_block_cb_lookup(f->block, cb, dev); |
| + if (!block_cb) { |
| + err = -ENOENT; |
| + goto unlock; |
| + } |
| + |
| + if (flow_block_cb_decref(block_cb)) { |
| + flow_block_cb_remove(block_cb, f); |
| + list_del(&block_cb->driver_list); |
| + } |
| + break; |
| + default: |
| + err = -EOPNOTSUPP; |
| + break; |
| + } |
| + |
| +unlock: |
| + up_write(&flowtable->flow_block_lock); |
| + return err; |
| +} |
| + |
| +int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
| + void *type_data) |
| +{ |
| + if (type == TC_SETUP_FT) |
| + return mtk_eth_setup_tc_block(dev, type_data); |
| + |
| + return -EOPNOTSUPP; |
| +} |
| + |
| +int mtk_eth_offload_init(struct mtk_eth *eth) |
| +{ |
| + if (!eth->ppe.foe_table) |
| + return 0; |
| + |
| + return rhashtable_init(ð->flow_table, &mtk_flow_ht_params); |
| +} |
| diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_regs.h b/drivers/net/ethernet/mediatek/mtk_ppe_regs.h |
| new file mode 100644 |
| index 000000000..0c45ea090 |
| --- /dev/null |
| +++ b/drivers/net/ethernet/mediatek/mtk_ppe_regs.h |
| @@ -0,0 +1,144 @@ |
| +// SPDX-License-Identifier: GPL-2.0-only |
| +/* Copyright (C) 2020 Felix Fietkau <nbd@nbd.name> */ |
| + |
| +#ifndef __MTK_PPE_REGS_H |
| +#define __MTK_PPE_REGS_H |
| + |
| +#define MTK_PPE_GLO_CFG 0x200 |
| +#define MTK_PPE_GLO_CFG_EN BIT(0) |
| +#define MTK_PPE_GLO_CFG_TSID_EN BIT(1) |
| +#define MTK_PPE_GLO_CFG_IP4_L4_CS_DROP BIT(2) |
| +#define MTK_PPE_GLO_CFG_IP4_CS_DROP BIT(3) |
| +#define MTK_PPE_GLO_CFG_TTL0_DROP BIT(4) |
| +#define MTK_PPE_GLO_CFG_PPE_BSWAP BIT(5) |
| +#define MTK_PPE_GLO_CFG_PSE_HASH_OFS BIT(6) |
| +#define MTK_PPE_GLO_CFG_MCAST_TB_EN BIT(7) |
| +#define MTK_PPE_GLO_CFG_FLOW_DROP_KA BIT(8) |
| +#define MTK_PPE_GLO_CFG_FLOW_DROP_UPDATE BIT(9) |
| +#define MTK_PPE_GLO_CFG_UDP_LITE_EN BIT(10) |
| +#define MTK_PPE_GLO_CFG_UDP_LEN_DROP BIT(11) |
| +#define MTK_PPE_GLO_CFG_MCAST_ENTRIES GNEMASK(13, 12) |
| +#define MTK_PPE_GLO_CFG_BUSY BIT(31) |
| + |
| +#define MTK_PPE_FLOW_CFG 0x204 |
| +#define MTK_PPE_FLOW_CFG_IP4_TCP_FRAG BIT(6) |
| +#define MTK_PPE_FLOW_CFG_IP4_UDP_FRAG BIT(7) |
| +#define MTK_PPE_FLOW_CFG_IP6_3T_ROUTE BIT(8) |
| +#define MTK_PPE_FLOW_CFG_IP6_5T_ROUTE BIT(9) |
| +#define MTK_PPE_FLOW_CFG_IP6_6RD BIT(10) |
| +#define MTK_PPE_FLOW_CFG_IP4_NAT BIT(12) |
| +#define MTK_PPE_FLOW_CFG_IP4_NAPT BIT(13) |
| +#define MTK_PPE_FLOW_CFG_IP4_DSLITE BIT(14) |
| +#define MTK_PPE_FLOW_CFG_L2_BRIDGE BIT(15) |
| +#define MTK_PPE_FLOW_CFG_IP_PROTO_BLACKLIST BIT(16) |
| +#define MTK_PPE_FLOW_CFG_IP4_NAT_FRAG BIT(17) |
| +#define MTK_PPE_FLOW_CFG_IP4_HASH_FLOW_LABEL BIT(18) |
| +#define MTK_PPE_FLOW_CFG_IP4_HASH_GRE_KEY BIT(19) |
| +#define MTK_PPE_FLOW_CFG_IP6_HASH_GRE_KEY BIT(20) |
| + |
| +#define MTK_PPE_IP_PROTO_CHK 0x208 |
| +#define MTK_PPE_IP_PROTO_CHK_IPV4 GENMASK(15, 0) |
| +#define MTK_PPE_IP_PROTO_CHK_IPV6 GENMASK(31, 16) |
| + |
| +#define MTK_PPE_TB_CFG 0x21c |
| +#define MTK_PPE_TB_CFG_ENTRY_NUM GENMASK(2, 0) |
| +#define MTK_PPE_TB_CFG_ENTRY_80B BIT(3) |
| +#define MTK_PPE_TB_CFG_SEARCH_MISS GENMASK(5, 4) |
| +#define MTK_PPE_TB_CFG_AGE_PREBIND BIT(6) |
| +#define MTK_PPE_TB_CFG_AGE_NON_L4 BIT(7) |
| +#define MTK_PPE_TB_CFG_AGE_UNBIND BIT(8) |
| +#define MTK_PPE_TB_CFG_AGE_TCP BIT(9) |
| +#define MTK_PPE_TB_CFG_AGE_UDP BIT(10) |
| +#define MTK_PPE_TB_CFG_AGE_TCP_FIN BIT(11) |
| +#define MTK_PPE_TB_CFG_KEEPALIVE GENMASK(13, 12) |
| +#define MTK_PPE_TB_CFG_HASH_MODE GENMASK(15, 14) |
| +#define MTK_PPE_TB_CFG_SCAN_MODE GENMASK(17, 16) |
| +#define MTK_PPE_TB_CFG_HASH_DEBUG GENMASK(19, 18) |
| + |
| +enum { |
| + MTK_PPE_SCAN_MODE_DISABLED, |
| + MTK_PPE_SCAN_MODE_CHECK_AGE, |
| + MTK_PPE_SCAN_MODE_KEEPALIVE_AGE, |
| +}; |
| + |
| +enum { |
| + MTK_PPE_KEEPALIVE_DISABLE, |
| + MTK_PPE_KEEPALIVE_UNICAST_CPU, |
| + MTK_PPE_KEEPALIVE_DUP_CPU = 3, |
| +}; |
| + |
| +enum { |
| + MTK_PPE_SEARCH_MISS_ACTION_DROP, |
| + MTK_PPE_SEARCH_MISS_ACTION_FORWARD = 2, |
| + MTK_PPE_SEARCH_MISS_ACTION_FORWARD_BUILD = 3, |
| +}; |
| + |
| +#define MTK_PPE_TB_BASE 0x220 |
| + |
| +#define MTK_PPE_TB_USED 0x224 |
| +#define MTK_PPE_TB_USED_NUM GENMASK(13, 0) |
| + |
| +#define MTK_PPE_BIND_RATE 0x228 |
| +#define MTK_PPE_BIND_RATE_BIND GENMASK(15, 0) |
| +#define MTK_PPE_BIND_RATE_PREBIND GENMASK(31, 16) |
| + |
| +#define MTK_PPE_BIND_LIMIT0 0x22c |
| +#define MTK_PPE_BIND_LIMIT0_QUARTER GENMASK(13, 0) |
| +#define MTK_PPE_BIND_LIMIT0_HALF GENMASK(29, 16) |
| + |
| +#define MTK_PPE_BIND_LIMIT1 0x230 |
| +#define MTK_PPE_BIND_LIMIT1_FULL GENMASK(13, 0) |
| +#define MTK_PPE_BIND_LIMIT1_NON_L4 GENMASK(23, 16) |
| + |
| +#define MTK_PPE_KEEPALIVE 0x234 |
| +#define MTK_PPE_KEEPALIVE_TIME GENMASK(15, 0) |
| +#define MTK_PPE_KEEPALIVE_TIME_TCP GENMASK(23, 16) |
| +#define MTK_PPE_KEEPALIVE_TIME_UDP GENMASK(31, 24) |
| + |
| +#define MTK_PPE_UNBIND_AGE 0x238 |
| +#define MTK_PPE_UNBIND_AGE_MIN_PACKETS GENMASK(31, 16) |
| +#define MTK_PPE_UNBIND_AGE_DELTA GENMASK(7, 0) |
| + |
| +#define MTK_PPE_BIND_AGE0 0x23c |
| +#define MTK_PPE_BIND_AGE0_DELTA_NON_L4 GENMASK(30, 16) |
| +#define MTK_PPE_BIND_AGE0_DELTA_UDP GENMASK(14, 0) |
| + |
| +#define MTK_PPE_BIND_AGE1 0x240 |
| +#define MTK_PPE_BIND_AGE1_DELTA_TCP_FIN GENMASK(30, 16) |
| +#define MTK_PPE_BIND_AGE1_DELTA_TCP GENMASK(14, 0) |
| + |
| +#define MTK_PPE_HASH_SEED 0x244 |
| + |
| +#define MTK_PPE_DEFAULT_CPU_PORT 0x248 |
| +#define MTK_PPE_DEFAULT_CPU_PORT_MASK(_n) (GENMASK(2, 0) << ((_n) * 4)) |
| + |
| +#define MTK_PPE_MTU_DROP 0x308 |
| + |
| +#define MTK_PPE_VLAN_MTU0 0x30c |
| +#define MTK_PPE_VLAN_MTU0_NONE GENMASK(13, 0) |
| +#define MTK_PPE_VLAN_MTU0_1TAG GENMASK(29, 16) |
| + |
| +#define MTK_PPE_VLAN_MTU1 0x310 |
| +#define MTK_PPE_VLAN_MTU1_2TAG GENMASK(13, 0) |
| +#define MTK_PPE_VLAN_MTU1_3TAG GENMASK(29, 16) |
| + |
| +#define MTK_PPE_VPM_TPID 0x318 |
| + |
| +#define MTK_PPE_CACHE_CTL 0x320 |
| +#define MTK_PPE_CACHE_CTL_EN BIT(0) |
| +#define MTK_PPE_CACHE_CTL_LOCK_CLR BIT(4) |
| +#define MTK_PPE_CACHE_CTL_REQ BIT(8) |
| +#define MTK_PPE_CACHE_CTL_CLEAR BIT(9) |
| +#define MTK_PPE_CACHE_CTL_CMD GENMASK(13, 12) |
| + |
| +#define MTK_PPE_MIB_CFG 0x334 |
| +#define MTK_PPE_MIB_CFG_EN BIT(0) |
| +#define MTK_PPE_MIB_CFG_RD_CLR BIT(1) |
| + |
| +#define MTK_PPE_MIB_TB_BASE 0x338 |
| + |
| +#define MTK_PPE_MIB_CACHE_CTL 0x350 |
| +#define MTK_PPE_MIB_CACHE_CTL_EN BIT(0) |
| +#define MTK_PPE_MIB_CACHE_CTL_FLUSH BIT(2) |
| + |
| +#endif |
| diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c |
| index a085213dc..813e30495 100644 |
| --- a/drivers/net/ppp/ppp_generic.c |
| +++ b/drivers/net/ppp/ppp_generic.c |
| @@ -1378,12 +1378,34 @@ static void ppp_dev_priv_destructor(struct net_device *dev) |
| ppp_destroy_interface(ppp); |
| } |
| |
| +static int ppp_fill_forward_path(struct net_device_path_ctx *ctx, |
| + struct net_device_path *path) |
| +{ |
| + struct ppp *ppp = netdev_priv(ctx->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->fill_forward_path) |
| + return -EOPNOTSUPP; |
| + |
| + return chan->ops->fill_forward_path(ctx, path, chan); |
| +} |
| + |
| 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_fill_forward_path = ppp_fill_forward_path, |
| }; |
| |
| static struct device_type ppp_type = { |
| diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c |
| index 087b01684..7a8c246ab 100644 |
| --- a/drivers/net/ppp/pppoe.c |
| +++ b/drivers/net/ppp/pppoe.c |
| @@ -974,8 +974,32 @@ static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) |
| return __pppoe_xmit(sk, skb); |
| } |
| |
| +static int pppoe_fill_forward_path(struct net_device_path_ctx *ctx, |
| + struct net_device_path *path, |
| + const struct ppp_channel *chan) |
| +{ |
| + 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 -1; |
| + |
| + path->type = DEV_PATH_PPPOE; |
| + path->encap.proto = htons(ETH_P_PPP_SES); |
| + path->encap.id = be16_to_cpu(po->num); |
| + memcpy(path->encap.h_dest, po->pppoe_pa.remote, ETH_ALEN); |
| + memcpy(ctx->daddr, po->pppoe_pa.remote, ETH_ALEN); |
| + path->dev = ctx->dev; |
| + ctx->dev = dev; |
| + |
| + return 0; |
| +} |
| + |
| static const struct ppp_channel_ops pppoe_chan_ops = { |
| .start_xmit = pppoe_xmit, |
| + .fill_forward_path = pppoe_fill_forward_path, |
| }; |
| |
| static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, |
| diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h |
| index 38af42bf8..9f64504ac 100644 |
| --- a/include/linux/netdevice.h |
| +++ b/include/linux/netdevice.h |
| @@ -829,6 +829,59 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, |
| struct sk_buff *skb, |
| struct net_device *sb_dev); |
| |
| +enum net_device_path_type { |
| + DEV_PATH_ETHERNET = 0, |
| + DEV_PATH_VLAN, |
| + DEV_PATH_BRIDGE, |
| + DEV_PATH_PPPOE, |
| + DEV_PATH_DSA, |
| +}; |
| + |
| +struct net_device_path { |
| + enum net_device_path_type type; |
| + const struct net_device *dev; |
| + union { |
| + struct { |
| + u16 id; |
| + __be16 proto; |
| + u8 h_dest[ETH_ALEN]; |
| + } encap; |
| + struct { |
| + enum { |
| + DEV_PATH_BR_VLAN_KEEP, |
| + DEV_PATH_BR_VLAN_TAG, |
| + DEV_PATH_BR_VLAN_UNTAG, |
| + DEV_PATH_BR_VLAN_UNTAG_HW, |
| + } vlan_mode; |
| + u16 vlan_id; |
| + __be16 vlan_proto; |
| + } bridge; |
| + struct { |
| + int port; |
| + u16 proto; |
| + } dsa; |
| + }; |
| +}; |
| + |
| +#define NET_DEVICE_PATH_STACK_MAX 5 |
| +#define NET_DEVICE_PATH_VLAN_MAX 2 |
| + |
| +struct net_device_path_stack { |
| + int num_paths; |
| + struct net_device_path path[NET_DEVICE_PATH_STACK_MAX]; |
| +}; |
| + |
| +struct net_device_path_ctx { |
| + const struct net_device *dev; |
| + u8 daddr[ETH_ALEN]; |
| + |
| + int num_vlans; |
| + struct { |
| + u16 id; |
| + __be16 proto; |
| + } vlan[NET_DEVICE_PATH_VLAN_MAX]; |
| +}; |
| + |
| enum tc_setup_type { |
| TC_SETUP_QDISC_MQPRIO, |
| TC_SETUP_CLSU32, |
| @@ -844,6 +897,7 @@ enum tc_setup_type { |
| TC_SETUP_ROOT_QDISC, |
| TC_SETUP_QDISC_GRED, |
| TC_SETUP_QDISC_TAPRIO, |
| + TC_SETUP_FT, |
| }; |
| |
| /* These structures hold the attributes of bpf state that are being passed |
| @@ -1239,6 +1293,8 @@ struct tlsdev_ops; |
| * Get devlink port instance associated with a given netdev. |
| * Called with a reference on the netdevice and devlink locks only, |
| * rtnl_lock is not held. |
| + * int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, struct net_device_path *path); |
| + * Get the forwarding path to reach the real device from the HW destination address |
| */ |
| struct net_device_ops { |
| int (*ndo_init)(struct net_device *dev); |
| @@ -1436,6 +1492,8 @@ struct net_device_ops { |
| int (*ndo_xsk_wakeup)(struct net_device *dev, |
| u32 queue_id, u32 flags); |
| struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev); |
| + int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, |
| + struct net_device_path *path); |
| }; |
| |
| /** |
| @@ -2661,6 +2719,8 @@ void dev_remove_offload(struct packet_offload *po); |
| |
| int dev_get_iflink(const struct net_device *dev); |
| int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); |
| +int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr, |
| + struct net_device_path_stack *stack); |
| struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags, |
| unsigned short mask); |
| struct net_device *dev_get_by_name(struct net *net, const char *name); |
| diff --git a/include/linux/ppp_channel.h b/include/linux/ppp_channel.h |
| index 98966064e..91f9a9283 100644 |
| --- a/include/linux/ppp_channel.h |
| +++ b/include/linux/ppp_channel.h |
| @@ -28,6 +28,9 @@ 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 (*fill_forward_path)(struct net_device_path_ctx *, |
| + struct net_device_path *, |
| + const struct ppp_channel *); |
| }; |
| |
| struct ppp_channel { |
| diff --git a/include/net/dsa.h b/include/net/dsa.h |
| index 05f66d487..cafc74218 100644 |
| --- a/include/net/dsa.h |
| +++ b/include/net/dsa.h |
| @@ -561,6 +561,8 @@ struct dsa_switch_ops { |
| struct sk_buff *skb); |
| }; |
| |
| +struct dsa_port *dsa_port_from_netdev(struct net_device *netdev); |
| + |
| struct dsa_switch_driver { |
| struct list_head list; |
| const struct dsa_switch_ops *ops; |
| @@ -653,6 +655,14 @@ static inline int call_dsa_notifiers(unsigned long val, struct net_device *dev, |
| #define BRCM_TAG_GET_PORT(v) ((v) >> 8) |
| #define BRCM_TAG_GET_QUEUE(v) ((v) & 0xff) |
| |
| +#if IS_ENABLED(CONFIG_NET_DSA) |
| +bool dsa_slave_dev_check(const struct net_device *dev); |
| +#else |
| +static inline bool dsa_slave_dev_check(const struct net_device *dev) |
| +{ |
| + return false; |
| +} |
| +#endif |
| |
| netdev_tx_t dsa_enqueue_skb(struct sk_buff *skb, struct net_device *dev); |
| int dsa_port_get_phy_strings(struct dsa_port *dp, uint8_t *data); |
| diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h |
| index c6f7bd22d..59b873653 100644 |
| --- a/include/net/flow_offload.h |
| +++ b/include/net/flow_offload.h |
| @@ -138,6 +138,7 @@ enum flow_action_id { |
| FLOW_ACTION_MPLS_PUSH, |
| FLOW_ACTION_MPLS_POP, |
| FLOW_ACTION_MPLS_MANGLE, |
| + FLOW_ACTION_PPPOE_PUSH, |
| NUM_FLOW_ACTIONS, |
| }; |
| |
| @@ -213,6 +214,9 @@ struct flow_action_entry { |
| u8 bos; |
| u8 ttl; |
| } mpls_mangle; |
| + struct { /* FLOW_ACTION_PPPOE_PUSH */ |
| + u16 sid; |
| + } pppoe; |
| }; |
| }; |
| |
| diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h |
| index 2c739fc75..89ab8f180 100644 |
| --- a/include/net/ip6_route.h |
| +++ b/include/net/ip6_route.h |
| @@ -314,12 +314,13 @@ static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info * |
| !lwtunnel_cmp_encap(nha->fib_nh_lws, nhb->fib_nh_lws); |
| } |
| |
| -static inline unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst) |
| +static inline unsigned int ip6_dst_mtu_maybe_forward(const struct dst_entry *dst, |
| + bool forwarding) |
| { |
| struct inet6_dev *idev; |
| unsigned int mtu; |
| |
| - if (dst_metric_locked(dst, RTAX_MTU)) { |
| + if (!forwarding || dst_metric_locked(dst, RTAX_MTU)) { |
| mtu = dst_metric_raw(dst, RTAX_MTU); |
| if (mtu) |
| goto out; |
| diff --git a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h |
| index 7b3c873f8..e95483192 100644 |
| --- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h |
| +++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h |
| @@ -4,7 +4,4 @@ |
| |
| extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; |
| |
| -#include <linux/sysctl.h> |
| -extern struct ctl_table nf_ct_ipv6_sysctl_table[]; |
| - |
| #endif /* _NF_CONNTRACK_IPV6_H*/ |
| diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h |
| index 90690e37a..ce0bc3e62 100644 |
| --- a/include/net/netfilter/nf_conntrack.h |
| +++ b/include/net/netfilter/nf_conntrack.h |
| @@ -279,6 +279,18 @@ static inline bool nf_ct_should_gc(const struct nf_conn *ct) |
| !nf_ct_is_dying(ct); |
| } |
| |
| +#define NF_CT_DAY (86400 * HZ) |
| + |
| +/* Set an arbitrary timeout large enough not to ever expire, this save |
| + * us a check for the IPS_OFFLOAD_BIT from the packet path via |
| + * nf_ct_is_expired(). |
| + */ |
| +static inline void nf_ct_offload_timeout(struct nf_conn *ct) |
| +{ |
| + if (nf_ct_expires(ct) < NF_CT_DAY / 2) |
| + WRITE_ONCE(ct->timeout, nfct_time_stamp + NF_CT_DAY); |
| +} |
| + |
| struct kernel_param; |
| |
| int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp); |
| diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h |
| index f7a060c6e..7f44a7715 100644 |
| --- a/include/net/netfilter/nf_conntrack_acct.h |
| +++ b/include/net/netfilter/nf_conntrack_acct.h |
| @@ -65,6 +65,17 @@ static inline void nf_ct_set_acct(struct net *net, bool enable) |
| #endif |
| } |
| |
| +void nf_ct_acct_add(struct nf_conn *ct, u32 dir, unsigned int packets, |
| + unsigned int bytes); |
| + |
| +static inline void nf_ct_acct_update(struct nf_conn *ct, u32 dir, |
| + unsigned int bytes) |
| +{ |
| +#if IS_ENABLED(CONFIG_NF_CONNTRACK) |
| + nf_ct_acct_add(ct, dir, 1, bytes); |
| +#endif |
| +} |
| + |
| void nf_conntrack_acct_pernet_init(struct net *net); |
| |
| int nf_conntrack_acct_init(void); |
| diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h |
| index 68d7fc92..7cf89767 100644 |
| --- a/include/net/netfilter/nf_flow_table.h |
| +++ b/include/net/netfilter/nf_flow_table.h |
| @@ -8,31 +8,99 @@ |
| #include <linux/rcupdate.h> |
| #include <linux/netfilter.h> |
| #include <linux/netfilter/nf_conntrack_tuple_common.h> |
| +#include <net/flow_offload.h> |
| #include <net/dst.h> |
| +#include <linux/if_pppox.h> |
| +#include <linux/ppp_defs.h> |
| |
| struct nf_flowtable; |
| +struct nf_flow_rule; |
| +struct flow_offload; |
| +enum flow_offload_tuple_dir; |
| + |
| +struct nf_flow_key { |
| + struct flow_dissector_key_meta meta; |
| + struct flow_dissector_key_control control; |
| + struct flow_dissector_key_control enc_control; |
| + struct flow_dissector_key_basic basic; |
| + struct flow_dissector_key_vlan vlan; |
| + struct flow_dissector_key_vlan cvlan; |
| + union { |
| + struct flow_dissector_key_ipv4_addrs ipv4; |
| + struct flow_dissector_key_ipv6_addrs ipv6; |
| + }; |
| + struct flow_dissector_key_keyid enc_key_id; |
| + union { |
| + struct flow_dissector_key_ipv4_addrs enc_ipv4; |
| + struct flow_dissector_key_ipv6_addrs enc_ipv6; |
| + }; |
| + struct flow_dissector_key_tcp tcp; |
| + struct flow_dissector_key_ports tp; |
| +} __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. */ |
| + |
| +struct nf_flow_match { |
| + struct flow_dissector dissector; |
| + struct nf_flow_key key; |
| + struct nf_flow_key mask; |
| +}; |
| + |
| +struct nf_flow_rule { |
| + struct nf_flow_match match; |
| + struct flow_rule *rule; |
| +}; |
| |
| struct nf_flowtable_type { |
| struct list_head list; |
| int family; |
| int (*init)(struct nf_flowtable *ft); |
| + int (*setup)(struct nf_flowtable *ft, |
| + struct net_device *dev, |
| + enum flow_block_command cmd); |
| + int (*action)(struct net *net, |
| + const struct flow_offload *flow, |
| + enum flow_offload_tuple_dir dir, |
| + struct nf_flow_rule *flow_rule); |
| void (*free)(struct nf_flowtable *ft); |
| nf_hookfn *hook; |
| struct module *owner; |
| }; |
| |
| +enum nf_flowtable_flags { |
| + NF_FLOWTABLE_HW_OFFLOAD = 0x1, /* NFT_FLOWTABLE_HW_OFFLOAD */ |
| + NF_FLOWTABLE_COUNTER = 0x2, /* NFT_FLOWTABLE_COUNTER */ |
| +}; |
| + |
| struct nf_flowtable { |
| struct list_head list; |
| struct rhashtable rhashtable; |
| + int priority; |
| const struct nf_flowtable_type *type; |
| struct delayed_work gc_work; |
| + unsigned int flags; |
| + struct flow_block flow_block; |
| + struct rw_semaphore flow_block_lock; /* Guards flow_block */ |
| + possible_net_t net; |
| }; |
| |
| +static inline bool nf_flowtable_hw_offload(struct nf_flowtable *flowtable) |
| +{ |
| + return flowtable->flags & NF_FLOWTABLE_HW_OFFLOAD; |
| +} |
| + |
| enum flow_offload_tuple_dir { |
| FLOW_OFFLOAD_DIR_ORIGINAL = IP_CT_DIR_ORIGINAL, |
| FLOW_OFFLOAD_DIR_REPLY = IP_CT_DIR_REPLY, |
| - FLOW_OFFLOAD_DIR_MAX = IP_CT_DIR_MAX |
| }; |
| +#define FLOW_OFFLOAD_DIR_MAX IP_CT_DIR_MAX |
| + |
| +enum flow_offload_xmit_type { |
| + FLOW_OFFLOAD_XMIT_UNSPEC = 0, |
| + FLOW_OFFLOAD_XMIT_NEIGH, |
| + FLOW_OFFLOAD_XMIT_XFRM, |
| + FLOW_OFFLOAD_XMIT_DIRECT, |
| +}; |
| + |
| +#define NF_FLOW_TABLE_ENCAP_MAX 2 |
| |
| struct flow_offload_tuple { |
| union { |
| @@ -52,13 +120,30 @@ struct flow_offload_tuple { |
| |
| u8 l3proto; |
| u8 l4proto; |
| - u8 dir; |
| + struct { |
| + u16 id; |
| + __be16 proto; |
| + } encap[NF_FLOW_TABLE_ENCAP_MAX]; |
| |
| - u16 mtu; |
| + /* All members above are keys for lookups, see flow_offload_hash(). */ |
| + struct { } __hash; |
| |
| - struct { |
| - struct dst_entry *dst_cache; |
| - u32 dst_cookie; |
| + u8 dir:2, |
| + xmit_type:2, |
| + encap_num:2, |
| + in_vlan_ingress:2; |
| + u16 mtu; |
| + union { |
| + struct { |
| + struct dst_entry *dst_cache; |
| + u32 dst_cookie; |
| + }; |
| + struct { |
| + u32 ifidx; |
| + u32 hw_ifidx; |
| + u8 h_source[ETH_ALEN]; |
| + u8 h_dest[ETH_ALEN]; |
| + } out; |
| }; |
| }; |
| |
| @@ -67,52 +152,139 @@ struct flow_offload_tuple_rhash { |
| struct flow_offload_tuple tuple; |
| }; |
| |
| -#define FLOW_OFFLOAD_SNAT 0x1 |
| -#define FLOW_OFFLOAD_DNAT 0x2 |
| -#define FLOW_OFFLOAD_DYING 0x4 |
| -#define FLOW_OFFLOAD_TEARDOWN 0x8 |
| +enum nf_flow_flags { |
| + NF_FLOW_SNAT, |
| + NF_FLOW_DNAT, |
| + NF_FLOW_TEARDOWN, |
| + NF_FLOW_HW, |
| + NF_FLOW_HW_DYING, |
| + NF_FLOW_HW_DEAD, |
| + NF_FLOW_HW_PENDING, |
| +}; |
| + |
| +enum flow_offload_type { |
| + NF_FLOW_OFFLOAD_UNSPEC = 0, |
| + NF_FLOW_OFFLOAD_ROUTE, |
| +}; |
| |
| struct flow_offload { |
| struct flow_offload_tuple_rhash tuplehash[FLOW_OFFLOAD_DIR_MAX]; |
| - u32 flags; |
| - union { |
| - /* Your private driver data here. */ |
| - u32 timeout; |
| - }; |
| + struct nf_conn *ct; |
| + unsigned long flags; |
| + u16 type; |
| + u32 timeout; |
| + struct rcu_head rcu_head; |
| }; |
| |
| #define NF_FLOW_TIMEOUT (30 * HZ) |
| +#define nf_flowtable_time_stamp (u32)jiffies |
| + |
| +unsigned long flow_offload_get_timeout(struct flow_offload *flow); |
| + |
| +static inline __s32 nf_flow_timeout_delta(unsigned int timeout) |
| +{ |
| + return (__s32)(timeout - nf_flowtable_time_stamp); |
| +} |
| |
| struct nf_flow_route { |
| struct { |
| - struct dst_entry *dst; |
| + struct dst_entry *dst; |
| + struct { |
| + u32 ifindex; |
| + struct { |
| + u16 id; |
| + __be16 proto; |
| + } encap[NF_FLOW_TABLE_ENCAP_MAX]; |
| + u8 num_encaps:2, |
| + ingress_vlans:2; |
| + } in; |
| + struct { |
| + u32 ifindex; |
| + u32 hw_ifindex; |
| + u8 h_source[ETH_ALEN]; |
| + u8 h_dest[ETH_ALEN]; |
| + } out; |
| + enum flow_offload_xmit_type xmit_type; |
| } tuple[FLOW_OFFLOAD_DIR_MAX]; |
| }; |
| |
| -struct flow_offload *flow_offload_alloc(struct nf_conn *ct, |
| - struct nf_flow_route *route); |
| +struct flow_offload *flow_offload_alloc(struct nf_conn *ct); |
| void flow_offload_free(struct flow_offload *flow); |
| |
| +static inline int |
| +nf_flow_table_offload_add_cb(struct nf_flowtable *flow_table, |
| + flow_setup_cb_t *cb, void *cb_priv) |
| +{ |
| + struct flow_block *block = &flow_table->flow_block; |
| + struct flow_block_cb *block_cb; |
| + int err = 0; |
| + |
| + down_write(&flow_table->flow_block_lock); |
| + block_cb = flow_block_cb_lookup(block, cb, cb_priv); |
| + if (block_cb) { |
| + err = -EEXIST; |
| + goto unlock; |
| + } |
| + |
| + block_cb = flow_block_cb_alloc(cb, cb_priv, cb_priv, NULL); |
| + if (IS_ERR(block_cb)) { |
| + err = PTR_ERR(block_cb); |
| + goto unlock; |
| + } |
| + |
| + list_add_tail(&block_cb->list, &block->cb_list); |
| + |
| +unlock: |
| + up_write(&flow_table->flow_block_lock); |
| + return err; |
| +} |
| + |
| +static inline void |
| +nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table, |
| + flow_setup_cb_t *cb, void *cb_priv) |
| +{ |
| + struct flow_block *block = &flow_table->flow_block; |
| + struct flow_block_cb *block_cb; |
| + |
| + down_write(&flow_table->flow_block_lock); |
| + block_cb = flow_block_cb_lookup(block, cb, cb_priv); |
| + if (block_cb) { |
| + list_del(&block_cb->list); |
| + flow_block_cb_free(block_cb); |
| + } else { |
| + WARN_ON(true); |
| + } |
| + up_write(&flow_table->flow_block_lock); |
| +} |
| + |
| +int flow_offload_route_init(struct flow_offload *flow, |
| + const struct nf_flow_route *route); |
| + |
| int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow); |
| +void flow_offload_refresh(struct nf_flowtable *flow_table, |
| + struct flow_offload *flow); |
| + |
| struct flow_offload_tuple_rhash *flow_offload_lookup(struct nf_flowtable *flow_table, |
| struct flow_offload_tuple *tuple); |
| +void nf_flow_table_gc_cleanup(struct nf_flowtable *flowtable, |
| + struct net_device *dev); |
| void nf_flow_table_cleanup(struct net_device *dev); |
| |
| int nf_flow_table_init(struct nf_flowtable *flow_table); |
| void nf_flow_table_free(struct nf_flowtable *flow_table); |
| |
| void flow_offload_teardown(struct flow_offload *flow); |
| -static inline void flow_offload_dead(struct flow_offload *flow) |
| -{ |
| - flow->flags |= FLOW_OFFLOAD_DYING; |
| -} |
| |
| -int nf_flow_snat_port(const struct flow_offload *flow, |
| - struct sk_buff *skb, unsigned int thoff, |
| - u8 protocol, enum flow_offload_tuple_dir dir); |
| -int nf_flow_dnat_port(const struct flow_offload *flow, |
| - struct sk_buff *skb, unsigned int thoff, |
| - u8 protocol, enum flow_offload_tuple_dir dir); |
| +int nf_flow_table_iterate(struct nf_flowtable *flow_table, |
| + void (*iter)(struct flow_offload *flow, void *data), |
| + void *data); |
| + |
| +void nf_flow_snat_port(const struct flow_offload *flow, |
| + struct sk_buff *skb, unsigned int thoff, |
| + u8 protocol, enum flow_offload_tuple_dir dir); |
| +void nf_flow_dnat_port(const struct flow_offload *flow, |
| + struct sk_buff *skb, unsigned int thoff, |
| + u8 protocol, enum flow_offload_tuple_dir dir); |
| |
| struct flow_ports { |
| __be16 source, dest; |
| @@ -126,4 +298,41 @@ unsigned int nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, |
| #define MODULE_ALIAS_NF_FLOWTABLE(family) \ |
| MODULE_ALIAS("nf-flowtable-" __stringify(family)) |
| |
| +void nf_flow_offload_add(struct nf_flowtable *flowtable, |
| + struct flow_offload *flow); |
| +void nf_flow_offload_del(struct nf_flowtable *flowtable, |
| + struct flow_offload *flow); |
| +void nf_flow_offload_stats(struct nf_flowtable *flowtable, |
| + struct flow_offload *flow); |
| + |
| +void nf_flow_table_offload_flush(struct nf_flowtable *flowtable); |
| +int nf_flow_table_offload_setup(struct nf_flowtable *flowtable, |
| + struct net_device *dev, |
| + enum flow_block_command cmd); |
| +int nf_flow_rule_route_ipv4(struct net *net, const struct flow_offload *flow, |
| + enum flow_offload_tuple_dir dir, |
| + struct nf_flow_rule *flow_rule); |
| +int nf_flow_rule_route_ipv6(struct net *net, const struct flow_offload *flow, |
| + enum flow_offload_tuple_dir dir, |
| + struct nf_flow_rule *flow_rule); |
| + |
| +int nf_flow_table_offload_init(void); |
| +void nf_flow_table_offload_exit(void); |
| + |
| +static inline __be16 nf_flow_pppoe_proto(const struct sk_buff *skb) |
| +{ |
| + __be16 proto; |
| + |
| + proto = *((__be16 *)(skb_mac_header(skb) + ETH_HLEN + |
| + sizeof(struct pppoe_hdr))); |
| + switch (proto) { |
| + case htons(PPP_IP): |
| + return htons(ETH_P_IP); |
| + case htons(PPP_IPV6): |
| + return htons(ETH_P_IPV6); |
| + } |
| + |
| + return 0; |
| +} |
| + |
| #endif /* _NF_FLOW_TABLE_H */ |
| diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h |
| index 806454e76..9e3963c8f 100644 |
| --- a/include/net/netns/conntrack.h |
| +++ b/include/net/netns/conntrack.h |
| @@ -27,6 +27,9 @@ struct nf_tcp_net { |
| int tcp_loose; |
| int tcp_be_liberal; |
| int tcp_max_retrans; |
| +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| + unsigned int offload_timeout; |
| +#endif |
| }; |
| |
| enum udp_conntrack { |
| @@ -37,6 +40,9 @@ enum udp_conntrack { |
| |
| struct nf_udp_net { |
| unsigned int timeouts[UDP_CT_MAX]; |
| +#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) |
| + unsigned int offload_timeout; |
| +#endif |
| }; |
| |
| struct nf_icmp_net { |
| diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h |
| index 336014bf8..ae698d11c 100644 |
| --- a/include/uapi/linux/netfilter/nf_conntrack_common.h |
| +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h |
| @@ -105,14 +105,19 @@ enum ip_conntrack_status { |
| IPS_OFFLOAD_BIT = 14, |
| IPS_OFFLOAD = (1 << IPS_OFFLOAD_BIT), |
| |
| + /* Conntrack has been offloaded to hardware. */ |
| + IPS_HW_OFFLOAD_BIT = 15, |
| + IPS_HW_OFFLOAD = (1 << IPS_HW_OFFLOAD_BIT), |
| + |
| /* Be careful here, modifying these bits can make things messy, |
| * so don't let users modify them directly. |
| */ |
| IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK | IPS_NAT_MASK | |
| IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING | |
| - IPS_SEQ_ADJUST | IPS_TEMPLATE | IPS_OFFLOAD), |
| + IPS_SEQ_ADJUST | IPS_TEMPLATE | |
| + IPS_OFFLOAD | IPS_HW_OFFLOAD), |
| |
| - __IPS_MAX_BIT = 15, |
| + __IPS_MAX_BIT = 16, |
| }; |
| |
| /* Connection tracking event types */ |
| diff --git a/include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h b/include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h |
| new file mode 100644 |
| index 000000000..5841bbe0e |
| --- /dev/null |
| +++ b/include/uapi/linux/netfilter/xt_FLOWOFFLOAD.h |
| @@ -0,0 +1,17 @@ |
| +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ |
| +#ifndef _XT_FLOWOFFLOAD_H |
| +#define _XT_FLOWOFFLOAD_H |
| + |
| +#include <linux/types.h> |
| + |
| +enum { |
| + XT_FLOWOFFLOAD_HW = 1 << 0, |
| + |
| + XT_FLOWOFFLOAD_MASK = XT_FLOWOFFLOAD_HW |
| +}; |
| + |
| +struct xt_flowoffload_target_info { |
| + __u32 flags; |
| +}; |
| + |
| +#endif /* _XT_FLOWOFFLOAD_H */ |
| diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c |
| index 589615ec4..444ab5fae 100644 |
| --- a/net/8021q/vlan_dev.c |
| +++ b/net/8021q/vlan_dev.c |
| @@ -747,6 +747,26 @@ static int vlan_dev_get_iflink(const struct net_device *dev) |
| return real_dev->ifindex; |
| } |
| |
| +static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx, |
| + struct net_device_path *path) |
| +{ |
| + struct vlan_dev_priv *vlan = vlan_dev_priv(ctx->dev); |
| + |
| + path->type = DEV_PATH_VLAN; |
| + path->encap.id = vlan->vlan_id; |
| + path->encap.proto = vlan->vlan_proto; |
| + path->dev = ctx->dev; |
| + ctx->dev = vlan->real_dev; |
| + if (ctx->num_vlans >= ARRAY_SIZE(ctx->vlan)) |
| + return -ENOSPC; |
| + |
| + ctx->vlan[ctx->num_vlans].id = vlan->vlan_id; |
| + ctx->vlan[ctx->num_vlans].proto = vlan->vlan_proto; |
| + ctx->num_vlans++; |
| + |
| + return 0; |
| +} |
| + |
| static const struct ethtool_ops vlan_ethtool_ops = { |
| .get_link_ksettings = vlan_ethtool_get_link_ksettings, |
| .get_drvinfo = vlan_ethtool_get_drvinfo, |
| @@ -785,6 +805,7 @@ static const struct net_device_ops vlan_netdev_ops = { |
| #endif |
| .ndo_fix_features = vlan_dev_fix_features, |
| .ndo_get_iflink = vlan_dev_get_iflink, |
| + .ndo_fill_forward_path = vlan_dev_fill_forward_path, |
| }; |
| |
| static void vlan_dev_free(struct net_device *dev) |
| diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c |
| index 501f77f0f..0940b44cd 100644 |
| --- a/net/bridge/br_device.c |
| +++ b/net/bridge/br_device.c |
| @@ -377,6 +377,54 @@ static int br_del_slave(struct net_device *dev, struct net_device *slave_dev) |
| return br_del_if(br, slave_dev); |
| } |
| |
| +static int br_fill_forward_path(struct net_device_path_ctx *ctx, |
| + struct net_device_path *path) |
| +{ |
| + struct net_bridge_fdb_entry *f; |
| + struct net_bridge_port *dst; |
| + struct net_bridge *br; |
| + |
| + if (netif_is_bridge_port(ctx->dev)) |
| + return -1; |
| + |
| + br = netdev_priv(ctx->dev); |
| + |
| + br_vlan_fill_forward_path_pvid(br, ctx, path); |
| + |
| + f = br_fdb_find_rcu(br, ctx->daddr, path->bridge.vlan_id); |
| + if (!f || !f->dst) |
| + return -1; |
| + |
| + dst = READ_ONCE(f->dst); |
| + if (!dst) |
| + return -1; |
| + |
| + if (br_vlan_fill_forward_path_mode(br, dst, path)) |
| + return -1; |
| + |
| + path->type = DEV_PATH_BRIDGE; |
| + path->dev = dst->br->dev; |
| + ctx->dev = dst->dev; |
| + |
| + switch (path->bridge.vlan_mode) { |
| + case DEV_PATH_BR_VLAN_TAG: |
| + if (ctx->num_vlans >= ARRAY_SIZE(ctx->vlan)) |
| + return -ENOSPC; |
| + ctx->vlan[ctx->num_vlans].id = path->bridge.vlan_id; |
| + ctx->vlan[ctx->num_vlans].proto = path->bridge.vlan_proto; |
| + ctx->num_vlans++; |
| + break; |
| + case DEV_PATH_BR_VLAN_UNTAG_HW: |
| + case DEV_PATH_BR_VLAN_UNTAG: |
| + ctx->num_vlans--; |
| + break; |
| + case DEV_PATH_BR_VLAN_KEEP: |
| + break; |
| + } |
| + |
| + return 0; |
| +} |
| + |
| static const struct ethtool_ops br_ethtool_ops = { |
| .get_drvinfo = br_getinfo, |
| .get_link = ethtool_op_get_link, |
| @@ -410,6 +458,7 @@ static const struct net_device_ops br_netdev_ops = { |
| .ndo_bridge_setlink = br_setlink, |
| .ndo_bridge_dellink = br_dellink, |
| .ndo_features_check = passthru_features_check, |
| + .ndo_fill_forward_path = br_fill_forward_path, |
| }; |
| |
| static struct device_type br_type = { |
| diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h |
| index a736be8a1..4bd9e9b57 100644 |
| --- a/net/bridge/br_private.h |
| +++ b/net/bridge/br_private.h |
| @@ -912,6 +912,13 @@ void br_vlan_port_event(struct net_bridge_port *p, unsigned long event); |
| int br_vlan_bridge_event(struct net_device *dev, unsigned long event, |
| void *ptr); |
| |
| +void br_vlan_fill_forward_path_pvid(struct net_bridge *br, |
| + struct net_device_path_ctx *ctx, |
| + struct net_device_path *path); |
| +int br_vlan_fill_forward_path_mode(struct net_bridge *br, |
| + struct net_bridge_port *dst, |
| + struct net_device_path *path); |
| + |
| static inline struct net_bridge_vlan_group *br_vlan_group( |
| const struct net_bridge *br) |
| { |
| @@ -1066,6 +1073,19 @@ static inline int nbp_get_num_vlan_infos(struct net_bridge_port *p, |
| return 0; |
| } |
| |
| +static inline void br_vlan_fill_forward_path_pvid(struct net_bridge *br, |
| + struct net_device_path_ctx *ctx, |
| + struct net_device_path *path) |
| +{ |
| +} |
| + |
| +static inline int br_vlan_fill_forward_path_mode(struct net_bridge *br, |
| + struct net_bridge_port *dst, |
| + struct net_device_path *path) |
| +{ |
| + return 0; |
| +} |
| + |
| static inline struct net_bridge_vlan_group *br_vlan_group( |
| const struct net_bridge *br) |
| { |
|