From: Tobias Waldekranz <tobias@waldekranz.com> To: davem@davemloft.net, kuba@kernel.org Cc: andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, olteanv@gmail.com, roopa@nvidia.com, nikolay@nvidia.com, jiri@resnulli.us, idosch@idosch.org, stephen@networkplumber.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org Subject: [RFC net-next 9/9] net: dsa: mv88e6xxx: Forward offloading Date: Mon, 26 Apr 2021 19:04:11 +0200 [thread overview] Message-ID: <20210426170411.1789186-10-tobias@waldekranz.com> (raw) In-Reply-To: <20210426170411.1789186-1-tobias@waldekranz.com> Allow the DSA tagger to generate FORWARD frames for offloaded skbs sent from a bridge that we offload, allowing the switch to handle any frame replication that may be required. This also means that source address learning takes place on packets sent from the CPU, meaning that return traffic no longer needs to be flooded as unknown unicast. Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> --- drivers/net/dsa/mv88e6xxx/chip.c | 17 ++++++++++++++++ net/dsa/tag_dsa.c | 33 ++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 6975cf16da65..00ed1aa2a55a 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6077,6 +6077,21 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index, return err_sync ? : err_pvt; } +static void *mv88e6xxx_dfwd_add_station(struct dsa_switch *ds, int port, + struct net_device *sb_dev) +{ + struct dsa_port *dp = dsa_to_port(ds, port); + struct mv88e6xxx_chip *chip = ds->priv; + + if (!mv88e6xxx_has_pvt(chip)) + return ERR_PTR(-EOPNOTSUPP); + + if (sb_dev == dp->bridge_dev) + return sb_dev; + + return ERR_PTR(-EOPNOTSUPP); +} + static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .get_tag_protocol = mv88e6xxx_get_tag_protocol, .change_tag_protocol = mv88e6xxx_change_tag_protocol, @@ -6138,6 +6153,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_change = mv88e6xxx_crosschip_lag_change, .crosschip_lag_join = mv88e6xxx_crosschip_lag_join, .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, + .dfwd_add_station = mv88e6xxx_dfwd_add_station, }; static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) @@ -6156,6 +6172,7 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; + ds->num_tx_queues = 2; /* Some chips support up to 32, but that requires enabling the * 5-bit port mode, which we do not support. 640k^W16 ought to diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index 7e7b7decdf39..09cdf77697b2 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -46,6 +46,7 @@ */ #include <linux/etherdevice.h> +#include <linux/dsa/mv88e6xxx.h> #include <linux/list.h> #include <linux/slab.h> @@ -126,7 +127,22 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, u8 extra) { struct dsa_port *dp = dsa_slave_to_port(dev); + u16 pvid = dp->pvid; + enum dsa_cmd cmd; u8 *dsa_header; + u8 tag_dev, tag_port; + + if (DSA_SKB_CB(skb)->sb_dev) { + cmd = DSA_CMD_FORWARD; + if (mv88e6xxx_dst_bridge_to_dsa(dp->ds->dst, + DSA_SKB_CB(skb)->sb_dev, + &tag_dev, &tag_port)) + return NULL; + } else { + cmd = DSA_CMD_FROM_CPU; + tag_dev = dp->ds->index; + tag_port = dp->index; + } if (skb->protocol == htons(ETH_P_8021Q)) { if (extra) { @@ -134,10 +150,10 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, memmove(skb->data, skb->data + extra, 2 * ETH_ALEN); } - /* Construct tagged FROM_CPU DSA tag from 802.1Q tag. */ + /* Construct tagged DSA tag from 802.1Q tag. */ dsa_header = skb->data + 2 * ETH_ALEN + extra; - dsa_header[0] = (DSA_CMD_FROM_CPU << 6) | 0x20 | dp->ds->index; - dsa_header[1] = dp->index << 3; + dsa_header[0] = (cmd << 6) | 0x20 | tag_dev; + dsa_header[1] = tag_port << 3; /* Move CFI field from byte 2 to byte 1. */ if (dsa_header[2] & 0x10) { @@ -148,12 +164,13 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, skb_push(skb, DSA_HLEN + extra); memmove(skb->data, skb->data + DSA_HLEN + extra, 2 * ETH_ALEN); - /* Construct untagged FROM_CPU DSA tag. */ + /* Construct untagged DSA tag. */ dsa_header = skb->data + 2 * ETH_ALEN + extra; - dsa_header[0] = (DSA_CMD_FROM_CPU << 6) | dp->ds->index; - dsa_header[1] = dp->index << 3; - dsa_header[2] = 0x00; - dsa_header[3] = 0x00; + + dsa_header[0] = (cmd << 6) | tag_dev; + dsa_header[1] = tag_port << 3; + dsa_header[2] = pvid >> 8; + dsa_header[3] = pvid & 0xff; } return skb; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Tobias Waldekranz <tobias@waldekranz.com> To: davem@davemloft.net, kuba@kernel.org Cc: andrew@lunn.ch, f.fainelli@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, bridge@lists.linux-foundation.org, idosch@idosch.org, nikolay@nvidia.com, roopa@nvidia.com, olteanv@gmail.com, vivien.didelot@gmail.com Subject: [Bridge] [RFC net-next 9/9] net: dsa: mv88e6xxx: Forward offloading Date: Mon, 26 Apr 2021 19:04:11 +0200 [thread overview] Message-ID: <20210426170411.1789186-10-tobias@waldekranz.com> (raw) In-Reply-To: <20210426170411.1789186-1-tobias@waldekranz.com> Allow the DSA tagger to generate FORWARD frames for offloaded skbs sent from a bridge that we offload, allowing the switch to handle any frame replication that may be required. This also means that source address learning takes place on packets sent from the CPU, meaning that return traffic no longer needs to be flooded as unknown unicast. Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> --- drivers/net/dsa/mv88e6xxx/chip.c | 17 ++++++++++++++++ net/dsa/tag_dsa.c | 33 ++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 6975cf16da65..00ed1aa2a55a 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6077,6 +6077,21 @@ static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index, return err_sync ? : err_pvt; } +static void *mv88e6xxx_dfwd_add_station(struct dsa_switch *ds, int port, + struct net_device *sb_dev) +{ + struct dsa_port *dp = dsa_to_port(ds, port); + struct mv88e6xxx_chip *chip = ds->priv; + + if (!mv88e6xxx_has_pvt(chip)) + return ERR_PTR(-EOPNOTSUPP); + + if (sb_dev == dp->bridge_dev) + return sb_dev; + + return ERR_PTR(-EOPNOTSUPP); +} + static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .get_tag_protocol = mv88e6xxx_get_tag_protocol, .change_tag_protocol = mv88e6xxx_change_tag_protocol, @@ -6138,6 +6153,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .crosschip_lag_change = mv88e6xxx_crosschip_lag_change, .crosschip_lag_join = mv88e6xxx_crosschip_lag_join, .crosschip_lag_leave = mv88e6xxx_crosschip_lag_leave, + .dfwd_add_station = mv88e6xxx_dfwd_add_station, }; static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) @@ -6156,6 +6172,7 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip) ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; + ds->num_tx_queues = 2; /* Some chips support up to 32, but that requires enabling the * 5-bit port mode, which we do not support. 640k^W16 ought to diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c index 7e7b7decdf39..09cdf77697b2 100644 --- a/net/dsa/tag_dsa.c +++ b/net/dsa/tag_dsa.c @@ -46,6 +46,7 @@ */ #include <linux/etherdevice.h> +#include <linux/dsa/mv88e6xxx.h> #include <linux/list.h> #include <linux/slab.h> @@ -126,7 +127,22 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, u8 extra) { struct dsa_port *dp = dsa_slave_to_port(dev); + u16 pvid = dp->pvid; + enum dsa_cmd cmd; u8 *dsa_header; + u8 tag_dev, tag_port; + + if (DSA_SKB_CB(skb)->sb_dev) { + cmd = DSA_CMD_FORWARD; + if (mv88e6xxx_dst_bridge_to_dsa(dp->ds->dst, + DSA_SKB_CB(skb)->sb_dev, + &tag_dev, &tag_port)) + return NULL; + } else { + cmd = DSA_CMD_FROM_CPU; + tag_dev = dp->ds->index; + tag_port = dp->index; + } if (skb->protocol == htons(ETH_P_8021Q)) { if (extra) { @@ -134,10 +150,10 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, memmove(skb->data, skb->data + extra, 2 * ETH_ALEN); } - /* Construct tagged FROM_CPU DSA tag from 802.1Q tag. */ + /* Construct tagged DSA tag from 802.1Q tag. */ dsa_header = skb->data + 2 * ETH_ALEN + extra; - dsa_header[0] = (DSA_CMD_FROM_CPU << 6) | 0x20 | dp->ds->index; - dsa_header[1] = dp->index << 3; + dsa_header[0] = (cmd << 6) | 0x20 | tag_dev; + dsa_header[1] = tag_port << 3; /* Move CFI field from byte 2 to byte 1. */ if (dsa_header[2] & 0x10) { @@ -148,12 +164,13 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev, skb_push(skb, DSA_HLEN + extra); memmove(skb->data, skb->data + DSA_HLEN + extra, 2 * ETH_ALEN); - /* Construct untagged FROM_CPU DSA tag. */ + /* Construct untagged DSA tag. */ dsa_header = skb->data + 2 * ETH_ALEN + extra; - dsa_header[0] = (DSA_CMD_FROM_CPU << 6) | dp->ds->index; - dsa_header[1] = dp->index << 3; - dsa_header[2] = 0x00; - dsa_header[3] = 0x00; + + dsa_header[0] = (cmd << 6) | tag_dev; + dsa_header[1] = tag_port << 3; + dsa_header[2] = pvid >> 8; + dsa_header[3] = pvid & 0xff; } return skb; -- 2.25.1
next prev parent reply other threads:[~2021-04-26 17:05 UTC|newest] Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-26 17:04 [RFC net-next 0/9] net: bridge: Forward offloading Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-26 17:04 ` [RFC net-next 1/9] net: dfwd: Constrain existing users to macvlan subordinates Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-26 17:04 ` [RFC net-next 2/9] net: bridge: Disambiguate offload_fwd_mark Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-05-02 15:00 ` Ido Schimmel 2021-05-02 15:00 ` [Bridge] " Ido Schimmel 2021-05-03 8:49 ` Tobias Waldekranz 2021-05-03 8:49 ` [Bridge] " Tobias Waldekranz 2021-05-05 7:39 ` Ido Schimmel 2021-05-05 7:39 ` [Bridge] " Ido Schimmel 2021-04-26 17:04 ` [RFC net-next 3/9] net: bridge: switchdev: Recycle unused hwdoms Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-27 10:42 ` Nikolay Aleksandrov 2021-04-27 10:42 ` [Bridge] " Nikolay Aleksandrov 2021-04-26 17:04 ` [RFC net-next 4/9] net: bridge: switchdev: Forward offloading Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-27 10:35 ` Nikolay Aleksandrov 2021-04-27 10:35 ` [Bridge] " Nikolay Aleksandrov 2021-04-28 22:47 ` Tobias Waldekranz 2021-04-28 22:47 ` [Bridge] " Tobias Waldekranz 2021-04-29 9:16 ` Nikolay Aleksandrov 2021-04-29 9:16 ` [Bridge] " Nikolay Aleksandrov 2021-04-29 14:55 ` Tobias Waldekranz 2021-04-29 14:55 ` [Bridge] " Tobias Waldekranz 2021-05-02 15:04 ` Ido Schimmel 2021-05-02 15:04 ` [Bridge] " Ido Schimmel 2021-05-03 8:53 ` Tobias Waldekranz 2021-05-03 8:53 ` [Bridge] " Tobias Waldekranz 2021-05-06 11:01 ` Vladimir Oltean 2021-05-06 11:01 ` [Bridge] " Vladimir Oltean 2021-04-26 17:04 ` [RFC net-next 5/9] net: dsa: Track port PVIDs Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-26 19:40 ` Vladimir Oltean 2021-04-26 19:40 ` [Bridge] " Vladimir Oltean 2021-04-26 20:05 ` Tobias Waldekranz 2021-04-26 20:05 ` [Bridge] " Tobias Waldekranz 2021-04-26 20:28 ` Vladimir Oltean 2021-04-26 20:28 ` [Bridge] " Vladimir Oltean 2021-04-27 9:12 ` Tobias Waldekranz 2021-04-27 9:12 ` [Bridge] " Tobias Waldekranz 2021-04-27 9:27 ` Vladimir Oltean 2021-04-27 9:27 ` [Bridge] " Vladimir Oltean 2021-04-27 10:07 ` Vladimir Oltean 2021-04-27 10:07 ` [Bridge] " Vladimir Oltean 2021-04-28 23:10 ` Tobias Waldekranz 2021-04-28 23:10 ` [Bridge] " Tobias Waldekranz 2021-04-26 17:04 ` [RFC net-next 6/9] net: dsa: Forward offloading Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-27 10:17 ` Vladimir Oltean 2021-04-27 10:17 ` [Bridge] " Vladimir Oltean 2021-05-04 14:44 ` Tobias Waldekranz 2021-05-04 14:44 ` [Bridge] " Tobias Waldekranz 2021-05-04 15:21 ` Vladimir Oltean 2021-05-04 15:21 ` [Bridge] " Vladimir Oltean 2021-05-04 20:07 ` Tobias Waldekranz 2021-05-04 20:07 ` [Bridge] " Tobias Waldekranz 2021-05-04 20:33 ` Andrew Lunn 2021-05-04 20:33 ` [Bridge] " Andrew Lunn 2021-05-04 21:24 ` Tobias Waldekranz 2021-05-04 21:24 ` [Bridge] " Tobias Waldekranz 2021-05-04 20:58 ` Vladimir Oltean 2021-05-04 20:58 ` [Bridge] " Vladimir Oltean 2021-05-04 22:12 ` Tobias Waldekranz 2021-05-04 22:12 ` [Bridge] " Tobias Waldekranz 2021-05-04 23:04 ` Vladimir Oltean 2021-05-04 23:04 ` [Bridge] " Vladimir Oltean 2021-05-05 9:01 ` Tobias Waldekranz 2021-05-05 9:01 ` [Bridge] " Tobias Waldekranz 2021-05-05 16:12 ` Vladimir Oltean 2021-05-05 16:12 ` [Bridge] " Vladimir Oltean 2021-04-26 17:04 ` [RFC net-next 7/9] net: dsa: mv88e6xxx: Allocate a virtual DSA port for each bridge Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-26 17:04 ` [RFC net-next 8/9] net: dsa: mv88e6xxx: Map virtual bridge port in PVT Tobias Waldekranz 2021-04-26 17:04 ` [Bridge] " Tobias Waldekranz 2021-04-26 17:04 ` Tobias Waldekranz [this message] 2021-04-26 17:04 ` [Bridge] [RFC net-next 9/9] net: dsa: mv88e6xxx: Forward offloading Tobias Waldekranz 2021-04-27 1:31 ` kernel test robot 2021-05-02 14:58 ` [RFC net-next 0/9] net: bridge: " Ido Schimmel 2021-05-02 14:58 ` [Bridge] " Ido Schimmel 2021-05-03 9:44 ` Tobias Waldekranz 2021-05-03 9:44 ` [Bridge] " Tobias Waldekranz 2021-05-06 10:59 ` Vladimir Oltean 2021-05-06 10:59 ` [Bridge] " Vladimir Oltean
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210426170411.1789186-10-tobias@waldekranz.com \ --to=tobias@waldekranz.com \ --cc=andrew@lunn.ch \ --cc=bridge@lists.linux-foundation.org \ --cc=davem@davemloft.net \ --cc=f.fainelli@gmail.com \ --cc=idosch@idosch.org \ --cc=jiri@resnulli.us \ --cc=kuba@kernel.org \ --cc=netdev@vger.kernel.org \ --cc=nikolay@nvidia.com \ --cc=olteanv@gmail.com \ --cc=roopa@nvidia.com \ --cc=stephen@networkplumber.org \ --cc=vivien.didelot@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.