Cross-chip bridging for disjoint DSA trees
Subsystems (6)
Vladimir Oltean
maintainerv4 cover Cross-chip bridging for disjoint DSA trees
From: Vladimir Oltean <[email protected]>
This series adds support for boards where DSA switches of multiple types are cascaded together. Actually this type of setup was brought up before on netdev, and it looks like utilizing disjoint trees is the way to go:
https://lkml.org/lkml/2019/7/7/225
The trouble with disjoint trees (prior to this patch series) is that only bridging of ports within the same hardware switch can be offloaded. After scratching my head for a while, it looks like the easiest way to support hardware bridging between different DSA trees is to bridge their DSA masters and extend the crosschip bridging operations.
I have given some thought to bridging the DSA masters with the slaves themselves, but given the hardware topology described in the commit message of patch 4/4, virtually any number (and combination) of bridges (forwarding domains) can be created on top of those 3x4-port front-panel switches. So it becomes a lot less obvious, when the front-panel ports are enslaved to more than 1 bridge, which bridge should the DSA masters be enslaved to.
So the least awkward approach was to just create a completely separate bridge for the DSA masters, whose entire purpose is to permit hardware forwarding between the discrete switches beneath it.
This is a direct resend of v3, which was deferred due to lack of review. In the meantime Florian has reviewed and tested some of them.
v1 was submitted here:
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/
v2 was submitted here:
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/
v3 was submitted here:
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/
Vladimir Oltean (4):
net: bridge: allow enslaving some DSA master network devices
net: dsa: permit cross-chip bridging between all trees in the system
net: dsa: introduce a dsa_switch_find function
net: dsa: sja1105: implement cross-chip bridging operations
drivers/net/dsa/mv88e6xxx/chip.c | 16 ++- drivers/net/dsa/sja1105/sja1105.h | 2 + drivers/net/dsa/sja1105/sja1105_main.c | 90 +++++++++++++++ include/linux/dsa/8021q.h | 45 ++++++++ include/net/dsa.h | 13 ++- net/bridge/br_if.c | 32 ++++-- net/bridge/br_input.c | 23 +++- net/bridge/br_private.h | 6 +- net/dsa/dsa2.c | 21 ++++ net/dsa/dsa_priv.h | 1 + net/dsa/port.c | 23 +++- net/dsa/switch.c | 21 +++- net/dsa/tag_8021q.c | 151 +++++++++++++++++++++++++ 13 files changed, 414 insertions(+), 30 deletions(-)
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH RESEND v4 1/4 net: bridge: allow enslaving some DSA master network devices
From: Vladimir Oltean <[email protected]>
Commit 8db0a2ee2c63 ("net: bridge: reject DSA-enabled master netdevices as bridge members") added a special check in br_if.c in order to check for a DSA master network device with a tagging protocol configured. This was done because back then, such devices, once enslaved in a bridge would become inoperative and would not pass DSA tagged traffic anymore due to br_handle_frame returning RX_HANDLER_CONSUMED.
But right now we have valid use cases which do require bridging of DSA masters. One such example is when the DSA master ports are DSA switch ports themselves (in a disjoint tree setup). This should be completely equivalent, functionally speaking, from having multiple DSA switches hanging off of the ports of a switchdev driver. So we should allow the enslaving of DSA tagged master network devices.
Instead of the regular br_handle_frame(), install a new function br_handle_frame_dummy() on these DSA masters, which returns RX_HANDLER_PASS in order to call into the DSA specific tagging protocol handlers, and lift the restriction from br_add_if.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
* Removed the hotpath netdev_uses_dsa check and installed a dummy rx_handler for such net devices.
* Improved the check of which DSA master net devices are able to be
bridged and which aren't.
* At this stage, the patch is different enough from where I took it from (aka https://github.com/ffainelli/linux/commit/75618cea75ada8d9eef7936c002b5ec3dd3e4eac)
that I just added my authorship to it).
include/net/dsa.h | 2 +- net/bridge/br_if.c | 32 +++++++++++++++++++++++--------- net/bridge/br_input.c | 23 ++++++++++++++++++++++- net/bridge/br_private.h | 6 +++--- 4 files changed, 49 insertions(+), 14 deletions(-)
include/net/dsa.h +1 -1
@@ -651,7 +651,7 @@ struct dsa_switch_driver {struct net_device *dsa_dev_to_net_device (struct device *dev);/* Keep inline for faster access in hot path */ -static inline bool netdev_uses_dsa (struct net_device *dev) +static inline bool netdev_uses_dsa (const struct net_device *dev) {#if IS_ENABLED (CONFIG_NET_DSA )return dev->dsa_ptr && dev->dsa_ptr->rcv;
net/bridge/br_if.c +23 -9
@@ -563,18 +563,32 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,unsigned br_hr, dev_hr;bool changed_addr; -/* Don't allow bridging non-ethernet like devices, or DSA-enabled -* master network devices since the bridge layer rx_handler prevents -* the DSA fake ethertype handler to be invoked, so we do not strip off -* the DSA switch tag protocol header and the bridge layer just return -* RX_HANDLER_CONSUMED, stopping RX processing for these frames. -*/ +/* Don't allow bridging non-ethernet like devices. */ if ((dev->flags &IFF_LOOPBACK ) || dev->type !=ARPHRD_ETHER || dev->addr_len !=ETH_ALEN || - !is_valid_ether_addr (dev->dev_addr) || -netdev_uses_dsa (dev)) + !is_valid_ether_addr (dev->dev_addr))return -EINVAL ; +/* Also don't allow bridging of net devices that are DSA masters, since +* the bridge layer rx_handler prevents the DSA fake ethertype handler +* to be invoked, so we don't get the chance to strip off and parse the +* DSA switch tag protocol header (the bridge layer just returns +* RX_HANDLER_CONSUMED, stopping RX processing for these frames). +* The only case where that would not be an issue is when bridging can +* already be offloaded, such as when the DSA master is itself a DSA +* or plain switchdev port, and is bridged only with other ports from +* the same hardware device. +*/ +if (netdev_uses_dsa (dev)) { +list_for_each_entry (p, &br->port_list, list) { +if (!netdev_port_same_parent_id (dev, p->dev)) { +NL_SET_ERR_MSG (extack, +"Cannot do software bridging with a DSA master" ); +return -EINVAL ; + } + } + } +/* No bridging of bridges */ if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit) { NL_SET_ERR_MSG(extack,
@@ -618,7 +632,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,if (err) goto err3; - err =netdev_rx_handler_register (dev, br_handle_frame, p); + err =netdev_rx_handler_register (dev,br_get_rx_handler (dev), p);if (err) goto err4;
net/bridge/br_input.c +22 -1
@@ -17,6 +17,7 @@#endif #include <linux/neighbour.h> #include <net/arp.h> +#include <net/dsa.h> #include <linux/export.h> #include <linux/rculist.h> #include "br_private.h"
@@ -257,7 +258,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)* Return NULL if skb is handled * note: already called with rcu_read_lock */ -rx_handler_result_t br_handle_frame (struct sk_buff **pskb) +static rx_handler_result_t br_handle_frame (struct sk_buff **pskb) {struct net_bridge_port *p;struct sk_buff *skb = *pskb;
@@ -359,3 +360,23 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb) }return RX_HANDLER_CONSUMED ; } + +/* This function has no purpose other than to appease the br_port_get_rcu/rtnl +* helpers which identify bridged ports according to the rx_handler installed +* on them (so there _needs_ to be a bridge rx_handler even if we don't need it +* to do anything useful). This bridge won't support traffic to/from the stack, +* but only hardware bridging. So return RX_HANDLER_PASS so we don't steal +* frames from the ETH_P_XDSA packet_type handler. +*/ +static rx_handler_result_t br_handle_frame_dummy (struct sk_buff **pskb) +{ +return RX_HANDLER_PASS ; +} + +rx_handler_func_t *br_get_rx_handler (const struct net_device *dev) +{ +if (netdev_uses_dsa (dev)) +return br_handle_frame_dummy; + +return br_handle_frame; +}
net/bridge/br_private.h +3 -3
@@ -702,16 +702,16 @@ int nbp_backup_change(struct net_bridge_port *p, struct net_device *backup_dev);/* br_input.c */ int br_handle_frame_finish (struct net *net,struct sock *sk,struct sk_buff *skb); -rx_handler_result_t br_handle_frame (struct sk_buff **pskb); +rx_handler_func_t *br_get_rx_handler (const struct net_device *dev);static inline bool br_rx_handler_check_rcu (const struct net_device *dev) { -return rcu_dereference (dev->rx_handler) == br_handle_frame; +return rcu_dereference (dev->rx_handler) ==br_get_rx_handler (dev); }static inline bool br_rx_handler_check_rtnl (const struct net_device *dev) { -return rcu_dereference_rtnl (dev->rx_handler) == br_handle_frame; +return rcu_dereference_rtnl (dev->rx_handler) ==br_get_rx_handler (dev); }static inline struct net_bridge_port *br_port_get_check_rcu (const struct net_device *dev)
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH RESEND v4 2/4 net: dsa: permit cross-chip bridging between all trees in the system
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
One way of utilizing DSA is by cascading switches which do not all have compatible taggers. Consider the following real-life topology:
+---------------------------------------------------------------+
| LS1028A |
| +------------------------------+ |
| | DSA master for Felix | |
| |(internal ENETC port 2: eno2))| |
| +------------+------------------------------+-------------+ |
| | Felix embedded L2 switch | |
| | | |
| | +--------------+ +--------------+ +--------------+ | |
| | |DSA master for| |DSA master for| |DSA master for| | |
| | | SJA1105 1 | | SJA1105 2 | | SJA1105 3 | | |
| | |(Felix port 1)| |(Felix port 2)| |(Felix port 3)| | |
+--+-+--------------+---+--------------+---+--------------+--+--++-----------------------+ +-----------------------+ +-----------------------+ | SJA1105 switch 1 | | SJA1105 switch 2 | | SJA1105 switch 3 | +-----+-----+-----+-----+ +-----+-----+-----+-----+ +-----+-----+-----+-----+ |sw1p0|sw1p1|sw1p2|sw1p3| |sw2p0|sw2p1|sw2p2|sw2p3| |sw3p0|sw3p1|sw3p2|sw3p3| +-----+-----+-----+-----+ +-----+-----+-----+-----+ +-----+-----+-----+-----+
The above can be described in the device tree as follows (obviously not complete):
mscc_felix {
dsa,member = <0 0>;
ports {
port@4 {
ethernet = <&enetc_port2>;
};
};
};sja1105_switch1 {
dsa,member = <1 1>;
ports {
port@4 {
ethernet = <&mscc_felix_port1>;
};
};
};sja1105_switch2 {
dsa,member = <2 2>;
ports {
port@4 {
ethernet = <&mscc_felix_port2>;
};
};
};sja1105_switch3 {
dsa,member = <3 3>;
ports {
port@4 {
ethernet = <&mscc_felix_port3>;
};
};
};Basically we instantiate one DSA switch tree for every hardware switch in the system, but we still give them globally unique switch IDs (will come back to that later). Having 3 disjoint switch trees makes the tagger drivers "just work", because net devices are registered for the 3 Felix DSA master ports, and they are also DSA slave ports to the ENETC port. So packets received on the ENETC port are stripped of their stacked DSA tags one by one.
Currently, hardware bridging between ports on the same sja1105 chip is possible, but switching between sja1105 ports on different chips is handled by the software bridge. This is fine, but we can do better.
In fact, the dsa_8021q tag used by sja1105 is compatible with cascading. In other words, a sja1105 switch can correctly parse and route a packet containing a dsa_8021q tag. So if we could enable hardware bridging on the Felix DSA master ports, cross-chip bridging could be completely offloaded.
Such as system would be used as follows:
ip link add dev br0 type bridge && ip link set dev br0 up
for port in sw0p0 sw0p1 sw0p2 sw0p3 \ sw1p0 sw1p1 sw1p2 sw1p3 \ sw2p0 sw2p1 sw2p2 sw2p3; do ip link set dev $port master br0
done
The above makes switching between ports on the same row be performed in hardware, and between ports on different rows in software. Now assume the Felix switch ports are called swp0, swp1, swp2. By running the following extra commands:
ip link add dev br1 type bridge && ip link set dev br1 up for port in swp0 swp1 swp2; do
ip link set dev $port master br1
done
the CPU no longer sees packets which traverse sja1105 switch boundaries and can be forwarded directly by Felix. The br1 bridge would not be used for any sort of traffic termination.
For this to work, we need to give drivers an opportunity to listen for bridging events on DSA trees other than their own, and pass that other tree index as argument. I have made the assumption, for the moment, that the other existing DSA notifiers don't need to be broadcast to other trees. That assumption might turn out to be incorrect. But in the meantime, introduce a dsa_broadcast function, similar in purpose to dsa_port_notify, which is used only by the bridging notifiers.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
None.
drivers/net/dsa/mv88e6xxx/chip.c | 16 ++++++++++++---- include/net/dsa.h | 10 ++++++---- net/dsa/dsa_priv.h | 1 + net/dsa/port.c | 23 +++++++++++++++++++++-- net/dsa/switch.c | 21 +++++++++++++++------ 5 files changed, 55 insertions(+), 16 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +12 -4
@@ -2233,26 +2233,34 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port,mv88e6xxx_reg_unlock (chip); } -static int mv88e6xxx_crosschip_bridge_join (struct dsa_switch *ds,int dev, +static int mv88e6xxx_crosschip_bridge_join (struct dsa_switch *ds, +int tree_index,int sw_index,int port,struct net_device *br) {struct mv88e6xxx_chip *chip = ds->priv;int err; +if (tree_index != ds->dst->index) +return 0 ; +mv88e6xxx_reg_lock (chip); - err =mv88e6xxx_pvt_map (chip, dev, port); + err =mv88e6xxx_pvt_map (chip, sw_index, port);mv88e6xxx_reg_unlock (chip);return err; } -static void mv88e6xxx_crosschip_bridge_leave (struct dsa_switch *ds,int dev, +static void mv88e6xxx_crosschip_bridge_leave (struct dsa_switch *ds, +int tree_index,int sw_index,int port,struct net_device *br) {struct mv88e6xxx_chip *chip = ds->priv; +if (tree_index != ds->dst->index) +return ; +mv88e6xxx_reg_lock (chip); -if (mv88e6xxx_pvt_map (chip, dev, port)) +if (mv88e6xxx_pvt_map (chip, sw_index, port))dev_err (ds->dev,"failed to remap cross-chip Port VLAN\n" );mv88e6xxx_reg_unlock (chip); }
include/net/dsa.h +6 -4
@@ -574,10 +574,12 @@ struct dsa_switch_ops {/* * Cross-chip operations */ -int (*crosschip_bridge_join)(struct dsa_switch *ds,int sw_index, -int port,struct net_device *br); -void (*crosschip_bridge_leave)(struct dsa_switch *ds,int sw_index, -int port,struct net_device *br); +int (*crosschip_bridge_join)(struct dsa_switch *ds,int tree_index, +int sw_index,int port, +struct net_device *br); +void (*crosschip_bridge_leave)(struct dsa_switch *ds,int tree_index, +int sw_index,int port, +struct net_device *br);/* * PTP functionality
net/dsa/dsa_priv.h +1 -0
@@ -35,6 +35,7 @@ struct dsa_notifier_ageing_time_info {/* DSA_NOTIFIER_BRIDGE_* */ struct dsa_notifier_bridge_info {struct net_device *br; +int tree_index;int sw_index;int port; };
net/dsa/port.c +21 -2
@@ -13,6 +13,23 @@#include "dsa_priv.h" +static int dsa_broadcast (unsigned long e,void *v) +{ +struct dsa_switch_tree *dst; +int err =0 ; + +list_for_each_entry (dst, &dsa_tree_list, list) { +struct raw_notifier_head *nh = &dst->nh; + + err =raw_notifier_call_chain (nh, e, v); + err =notifier_to_errno (err); +if (err) +break ; + } + +return err; +} +static int dsa_port_notify (const struct dsa_port *dp,unsigned long e,void *v) {struct raw_notifier_head *nh = &dp->ds->dst->nh;
@@ -120,6 +137,7 @@ void dsa_port_disable(struct dsa_port *dp)int dsa_port_bridge_join (struct dsa_port *dp,struct net_device *br) {struct dsa_notifier_bridge_info info = { + .tree_index = dp->ds->dst->index, .sw_index = dp->ds->index, .port = dp->index, .br = br,
@@ -136,7 +154,7 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)*/ dp->bridge_dev = br; - err =dsa_port_notify (dp,DSA_NOTIFIER_BRIDGE_JOIN , &info); + err =dsa_broadcast (DSA_NOTIFIER_BRIDGE_JOIN , &info);/* The bridging is rolled back on error */ if (err) {
@@ -150,6 +168,7 @@ int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)void dsa_port_bridge_leave (struct dsa_port *dp,struct net_device *br) {struct dsa_notifier_bridge_info info = { + .tree_index = dp->ds->dst->index, .sw_index = dp->ds->index, .port = dp->index, .br = br,
@@ -161,7 +180,7 @@ void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br)*/ dp->bridge_dev =NULL ; - err =dsa_port_notify (dp,DSA_NOTIFIER_BRIDGE_LEAVE , &info); + err =dsa_broadcast (DSA_NOTIFIER_BRIDGE_LEAVE , &info);if (err)pr_err ("DSA: failed to notify DSA_NOTIFIER_BRIDGE_LEAVE\n" );
net/dsa/switch.c +15 -6
@@ -89,11 +89,16 @@ static int dsa_switch_mtu(struct dsa_switch *ds,static int dsa_switch_bridge_join (struct dsa_switch *ds,struct dsa_notifier_bridge_info *info) { -if (ds->index == info->sw_index && ds->ops->port_bridge_join) +struct dsa_switch_tree *dst = ds->dst; + +if (dst->index == info->tree_index && ds->index == info->sw_index && + ds->ops->port_bridge_join)return ds->ops->port_bridge_join (ds, info->port, info->br); -if (ds->index != info->sw_index && ds->ops->crosschip_bridge_join) -return ds->ops->crosschip_bridge_join (ds, info->sw_index, +if ((dst->index != info->tree_index || ds->index != info->sw_index) && + ds->ops->crosschip_bridge_join) +return ds->ops->crosschip_bridge_join (ds, info->tree_index, + info->sw_index, info->port, info->br);return 0 ;
@@ -103,13 +108,17 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds, struct dsa_notifier_bridge_info *info) {bool unset_vlan_filtering =br_vlan_enabled (info->br); +struct dsa_switch_tree *dst = ds->dst;int err, i; -if (ds->index == info->sw_index && ds->ops->port_bridge_leave) +if (dst->index == info->tree_index && ds->index == info->sw_index && + ds->ops->port_bridge_join) ds->ops->port_bridge_leave (ds, info->port, info->br); -if (ds->index != info->sw_index && ds->ops->crosschip_bridge_leave) - ds->ops->crosschip_bridge_leave (ds, info->sw_index, info->port, +if ((dst->index != info->tree_index || ds->index != info->sw_index) && + ds->ops->crosschip_bridge_join) + ds->ops->crosschip_bridge_leave (ds, info->tree_index, + info->sw_index, info->port, info->br);/* If the bridge was vlan_filtering, the bridge core doesn't trigger an
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH RESEND v4 3/4 net: dsa: introduce a dsa_switch_find function
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Somewhat similar to dsa_tree_find, dsa_switch_find returns a dsa_switch structure pointer by searching for its tree index and switch index (the parameters from dsa,member). To be used, for example, by drivers who implement .crosschip_bridge_join and need a reference to the other switch indicated to by the tree_index and sw_index arguments.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
None.
include/net/dsa.h | 1 + net/dsa/dsa2.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+)
include/net/dsa.h +1 -0
@@ -672,6 +672,7 @@ static inline bool dsa_can_decode(const struct sk_buff *skb,void dsa_unregister_switch (struct dsa_switch *ds);int dsa_register_switch (struct dsa_switch *ds); +struct dsa_switch *dsa_switch_find (int tree_index,int sw_index);#ifdef CONFIG_PM_SLEEP int dsa_switch_suspend (struct dsa_switch *ds);int dsa_switch_resume (struct dsa_switch *ds);
net/dsa/dsa2.c +21 -0
@@ -24,6 +24,27 @@ LIST_HEAD(dsa_tree_list);static const struct devlink_ops dsa_devlink_ops = { }; +struct dsa_switch *dsa_switch_find (int tree_index,int sw_index) +{ +struct dsa_switch_tree *dst; +struct dsa_port *dp; + +list_for_each_entry (dst, &dsa_tree_list, list) { +if (dst->index != tree_index) +continue ; + +list_for_each_entry (dp, &dst->ports, list) { +if (dp->ds->index != sw_index) +continue ; + +return dp->ds; + } + } + +return NULL ; +} +EXPORT_SYMBOL_GPL (dsa_switch_find); +static struct dsa_switch_tree *dsa_tree_find (int index) {struct dsa_switch_tree *dst;
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH RESEND v4 4/4 net: dsa: sja1105: implement cross-chip bridging operations
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
sja1105 uses dsa_8021q for DSA tagging, a format which is VLAN at heart and which is compatible with cascading. A complete description of this tagging format is in net/dsa/tag_8021q.c, but a quick summary is that each external-facing port tags incoming frames with a unique pvid, and this special VLAN is transmitted as tagged towards the inside of the system, and as untagged towards the exterior. The tag encodes the switch id and the source port index.
This means that cross-chip bridging for dsa_8021q only entails adding the dsa_8021q pvids of one switch to the RX filter of the other switches. Everything else falls naturally into place, as long as the bottom-end of ports (the leaves in the tree) is comprised exclusively of dsa_8021q-compatible (i.e. sja1105 switches). Otherwise, there would be a chance that a front-panel switch transmits a packet tagged with a dsa_8021q header, header which it wouldn't be able to remove, and which would hence "leak" out.
The only use case I tested (due to lack of board availability) was when the sja1105 switches are part of disjoint trees (however, this doesn't change the fact that multiple sja1105 switches still need unique switch identifiers in such a system). But in principle, even "true" single-tree setups (with DSA links) should work just as fine, except for a small change which I can't test: dsa_towards_port should be used instead of dsa_upstream_port (I made the assumption that the routing port that any sja1105 should use towards its neighbours is the CPU port. That might not hold true in other setups).
---
Changes in v4:
None.
Changes in v3:
* Moved the implementation in tag_8021q.c, because 1. it is generic enough that is can be reused by anyone employing dsa_8021q tagging, and 2. sja1105_main.c could use some de-cluttering.
* Provided reference counting to the crosschip links to avoid workarounds such as never deleting VLANs from the CPU port.
Changes in v2:
Now replaying the crosschip operations when toggling the VLAN filtering state (aka when we need to hide the dsa_8021q VLANs, as the VLAN filtering table becomes visible to the user so it needs to be cleared - and perhaps restored afterwards).
drivers/net/dsa/sja1105/sja1105.h | 2 + drivers/net/dsa/sja1105/sja1105_main.c | 90 +++++++++++++++ include/linux/dsa/8021q.h | 45 ++++++++ net/dsa/tag_8021q.c | 151 +++++++++++++++++++++++++ 4 files changed, 288 insertions(+)
drivers/net/dsa/sja1105/sja1105.h +2 -0
@@ -8,6 +8,7 @@#include <linux/ptp_clock_kernel.h> #include <linux/timecounter.h> #include <linux/dsa/sja1105.h> +#include <linux/dsa/8021q.h> #include <net/dsa.h> #include <linux/mutex.h> #include "sja1105_static_config.h"
@@ -185,6 +186,7 @@ struct sja1105_private {struct gpio_desc *reset_gpio;struct spi_device *spidev;struct dsa_switch *ds; +struct list_head crosschip_links;struct sja1105_flow_block flow_block;struct sja1105_port ports[SJA1105_NUM_PORTS ];/* Serializes transmission of management frames so that
drivers/net/dsa/sja1105/sja1105_main.c +90 -0
120 lines not on this page · raw message
include/linux/dsa/8021q.h +45 -0
62 lines not on this page · raw message
net/dsa/tag_8021q.c +151 -0
163 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 29 lines · On Sun, 10 May 2020 19:37:39 +0300 Vladimir Oltean wrote:
From: Vladimir Oltean <[email protected]>
This series adds support for boards where DSA switches of multiple types are cascaded together. Actually this type of setup was brought up before on netdev, and it looks like utilizing disjoint trees is the way to go:
https://lkml.org/lkml/2019/7/7/225
The trouble with disjoint trees (prior to this patch series) is that only bridging of ports within the same hardware switch can be offloaded. After scratching my head for a while, it looks like the easiest way to support hardware bridging between different DSA trees is to bridge their DSA masters and extend the crosschip bridging operations.
I have given some thought to bridging the DSA masters with the slaves themselves, but given the hardware topology described in the commit message of patch 4/4, virtually any number (and combination) of bridges (forwarding domains) can be created on top of those 3x4-port front-panel switches. So it becomes a lot less obvious, when the front-panel ports are enslaved to more than 1 bridge, which bridge should the DSA masters be enslaved to.
So the least awkward approach was to just create a completely separate bridge for the DSA masters, whose entire purpose is to permit hardware forwarding between the discrete switches beneath it.
This is a direct resend of v3, which was deferred due to lack of review. In the meantime Florian has reviewed and tested some of them.
Quoted 8 lines
v1 was submitted here:
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/v2 was submitted here:
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/v3 was submitted here:
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/
Applied, thanks everyone!