net: dsa: mxl862xx: add support for bridge offloading
Daniel Golle
maintainerv3 cover net: dsa: mxl862xx: add support for bridge offloading
As a next step to complete the mxl862xx DSA driver, add support for offloading forwarding between bridged ports to the switch hardware.
This works pretty much without any big surprises, apart from two subtleties:
* per-port control over flooding behavior has to be implemented by (ab)using a 0-rate QoS meters as stopper in lack of any better option.
* STP state transition unconditionally enables learning on a port even if it was previously explicitely disabled (a firmware bug)
Note that as the driver is still lacking all VLAN features (which are going to be added next), at this point some of the bridge_vlan_aware.sh tests are failing after applying this series.
This is expected and cannot be avoided without implementing port_vlan_filtering + port_vlan_add/del. And adding both bridge and VLAN offloading at the same time would be too much for anyone to review, so VLAN support is going to be submitted in a follow-up series immediately after this series has been accepted.
All other relevant selftests (including bridge_vlan_unaware.sh) are still passing.
Changes since v2:
* refactor .port_bridge_join and .port_bridge_leave as requested by Vladimir Oltean
* include linux/etherdevice.h which was missing and causing build to fail (it accidentally slipped into a follow-up patch)
* remove left-over manual reset of learning state for port leaving bridge
* remove unnecessary call to mxl862xx_port_fast_age() for port leaving bridge
* add kernel-doc comments in mxl862xx.h instead of sporadic inline comments covering only some of the struct members
* some other minor cosmetics (linebreaks, whitespace) here and there
Changes since v1:
* don't set dsa_default_offload_fwd_mark() on link-local frames
* fix kernel-doc comments in API header
* use bitfield helpers for compound tci field in fdb API
* add missing endian conversion for mxl862xx_stp_port_cfg.port_state as well as mxl862xx_mac_table_read.tci (spotted by AI review)
* drop manually resetting port learning state on bridge<->standalone transitions, DSA framework takes care of that
* don't abort updating bridge ports on error, return error at the end
* report error in mxl862xx_port_bridge_leave()
* create mxl862xx_get_fid() helper and use it in mxl862xx_port_fdb_add() and mxl862xx_port_fdb_del()
* propagete error of callback function in mxl862xx_port_fdb_dump()
* manually mxl862xx_port_fast_age() in mxl862xx_port_stp_state_set() to avoid FDB poisoning due to race condition
Daniel Golle (2):
dsa: tag_mxl862xx: set dsa_default_offload_fwd_mark()
net: dsa: mxl862xx: implement bridge offloading
drivers/net/dsa/mxl862xx/mxl862xx-api.h | 178 +++++++ drivers/net/dsa/mxl862xx/mxl862xx-cmd.h | 19 +- drivers/net/dsa/mxl862xx/mxl862xx.c | 586 ++++++++++++++++++++++-- drivers/net/dsa/mxl862xx/mxl862xx.h | 52 +++ net/dsa/tag_mxl862xx.c | 3 + 5 files changed, 805 insertions(+), 33 deletions(-)
Signature · 1 line
2.53.0
Daniel Golle
maintainerPATCH v3 1/2 dsa: tag_mxl862xx: set dsa_default_offload_fwd_mark()
The MxL862xx offloads bridge forwarding in hardware, so set dsa_default_offload_fwd_mark() to avoid duplicate forwarding of packets of (eg. flooded) frames arriving at the CPU port.
Link-local frames are directly trapped to the CPU port only, so don't set dsa_default_offload_fwd_mark() on those.
---
v3: no changes
v2: don't set dsa_default_offload_fwd_mark() on link-local frames
--- net/dsa/tag_mxl862xx.c | 3 +++ 1 file changed, 3 insertions(+)
net/dsa/tag_mxl862xx.c +3 -0
@@ -92,6 +92,9 @@ static struct sk_buff *mxl862_tag_rcv(struct sk_buff *skb,skb_pull_rcsum (skb,MXL862_HEADER_LEN );dsa_strip_etype_header (skb,MXL862_HEADER_LEN ); +if (likely (!is_link_local_ether_addr (eth_hdr (skb)->h_dest))) +dsa_default_offload_fwd_mark (skb); +return skb; }
Signature · 1 line
2.53.0
Daniel Golle
maintainerPATCH v3 2/2 net: dsa: mxl862xx: implement bridge offloading
In reply to Daniel GolleAdd support for bridge offloading on the mxl862xx DSA driver.
Implement joining and leaving bridges as well as add, delete and dump operations on isolated FDBs and setting a port's STP state.
The switch supports a maximum of 63 bridges, however, up to 12 may be used as "single-port bridges" to isolate standalone ports. Allowing up to 48 bridges to be offloaded seems more than enough on that hardware, hence that is set as max_num_bridges.
A total of 128 bridge ports are supported in the bridge portmap, and virtual bridge ports have to be used eg. for link-aggregation, hence potentially exceeding the number of hardware ports.
As there are now more users of the BRIDGEPORT_CONFIG_SET API and the state of each port is cached locally, introduce a helper function mxl862xx_set_bridge_port(struct dsa_switch *ds, int port) which is then also be used to replace the direct calls to the API in mxl862xx_setup_cpu_bridge() and mxl862xx_add_single_port_bridge().
Note that there is no convenient way to control flooding on per-port level, so the driver is using a 0-rate QoS meter setup as a stopper in lack of any better option. This works, but allows a single 64-byte packet to pass once after reset. While this limitation doesn't seem to be a problem in practice, it has the effect that the bridge_vlan_unaware.sh selftest only passes the FDB test the 2nd time the test is run after boot (and any subsequent time after that, of course).
---
v3:
* refactor .port_bridge_join and .port_bridge_leave as requested by Vladimir Oltean
* include linux/etherdevice.h which was missing and causing build to fail (it accidentally slipped into a follow-up patch)
* remove left-over manual reset of learning state for port leaving bridge
* remove unnecessary call to mxl862xx_port_fast_age() for port leaving bridge
* add kernel-doc comments in mxl862xx.h instead of sporadic inline comments covering only some of the struct members
* some other minor cosmetics (linebreaks, whitespace) here and there
v2:
* fix kernel-doc comments in API header
* use bitfield helpers for compound tci field in fdb API
* add missing endian conversion for mxl862xx_stp_port_cfg.port_state as well as mxl862xx_mac_table_read.tci (spotted by AI review)
* drop manually resetting port learning state on bridge<->standalone transitions, DSA framework takes care of that
* don't abort updating bridge ports on error, return error at the end
* report error in mxl862xx_port_bridge_leave()
* create mxl862xx_get_fid() helper and use it in mxl862xx_port_fdb_add() and mxl862xx_port_fdb_del()
* propagete error of callback function in mxl862xx_port_fdb_dump()
* manually mxl862xx_port_fast_age() in mxl862xx_port_stp_state_set() to avoid FDB poisoning due to race condition
--- drivers/net/dsa/mxl862xx/mxl862xx-api.h | 178 +++++++ drivers/net/dsa/mxl862xx/mxl862xx-cmd.h | 19 +- drivers/net/dsa/mxl862xx/mxl862xx.c | 586 ++++++++++++++++++++++-- drivers/net/dsa/mxl862xx/mxl862xx.h | 52 +++ 4 files changed, 802 insertions(+), 33 deletions(-)
drivers/net/dsa/mxl862xx/mxl862xx-api.h +178 -0
@@ -3,6 +3,7 @@#ifndef __MXL862XX_API_H#define __MXL862XX_API_H +#include <linux/bits.h> #include <linux/if_ether.h> /**
@@ -34,6 +35,123 @@ struct mxl862xx_register_mod {__le16 mask; } __packed; +/** +* enum mxl862xx_mac_table_filter - Source/Destination MAC address filtering +* +* @MXL862XX_MAC_FILTER_NONE: no filter +* @MXL862XX_MAC_FILTER_SRC: source address filter +* @MXL862XX_MAC_FILTER_DEST: destination address filter +* @MXL862XX_MAC_FILTER_BOTH: both source and destination filter +*/ +enum mxl862xx_mac_table_filter { +MXL862XX_MAC_FILTER_NONE =0 , +MXL862XX_MAC_FILTER_SRC =BIT (0 ), +MXL862XX_MAC_FILTER_DEST =BIT (1 ), +MXL862XX_MAC_FILTER_BOTH =BIT (0 ) |BIT (1 ), +}; + +#define MXL862XX_TCI_VLAN_ID GENMASK(11, 0) +#define MXL862XX_TCI_VLAN_CFI_DEI BIT(12) +#define MXL862XX_TCI_VLAN_PRI GENMASK(15, 13) + +/** +* struct mxl862xx_mac_table_add - MAC Table Entry to be added +* @fid: Filtering Identifier (FID) (not supported by all switches) +* @port_id: Ethernet Port number +* @port_map: Bridge Port Map +* @sub_if_id: Sub-Interface Identifier Destination +* @age_timer: Aging Time in seconds +* @vlan_id: STAG VLAN Id +* @static_entry: Static Entry (value will be aged out if not set to static) +* @traffic_class: Egress queue traffic class +* @mac: MAC Address to add to the table +* @filter_flag: See &enum mxl862xx_mac_table_filter +* @igmp_controlled: Packet is marked as IGMP controlled if destination MAC +* address matche MAC in this entry +* @associated_mac: Associated Mac address +* @tci: TCI for B-Step +* Bit [0:11] - VLAN ID +* Bit [12] - VLAN CFI/DEI +* Bit [13:15] - VLAN PRI +*/ +struct mxl862xx_mac_table_add { +__le16 fid; +__le32 port_id; +__le16 port_map[8 ]; +__le16 sub_if_id; +int age_timer; +__le16 vlan_id; +u8 static_entry; +u8 traffic_class; +u8 mac[ETH_ALEN ]; +u8 filter_flag; +u8 igmp_controlled; +u8 associated_mac[ETH_ALEN ]; +__le16 tci; +} __packed; + +/** +* struct mxl862xx_mac_table_remove - MAC Table Entry to be removed +* @fid: Filtering Identifier (FID) +* @mac: MAC Address to be removed from the table. +* @filter_flag: See &enum mxl862xx_mac_table_filter +* @tci: TCI for B-Step +* Bit [0:11] - VLAN ID +* Bit [12] - VLAN CFI/DEI +* Bit [13:15] - VLAN PRI +*/ +struct mxl862xx_mac_table_remove { +__le16 fid; +u8 mac[ETH_ALEN ]; +u8 filter_flag; +__le16 tci; +} __packed; + +/** +* struct mxl862xx_mac_table_read - MAC Table Entry to be read +* @initial: Restart the get operation from the beginning of the table +* @last: Indicates that the read operation returned last entry +* @fid: Get the MAC table entry belonging to the given Filtering Identifier +* @port_id: The Bridge Port ID +* @port_map: Bridge Port Map +* @age_timer: Aging Time +* @vlan_id: STAG VLAN Id +* @static_entry: Indicates if this is a Static Entry +* @sub_if_id: Sub-Interface Identifier Destination +* @mac: MAC Address. Filled out by the switch API implementation. +* @filter_flag: See &enum mxl862xx_mac_table_filter +* @igmp_controlled: Packet is marked as IGMP controlled if destination MAC +* address matches the MAC in this entry +* @entry_changed: Indicate if the Entry has Changed +* @associated_mac: Associated MAC address +* @hit_status: MAC Table Hit Status Update +* @tci: TCI for B-Step +* Bit [0:11] - VLAN ID +* Bit [12] - VLAN CFI/DEI +* Bit [13:15] - VLAN PRI +* @first_bridge_port_id: The port this MAC address has first been learned. +* This is used for loop detection. +*/ +struct mxl862xx_mac_table_read { +u8 initial; +u8 last; +__le16 fid; +__le32 port_id; +__le16 port_map[8 ]; +int age_timer; +__le16 vlan_id; +u8 static_entry; +__le16 sub_if_id; +u8 mac[ETH_ALEN ]; +u8 filter_flag; +u8 igmp_controlled; +u8 entry_changed; +u8 associated_mac[ETH_ALEN ]; +u8 hit_status; +__le16 tci; +__le16 first_bridge_port_id; +} __packed; +/** * enum mxl862xx_mac_clear_type - MAC table clear type * @MXL862XX_MAC_CLEAR_PHY_PORT: clear dynamic entries based on port_id
@@ -138,6 +256,40 @@ enum mxl862xx_bridge_port_egress_meter { MXL862XX_BRIDGE_PORT_EGRESS_METER_MAX, }; +/** +* struct mxl862xx_qos_meter_cfg - Rate meter configuration +* @enable: Enable/disable meter +* @meter_id: Meter ID (assigned by firmware on alloc) +* @meter_name: Meter name string +* @meter_type: Meter algorithm type (srTCM = 0, trTCM = 1) +* @cbs: Committed Burst Size (in bytes) +* @res1: Reserved +* @ebs: Excess Burst Size (in bytes) +* @res2: Reserved +* @rate: Committed Information Rate (in kbit/s) +* @pi_rate: Peak Information Rate (in kbit/s) +* @colour_blind_mode: Colour-blind mode enable +* @pkt_mode: Packet mode enable +* @local_overhd: Local overhead accounting enable +* @local_overhd_val: Local overhead accounting value +*/ +struct mxl862xx_qos_meter_cfg { +u8 enable; +__le16 meter_id; +char meter_name[32 ]; +__le32 meter_type; +__le32 cbs; +__le32 res1; +__le32 ebs; +__le32 res2; +__le32 rate; +__le32 pi_rate; +u8 colour_blind_mode; +u8 pkt_mode; +u8 local_overhd; +__le16 local_overhd_val; +} __packed; +/** * enum mxl862xx_bridge_forward_mode - Bridge forwarding type of packet * @MXL862XX_BRIDGE_FORWARD_FLOOD: Packet is flooded to port members of
@@ -658,6 +810,32 @@ struct mxl862xx_ctp_port_assignment {__le16 bridge_port_id; } __packed; +/** +* enum mxl862xx_stp_port_state - Spanning Tree Protocol port states +* @MXL862XX_STP_PORT_STATE_FORWARD: Forwarding state +* @MXL862XX_STP_PORT_STATE_DISABLE: Disabled/Discarding state +* @MXL862XX_STP_PORT_STATE_LEARNING: Learning state +* @MXL862XX_STP_PORT_STATE_BLOCKING: Blocking/Listening +*/ +enum mxl862xx_stp_port_state { +MXL862XX_STP_PORT_STATE_FORWARD =0 , +MXL862XX_STP_PORT_STATE_DISABLE , +MXL862XX_STP_PORT_STATE_LEARNING , +MXL862XX_STP_PORT_STATE_BLOCKING , +}; + +/** +* struct mxl862xx_stp_port_cfg - Configures the Spanning Tree Protocol state +* @port_id: Port number +* @fid: Filtering Identifier (FID) +* @port_state: See &enum mxl862xx_stp_port_state +*/ +struct mxl862xx_stp_port_cfg { +__le16 port_id; +__le16 fid; +__le32 port_state;/* enum mxl862xx_stp_port_state */ +} __packed; +/** * struct mxl862xx_sys_fw_image_version - Firmware version information * @iv_major: firmware major version
drivers/net/dsa/mxl862xx/mxl862xx-cmd.h +15 -4
@@ -15,12 +15,15 @@#define MXL862XX_BRDG_MAGIC 0x300#define MXL862XX_BRDGPORT_MAGIC 0x400#define MXL862XX_CTP_MAGIC 0x500 +#define MXL862XX_QOS_MAGIC 0x600#define MXL862XX_SWMAC_MAGIC 0xa00 +#define MXL862XX_STP_MAGIC 0xf00#define MXL862XX_SS_MAGIC 0x1600#define GPY_GPY2XX_MAGIC 0x1800#define SYS_MISC_MAGIC 0x1900#define MXL862XX_COMMON_CFGGET (MXL862XX_COMMON_MAGIC + 0x9) +#define MXL862XX_COMMON_CFGSET (MXL862XX_COMMON_MAGIC + 0xa)#define MXL862XX_COMMON_REGISTERMOD (MXL862XX_COMMON_MAGIC + 0x11)#define MXL862XX_BRIDGE_ALLOC (MXL862XX_BRDG_MAGIC + 0x1)
@@ -35,14 +38,22 @@#define MXL862XX_CTP_PORTASSIGNMENTSET (MXL862XX_CTP_MAGIC + 0x3) +#define MXL862XX_QOS_METERCFGSET (MXL862XX_QOS_MAGIC + 0x2) +#define MXL862XX_QOS_METERALLOC (MXL862XX_QOS_MAGIC + 0x2a) + +#define MXL862XX_MAC_TABLEENTRYADD (MXL862XX_SWMAC_MAGIC + 0x2) +#define MXL862XX_MAC_TABLEENTRYREAD (MXL862XX_SWMAC_MAGIC + 0x3) +#define MXL862XX_MAC_TABLEENTRYREMOVE (MXL862XX_SWMAC_MAGIC + 0x5)#define MXL862XX_MAC_TABLECLEARCOND (MXL862XX_SWMAC_MAGIC + 0x8) -#define MXL862XX_SS_SPTAG_SET (MXL862XX_SS_MAGIC + 0x02) +#define MXL862XX_SS_SPTAG_SET (MXL862XX_SS_MAGIC + 0x2) + +#define MXL862XX_STP_PORTCFGSET (MXL862XX_STP_MAGIC + 0x2) -#define INT_GPHY_READ (GPY_GPY2XX_MAGIC + 0x01) -#define INT_GPHY_WRITE (GPY_GPY2XX_MAGIC + 0x02) +#define INT_GPHY_READ (GPY_GPY2XX_MAGIC + 0x1) +#define INT_GPHY_WRITE (GPY_GPY2XX_MAGIC + 0x2) -#define SYS_MISC_FW_VERSION (SYS_MISC_MAGIC + 0x02) +#define SYS_MISC_FW_VERSION (SYS_MISC_MAGIC + 0x2)#define MMD_API_MAXIMUM_ID 0x7fff
drivers/net/dsa/mxl862xx/mxl862xx.c +557 -29
671 lines not on this page · raw message
drivers/net/dsa/mxl862xx/mxl862xx.h +52 -0
62 lines not on this page · raw message
Signature · 1 line
2.53.0