tag_8021q for Ocelot switches
Subsystems (4)
Vladimir Oltean
maintainerv4 cover tag_8021q for Ocelot switches
From: Vladimir Oltean <[email protected]>
The Felix switch inside LS1028A has an issue. It has a 2.5G CPU port, and the external ports, in the majority of use cases, run at 1G. This means that, when the CPU injects traffic into the switch, it is very easy to run into congestion. This is not to say that it is impossible to enter congestion even with all ports running at the same speed, just that the default configuration is already very prone to that by design.
Normally, the way to deal with that is using Ethernet flow control (PAUSE frames).
However, this functionality is not working today with the ENETC - Felix switch pair. The hardware issue is undergoing documentation right now as an erratum within NXP, but several customers have been requesting a reasonable workaround for it.
In truth, the LS1028A has 2 internal port pairs. The lack of flow control is an issue only when NPI mode (Node Processor Interface, aka the mode where the "CPU port module", which carries DSA-style tagged packets, is connected to a regular Ethernet port) is used, and NPI mode is supported by Felix on a single port.
In past BSPs, we have had setups where both internal port pairs were enabled. We were advertising the following setup:
"data port" "control port"
(2.5G) (1G)
eno2 eno3
^ ^
| |
| regular | DSA-tagged
| frames | frames
| |
v vswp4 swp5
This works but is highly unpractical, due to NXP shifting the task of designing a functional system (choosing which port to use, depending on type of traffic required) up to the end user. The swpN interfaces would have to be bridged with swp4, in order for the eno2 "data port" to have access to the outside network. And the swpN interfaces would still be capable of IP networking. So running a DHCP client would give us two IP interfaces from the same subnet, one assigned to eno2, and the other to swpN (0, 1, 2, 3).
Also, the dual port design doesn't scale. When attaching another DSA switch to a Felix port, the end result is that the "data port" cannot carry any meaningful data to the external world, since it lacks the DSA tags required to traverse the sja1105 switches below. All that traffic needs to go through the "control port".
So in newer BSPs there was a desire to simplify that setup, and only have one internal port pair:
eno2 eno3
^
|
| DSA-tagged x disabled
| frames
|
vswp4 swp5
However, this setup only exacerbates the issue of not having flow control on the NPI port, since that is the only port now. Also, there are use cases that still require the "data port", such as IEEE 802.1CB (TSN stream identification doesn't work over an NPI port), source MAC address learning over NPI, etc.
Again, there is a desire to keep the simplicity of the single internal port setup, while regaining the benefits of having a dedicated data port as well. And this series attempts to deliver just that.
So the NPI functionality is disabled conditionally. Its purpose was:
- To ensure individually addressable ports on TX. This can be replaced by using some designated VLAN tags which are pushed by the DSA tagger code, then removed by the switch (so they are invisible to the outside world and to the user).
- To ensure source port identification on RX. Again, this can be replaced by using some designated VLAN tags to encapsulate all RX traffic (each VLAN uniquely identifies a source port). The DSA tagger determines which port it was based on the VLAN number, then removes that header.
- To deliver PTP timestamps. This cannot be obtained through VLAN headers, so we need to take a step back and see how else we can do that. The Microchip Ocelot-1 (VSC7514 MIPS) driver performs manual injection/extraction from the CPU port module using register-based MMIO, and not over Ethernet. We will need to do the same from DSA, which makes this tagger a sort of hybrid between DSA and pure switchdev.
I determined that a Kconfig option would be a sufficiently good configuration interface for selecting between the existing NPI-based tagged and the tag_8021q software-defined tagger. However, this is one of the things that is up for debate today.
Changes in v2:
Posted the entire rework necessary for PTP support using tag_8021q.c. Added a larger audience to the series.
Changes in v3:
Use a per-port bool is_dsa_8021q_cpu instead of a single dsa_8021q_cpu variable, to be compatible with future work where there may be potentially multiple tag_8021q CPU ports in a LAG.
Changes in v4:
- Support simultaneous compilation of tag_ocelot.c and tag_ocelot_8021q.c.
- Support runtime switchover between the two taggers, by using echo ocelot-8021q > /sys/class/net/eno2/dsa/tagging
- We are now actually performing cleanup instead of just probe-time setup, which is required for supporting tagger switchover.
- Now draining the CPU queues by continuously reading QS_XTR_READ, same as Ocelot, instead of one-time asserting QS_XTR_FLUSH, which actually needed a sleep to be effective.
Vladimir Oltean (16):
net: dsa: tag_8021q: add helpers to deduce whether a VLAN ID is RX or
TX VLAN
net: mscc: ocelot: export VCAP structures to include/soc/mscc
net: mscc: ocelot: store a namespaced VCAP filter ID
net: mscc: ocelot: reapply bridge forwarding mask on bonding
join/leave
net: mscc: ocelot: don't use NPI tag prefix for the CPU port module
net: dsa: allow changing the tag protocol via the "tagging" device
attribute
net: dsa: felix: add new VLAN-based tagger
net: mscc: ocelot: stop returning IRQ_NONE in ocelot_xtr_irq_handler
net: mscc: ocelot: only drain extraction queue on error
net: mscc: ocelot: better error handling in ocelot_xtr_irq_handler
net: mscc: ocelot: use DIV_ROUND_UP helper in ocelot_port_inject_frame
net: mscc: ocelot: refactor ocelot_port_inject_frame out of
ocelot_port_xmit
net: mscc: ocelot: export struct ocelot_frame_info
net: mscc: ocelot: refactor ocelot_xtr_irq_handler into
ocelot_xtr_poll
net: dsa: felix: setup MMIO filtering rules for PTP when using
tag_8021q
net: dsa: tag_ocelot_8021q: add support for PTP timestamping
MAINTAINERS | 1 + drivers/net/dsa/ocelot/Kconfig | 2 + drivers/net/dsa/ocelot/felix.c | 677 +++++++++++++++++++-- drivers/net/dsa/ocelot/felix.h | 15 + drivers/net/dsa/ocelot/felix_vsc9959.c | 2 + drivers/net/dsa/ocelot/seville_vsc9953.c | 1 + drivers/net/ethernet/mscc/ocelot.c | 345 ++++++++++- drivers/net/ethernet/mscc/ocelot.h | 9 - drivers/net/ethernet/mscc/ocelot_flower.c | 7 +- drivers/net/ethernet/mscc/ocelot_net.c | 82 +-- drivers/net/ethernet/mscc/ocelot_vcap.c | 19 +- drivers/net/ethernet/mscc/ocelot_vcap.h | 295 +-------- drivers/net/ethernet/mscc/ocelot_vsc7514.c | 170 +----- include/linux/dsa/8021q.h | 14 + include/net/dsa.h | 19 + include/soc/mscc/ocelot.h | 26 +- include/soc/mscc/ocelot_vcap.h | 297 +++++++++ net/dsa/Kconfig | 21 +- net/dsa/Makefile | 1 + net/dsa/dsa.c | 20 + net/dsa/dsa2.c | 84 ++- net/dsa/dsa_priv.h | 18 + net/dsa/master.c | 26 +- net/dsa/port.c | 10 +- net/dsa/slave.c | 35 +- net/dsa/switch.c | 96 +++ net/dsa/tag_8021q.c | 15 +- net/dsa/tag_ocelot_8021q.c | 93 +++ 28 files changed, 1766 insertions(+), 634 deletions(-) create mode 100644 net/dsa/tag_ocelot_8021q.c
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 1/16 net: dsa: tag_8021q: add helpers to deduce whether a VLAN ID is RX or TX VLAN
From: Vladimir Oltean <[email protected]>
The sja1105 implementation can be blind about this, but the felix driver doesn't do exactly what it's being told, so it needs to know whether it is a TX or an RX VLAN, so it can install the appropriate type of TCAM rule.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
None.
include/linux/dsa/8021q.h | 14 ++++++++++++++ net/dsa/tag_8021q.c | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-)
include/linux/dsa/8021q.h +14 -0
@@ -64,6 +64,10 @@ int dsa_8021q_rx_source_port(u16 vid);u16 dsa_8021q_rx_subvlan (u16 vid); +bool vid_is_dsa_8021q_rxvlan (u16 vid); + +bool vid_is_dsa_8021q_txvlan (u16 vid); +bool vid_is_dsa_8021q (u16 vid);#else
@@ -123,6 +127,16 @@ u16 dsa_8021q_rx_subvlan(u16 vid)return 0 ; } +bool vid_is_dsa_8021q_rxvlan (u16 vid) +{ +return false; +} + +bool vid_is_dsa_8021q_txvlan (u16 vid) +{ +return false; +} +bool vid_is_dsa_8021q (u16 vid) {return false;
net/dsa/tag_8021q.c +13 -2
@@ -133,10 +133,21 @@ u16 dsa_8021q_rx_subvlan(u16 vid) }EXPORT_SYMBOL_GPL (dsa_8021q_rx_subvlan); +bool vid_is_dsa_8021q_rxvlan (u16 vid) +{ +return (vid &DSA_8021Q_DIR_MASK ) ==DSA_8021Q_DIR_RX ; +} +EXPORT_SYMBOL_GPL (vid_is_dsa_8021q_rxvlan); + +bool vid_is_dsa_8021q_txvlan (u16 vid) +{ +return (vid &DSA_8021Q_DIR_MASK ) ==DSA_8021Q_DIR_TX ; +} +EXPORT_SYMBOL_GPL (vid_is_dsa_8021q_txvlan); +bool vid_is_dsa_8021q (u16 vid) { -return ((vid &DSA_8021Q_DIR_MASK ) ==DSA_8021Q_DIR_RX || - (vid &DSA_8021Q_DIR_MASK ) ==DSA_8021Q_DIR_TX ); +return vid_is_dsa_8021q_rxvlan (vid) ||vid_is_dsa_8021q_txvlan (vid); }EXPORT_SYMBOL_GPL (vid_is_dsa_8021q);
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 2/16 net: mscc: ocelot: export VCAP structures to include/soc/mscc
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
The Felix driver will need to preinstall some VCAP filters for its tag_8021q implementation (outside of the tc-flower offload logic), so these need to be exported to the common includes.
---
Changes in v4:
Use EXPORT_SYMBOL for ocelot_vcap_filter_add and ocelot_vcap_filter_del so that building as module does not fail.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot_net.c | 1 + drivers/net/ethernet/mscc/ocelot_vcap.c | 2 + drivers/net/ethernet/mscc/ocelot_vcap.h | 293 +----------------------- include/soc/mscc/ocelot_vcap.h | 289 +++++++++++++++++++++++ 4 files changed, 294 insertions(+), 291 deletions(-)
drivers/net/ethernet/mscc/ocelot_net.c +1 -0
@@ -9,6 +9,7 @@*/ #include <linux/if_bridge.h> +#include <net/pkt_cls.h> #include "ocelot.h" #include "ocelot_vcap.h"
drivers/net/ethernet/mscc/ocelot_vcap.c +2 -0
@@ -1150,6 +1150,7 @@ int ocelot_vcap_filter_add(struct ocelot *ocelot,vcap_entry_set (ocelot, index, filter);return 0 ; } +EXPORT_SYMBOL (ocelot_vcap_filter_add); static void ocelot_vcap_block_remove_filter(struct ocelot *ocelot, struct ocelot_vcap_block *block,
@@ -1204,6 +1205,7 @@ int ocelot_vcap_filter_del(struct ocelot *ocelot,return 0 ; } +EXPORT_SYMBOL (ocelot_vcap_filter_del);int ocelot_vcap_filter_stats_update (struct ocelot *ocelot,struct ocelot_vcap_filter *filter)
drivers/net/ethernet/mscc/ocelot_vcap.h +2 -291
302 lines not on this page · raw message
include/soc/mscc/ocelot_vcap.h +289 -0
293 lines not on this page · raw message
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 3/16 net: mscc: ocelot: store a namespaced VCAP filter ID
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
We will be adding some private VCAP filters that should not interfere in any way with the filters added using tc-flower. So we need to allocate some IDs which will not be used by tc.
Currently ocelot uses an u32 id derived from the flow cookie, which in itself is an unsigned long. This is a problem in itself, since on 64 bit systems, sizeof(unsigned long)=8, so the driver is already truncating these.
Create a struct ocelot_vcap_id which contains the full unsigned long cookie from tc, as well as a boolean that is supposed to namespace the filters added by tc with the ones that aren't.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot_flower.c | 7 ++++--- drivers/net/ethernet/mscc/ocelot_vcap.c | 16 ++++++++++++---- drivers/net/ethernet/mscc/ocelot_vcap.h | 3 ++- include/soc/mscc/ocelot_vcap.h | 7 ++++++- 4 files changed, 24 insertions(+), 9 deletions(-)
drivers/net/ethernet/mscc/ocelot_flower.c +4 -3
@@ -622,7 +622,8 @@ static int ocelot_flower_parse(struct ocelot *ocelot, int port, bool ingress,int ret; filter->prio = f->common.prio; - filter->id = f->cookie; + filter->id.cookie = f->cookie; + filter->id.tc_offload = true; ret =ocelot_flower_parse_action (ocelot, port, ingress, f, filter);if (ret)
@@ -717,7 +718,7 @@ int ocelot_cls_flower_destroy(struct ocelot *ocelot, int port, block = &ocelot->block[block_id]; - filter =ocelot_vcap_block_find_filter_by_id (block, f->cookie); + filter =ocelot_vcap_block_find_filter_by_id (block, f->cookie, true);if (!filter)return 0 ;
@@ -741,7 +742,7 @@ int ocelot_cls_flower_stats(struct ocelot *ocelot, int port, block = &ocelot->block[block_id]; - filter =ocelot_vcap_block_find_filter_by_id (block, f->cookie); + filter =ocelot_vcap_block_find_filter_by_id (block, f->cookie, true);if (!filter || filter->type ==OCELOT_VCAP_FILTER_DUMMY )return 0 ;
drivers/net/ethernet/mscc/ocelot_vcap.c +12 -4
@@ -959,6 +959,12 @@ static void ocelot_vcap_filter_add_to_block(struct ocelot *ocelot,list_add (&filter->list, pos->prev); } +static bool ocelot_vcap_filter_equal (const struct ocelot_vcap_filter *a, +const struct ocelot_vcap_filter *b) +{ +return !memcmp (&a->id, &b->id,sizeof (struct ocelot_vcap_id )); +} +static int ocelot_vcap_block_get_filter_index (struct ocelot_vcap_block *block,struct ocelot_vcap_filter *filter) {
@@ -966,7 +972,7 @@ static int ocelot_vcap_block_get_filter_index(struct ocelot_vcap_block *block,int index =0 ;list_for_each_entry (tmp, &block->rules, list) { -if (filter->id == tmp->id) +if (ocelot_vcap_filter_equal (filter, tmp))return index; index++; }
@@ -991,12 +997,14 @@ ocelot_vcap_block_find_filter_by_index(struct ocelot_vcap_block *block, }struct ocelot_vcap_filter * -ocelot_vcap_block_find_filter_by_id (struct ocelot_vcap_block *block,int id) +ocelot_vcap_block_find_filter_by_id (struct ocelot_vcap_block *block,int cookie, +bool tc_offload) {struct ocelot_vcap_filter *filter;list_for_each_entry (filter, &block->rules, list) -if (filter->id == id) +if (filter->id.tc_offload == tc_offload && + filter->id.cookie == cookie)return filter;return NULL ;
@@ -1161,7 +1169,7 @@ static void ocelot_vcap_block_remove_filter(struct ocelot *ocelot,list_for_each_safe (pos, q, &block->rules) { tmp = list_entry(pos, struct ocelot_vcap_filter, list); -if (tmp->id == filter->id) { +if (ocelot_vcap_filter_equal (filter, tmp)) {if (tmp->block_id ==VCAP_IS2 && tmp->action.police_ena) ocelot_vcap_policer_del(ocelot, block,
drivers/net/ethernet/mscc/ocelot_vcap.h +2 -1
@@ -15,7 +15,8 @@int ocelot_vcap_filter_stats_update (struct ocelot *ocelot,struct ocelot_vcap_filter *rule);struct ocelot_vcap_filter * -ocelot_vcap_block_find_filter_by_id (struct ocelot_vcap_block *block,int id); +ocelot_vcap_block_find_filter_by_id (struct ocelot_vcap_block *block,int id, +bool tc_offload);void ocelot_detect_vcap_constants (struct ocelot *ocelot);int ocelot_vcap_init (struct ocelot *ocelot);
include/soc/mscc/ocelot_vcap.h +6 -1
@@ -648,6 +648,11 @@ enum ocelot_vcap_filter_type { OCELOT_VCAP_FILTER_OFFLOAD, }; +struct ocelot_vcap_id { +unsigned long cookie; +bool tc_offload; +}; +struct ocelot_vcap_filter {struct list_head list;
@@ -657,7 +662,7 @@ struct ocelot_vcap_filter {int lookup;u8 pag;u16 prio; -u32 id; +struct ocelot_vcap_id id;struct ocelot_vcap_action action;struct ocelot_vcap_stats stats;
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 4/16 net: mscc: ocelot: reapply bridge forwarding mask on bonding join/leave
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Applying the bridge forwarding mask currently is done only on the STP state changes for any port. But it depends on both STP state changes, and bonding interface state changes. Export the bit that recalculates the forwarding mask so that it could be reused, and call it when a port starts and stops offloading a bonding interface.
Now that the logic is split into a separate function, we can rename "p" into "port", since the "port" variable was already taken in ocelot_bridge_stp_state_set. Also, we can rename "i" into "lag", to make it more clear what is it that we're iterating through.
---
Changes in v4:
Patch is carried over from the "LAG offload for Ocelot DSA switches" series:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
I need it here because it refactors ocelot_apply_bridge_fwd_mask into a separate function which I also need to call from felix now.
drivers/net/ethernet/mscc/ocelot.c | 63 +++++++++++++++++------------- 1 file changed, 36 insertions(+), 27 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +36 -27
@@ -876,10 +876,42 @@ int ocelot_get_ts_info(struct ocelot *ocelot, int port, }EXPORT_SYMBOL (ocelot_get_ts_info); +static void ocelot_apply_bridge_fwd_mask (struct ocelot *ocelot) +{ +int port; + +/* Apply FWD mask. The loop is needed to add/remove the current port as +* a source for the other ports. +*/ +for (port =0 ; port < ocelot->num_phys_ports; port++) { +if (ocelot->bridge_fwd_mask &BIT (port)) { +unsigned long mask = ocelot->bridge_fwd_mask & ~BIT (port); +int lag; + +for (lag =0 ; lag < ocelot->num_phys_ports; lag++) { +unsigned long bond_mask = ocelot->lags[lag]; + +if (!bond_mask) +continue ; + +if (bond_mask &BIT (port)) { + mask &= ~bond_mask; +break ; + } + } + +ocelot_write_rix (ocelot, mask, +ANA_PGID_PGID ,PGID_SRC + port); + }else { +ocelot_write_rix (ocelot,0 , +ANA_PGID_PGID ,PGID_SRC + port); + } + } +} +void ocelot_bridge_stp_state_set (struct ocelot *ocelot,int port,u8 state) {u32 port_cfg; -int p, i;if (!(BIT (port) & ocelot->bridge_mask))return ;
@@ -902,32 +934,7 @@ void ocelot_bridge_stp_state_set(struct ocelot *ocelot, int port, u8 state)ocelot_write_gix (ocelot, port_cfg,ANA_PORT_PORT_CFG , port); -/* Apply FWD mask. The loop is needed to add/remove the current port as -* a source for the other ports. -*/ -for (p =0 ; p < ocelot->num_phys_ports; p++) { -if (ocelot->bridge_fwd_mask &BIT (p)) { -unsigned long mask = ocelot->bridge_fwd_mask & ~BIT (p); - -for (i =0 ; i < ocelot->num_phys_ports; i++) { -unsigned long bond_mask = ocelot->lags[i]; - -if (!bond_mask) -continue ; - -if (bond_mask &BIT (p)) { - mask &= ~bond_mask; -break ; - } - } - -ocelot_write_rix (ocelot, mask, -ANA_PGID_PGID ,PGID_SRC + p); - }else { -ocelot_write_rix (ocelot,0 , -ANA_PGID_PGID ,PGID_SRC + p); - } - } +ocelot_apply_bridge_fwd_mask (ocelot); }EXPORT_SYMBOL (ocelot_bridge_stp_state_set);
@@ -1284,6 +1291,7 @@ int ocelot_port_lag_join(struct ocelot *ocelot, int port, }ocelot_setup_lag (ocelot, lag); +ocelot_apply_bridge_fwd_mask (ocelot);ocelot_set_aggr_pgids (ocelot);return 0 ;
@@ -1317,6 +1325,7 @@ void ocelot_port_lag_leave(struct ocelot *ocelot, int port,ocelot_write_gix (ocelot, port_cfg |ANA_PORT_PORT_CFG_PORTID_VAL (port),ANA_PORT_PORT_CFG , port); +ocelot_apply_bridge_fwd_mask (ocelot);ocelot_set_aggr_pgids (ocelot); }EXPORT_SYMBOL (ocelot_port_lag_leave);
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 5/16 net: mscc: ocelot: don't use NPI tag prefix for the CPU port module
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Context: Ocelot switches put the injection/extraction frame header in front of the Ethernet header. When used in NPI mode, a DSA master would see junk instead of the destination MAC address, and it would most likely drop the packets. So the Ocelot frame header can have an optional prefix, which is just "ff:ff:ff:ff:ff:fe > ff:ff:ff:ff:ff:ff" padding put before the actual tag (still before the real Ethernet header) such that the DSA master thinks it's looking at a broadcast frame with a strange EtherType.
Unfortunately, a lesson learned in commit 69df578c5f4b ("net: mscc:
ocelot: eliminate confusion between CPU and NPI port") seems to have been forgotten in the meanwhile.
The CPU port module and the NPI port have independent settings for the length of the tag prefix. However, the driver is using the same variable to program both of them.
There is no reason really to use any tag prefix with the CPU port module, since that is not connected to any Ethernet port. So this patch makes the inj_prefix and xtr_prefix variables apply only to the NPI port (which the switchdev ocelot_vsc7514 driver does not use).
---
Changes in v4:
Patch is new.
drivers/net/dsa/ocelot/felix.c | 8 ++++---- drivers/net/ethernet/mscc/ocelot.c | 12 ++++++------ drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 -- include/soc/mscc/ocelot.h | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-)
drivers/net/dsa/ocelot/felix.c +4 -4
@@ -425,8 +425,8 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) ocelot->num_mact_rows = felix->info->num_mact_rows; ocelot->vcap = felix->info->vcap; ocelot->ops = felix->info->ops; - ocelot->inj_prefix =OCELOT_TAG_PREFIX_SHORT ; - ocelot->xtr_prefix =OCELOT_TAG_PREFIX_SHORT ; + ocelot->npi_inj_prefix =OCELOT_TAG_PREFIX_SHORT ; + ocelot->npi_xtr_prefix =OCELOT_TAG_PREFIX_SHORT ; ocelot->devlink = felix->ds->devlink; port_phy_modes = kcalloc(num_phys_ports, sizeof(phy_interface_t),
@@ -541,9 +541,9 @@ static void felix_npi_port_init(struct ocelot *ocelot, int port)/* NPI port Injection/Extraction configuration */ ocelot_fields_write (ocelot, port,SYS_PORT_MODE_INCL_XTR_HDR , - ocelot->xtr_prefix); + ocelot->npi_xtr_prefix);ocelot_fields_write (ocelot, port,SYS_PORT_MODE_INCL_INJ_HDR , - ocelot->inj_prefix); + ocelot->npi_inj_prefix);/* Disable transmission of pause frames */ ocelot_fields_write (ocelot, port,SYS_PAUSE_CFG_PAUSE_ENA ,0 );
drivers/net/ethernet/mscc/ocelot.c +6 -6
@@ -1346,9 +1346,9 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu)if (port == ocelot->npi) { maxlen +=OCELOT_TAG_LEN ; -if (ocelot->inj_prefix ==OCELOT_TAG_PREFIX_SHORT ) +if (ocelot->npi_inj_prefix ==OCELOT_TAG_PREFIX_SHORT ) maxlen +=OCELOT_SHORT_PREFIX_LEN ; -else if (ocelot->inj_prefix ==OCELOT_TAG_PREFIX_LONG ) +else if (ocelot->npi_inj_prefix ==OCELOT_TAG_PREFIX_LONG ) maxlen +=OCELOT_LONG_PREFIX_LEN ; }
@@ -1378,9 +1378,9 @@ int ocelot_get_max_mtu(struct ocelot *ocelot, int port)if (port == ocelot->npi) { max_mtu -=OCELOT_TAG_LEN ; -if (ocelot->inj_prefix ==OCELOT_TAG_PREFIX_SHORT ) +if (ocelot->npi_inj_prefix ==OCELOT_TAG_PREFIX_SHORT ) max_mtu -=OCELOT_SHORT_PREFIX_LEN ; -else if (ocelot->inj_prefix ==OCELOT_TAG_PREFIX_LONG ) +else if (ocelot->npi_inj_prefix ==OCELOT_TAG_PREFIX_LONG ) max_mtu -=OCELOT_LONG_PREFIX_LEN ; }
@@ -1465,9 +1465,9 @@ static void ocelot_cpu_port_init(struct ocelot *ocelot)ocelot_fields_write (ocelot, cpu,QSYS_SWITCH_PORT_MODE_PORT_ENA ,1 );/* CPU port Injection/Extraction configuration */ ocelot_fields_write (ocelot, cpu,SYS_PORT_MODE_INCL_XTR_HDR , - ocelot->xtr_prefix); +OCELOT_TAG_PREFIX_NONE );ocelot_fields_write (ocelot, cpu,SYS_PORT_MODE_INCL_INJ_HDR , - ocelot->inj_prefix); +OCELOT_TAG_PREFIX_NONE );/* Configure the CPU port to be VLAN aware */ ocelot_write_gix(ocelot, ANA_PORT_VLAN_CFG_VLAN_VID(0) |
drivers/net/ethernet/mscc/ocelot_vsc7514.c +0 -2
@@ -1347,8 +1347,6 @@ static int mscc_ocelot_probe(struct platform_device *pdev) ocelot->num_flooding_pgids =1 ; ocelot->vcap = vsc7514_vcap_props; - ocelot->inj_prefix =OCELOT_TAG_PREFIX_NONE ; - ocelot->xtr_prefix =OCELOT_TAG_PREFIX_NONE ; ocelot->npi =-1 ; err =ocelot_init (ocelot);
include/soc/mscc/ocelot.h +2 -2
@@ -651,8 +651,8 @@ struct ocelot {int npi; -enum ocelot_tag_prefix inj_prefix; -enum ocelot_tag_prefix xtr_prefix; +enum ocelot_tag_prefix npi_inj_prefix; +enum ocelot_tag_prefix npi_xtr_prefix;u32 *lags;
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 6/16 net: dsa: allow changing the tag protocol via the "tagging" device attribute
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Currently DSA exposes the following sysfs:
$ cat /sys/class/net/eno2/dsa/tagging ocelot
which is a read-only device attribute, introduced in the kernel as commit 98cdb4807123 ("net: dsa: Expose tagging protocol to user-space"), and used by libpcap since its commit 993db3800d7d ("Add support for DSA link-layer types").
It would be nice if we could extend this device attribute by making it writable:
$ echo ocelot-8021q > /sys/class/net/eno2/dsa/tagging
This is useful with DSA switches that can make use of more than one tagging protocol. It may be useful in dsa_loop in the future too, to perform offline testing of various taggers.
In terms of implementation, drivers can now move their tagging protocol configuration outside of .setup/.teardown, and into .set_tag_protocol and .del_tag_protocol. The calling order is:
.setup -> [.set_tag_protocol -> .del_tag_protocol]+ -> .teardown
There was one more contract between the DSA framework and drivers, which is that if a CPU port needs to account for the tagger overhead in its MTU configuration, it must do that privately. Which means it needs the information about what tagger it uses before we call its MTU configuration function. That promise is still held.
Writing to the tagging sysfs will first tear down the tagging protocol for all switches in the tree attached to that DSA master, then will attempt setup with the new tagger.
Writing will fail quickly with -EOPNOTSUPP for drivers that don't support .set_tag_protocol, since that is checked during the deletion phase. It is assumed that all switches within the same DSA tree use the same driver, and therefore either all have .set_tag_protocol implemented, or none do.
---
Changes in v4:
Patch is new.
include/net/dsa.h | 17 ++++++++ net/dsa/dsa.c | 20 ++++++++++ net/dsa/dsa2.c | 84 ++++++++++++++++++++++++++++++++++++++-- net/dsa/dsa_priv.h | 18 +++++++++ net/dsa/master.c | 26 ++++++++++++- net/dsa/port.c | 10 ++++- net/dsa/slave.c | 35 +++++++++++------ net/dsa/switch.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 289 insertions(+), 17 deletions(-)
include/net/dsa.h +17 -0
@@ -333,6 +333,8 @@ struct dsa_switch {/* devlink used to represent this switch device */ struct devlink *devlink; +struct mutex tagger_lock; +/* Number of switch port queues */ unsigned int num_tx_queues;
@@ -480,9 +482,24 @@ static inline bool dsa_port_is_vlan_filtering(const struct dsa_port *dp)typedef int dsa_fdb_dump_cb_t (const unsigned char *addr,u16 vid,bool is_static,void *data);struct dsa_switch_ops { +/* +* Tagging protocol helpers. +* Switches that support a single tagging protocol should implement +* only @get_tag_protocol and hardcode the protocol that they support. +* Switches which can operate using multiple tagging protocols should +* report in @get_tag_protocol the tagger in current use. They can +* optionally set up the tagging protocol in @set_tag_protocol and +* perform teardown (memory deallocation, etc) in @del_tag_protocol. +* The framework guarantees paired calls to the last two functions. +* For all of these helpers, @port is the CPU port that gets set up. +*/ enum dsa_tag_protocol (*get_tag_protocol)(struct dsa_switch *ds,int port,enum dsa_tag_protocol mprot); +int (*set_tag_protocol)(struct dsa_switch *ds,int port, +enum dsa_tag_protocol proto); +void (*del_tag_protocol)(struct dsa_switch *ds,int port, +enum dsa_tag_protocol proto);int (*setup)(struct dsa_switch *ds);void (*teardown)(struct dsa_switch *ds);
net/dsa/dsa.c +20 -0
@@ -84,6 +84,26 @@ const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops)return ops->name; }; +const struct dsa_device_ops *dsa_find_tagger_by_name (const char *buf) +{ +const struct dsa_device_ops *ops =NULL ; +struct dsa_tag_driver *dsa_tag_driver; + +mutex_lock (&dsa_tag_drivers_lock); +list_for_each_entry (dsa_tag_driver, &dsa_tag_drivers_list, list) { +const struct dsa_device_ops *tmp = dsa_tag_driver->ops; + +if (!sysfs_streq (buf, tmp->name)) +continue ; + + ops = tmp; +break ; + } +mutex_unlock (&dsa_tag_drivers_lock); + +return ops; +} +const struct dsa_device_ops *dsa_tag_driver_get (int tag_protocol) {struct dsa_tag_driver *dsa_tag_driver;
net/dsa/dsa2.c +81 -3
121 lines not on this page · raw message
net/dsa/dsa_priv.h +18 -0
@@ -28,6 +28,8 @@ enum {DSA_NOTIFIER_VLAN_ADD ,DSA_NOTIFIER_VLAN_DEL ,DSA_NOTIFIER_MTU , +DSA_NOTIFIER_TAG_PROTO_SET , + DSA_NOTIFIER_TAG_PROTO_DEL, };/* DSA_NOTIFIER_AGEING_TIME */
@@ -82,6 +84,12 @@ struct dsa_notifier_mtu_info {int mtu; }; +/* DSA_NOTIFIER_TAG_PROTO_* */ +struct dsa_notifier_tag_proto_info { +int tree_index; +const struct dsa_device_ops *tag_ops; +}; +struct dsa_switchdev_event_work {struct dsa_switch *ds;int port;
@@ -115,6 +123,7 @@ struct dsa_slave_priv {/* dsa.c */ const struct dsa_device_ops *dsa_tag_driver_get (int tag_protocol);void dsa_tag_driver_put (const struct dsa_device_ops *ops); +const struct dsa_device_ops *dsa_find_tagger_by_name (const char *buf);bool dsa_schedule_work (struct work_struct *work);const char *dsa_tag_protocol_to_str (const struct dsa_device_ops *ops);
@@ -139,6 +148,9 @@ static inline struct net_device *dsa_master_find_slave(struct net_device *dev, }/* port.c */ +int dsa_broadcast (unsigned long e,void *v); +void dsa_port_set_tag_protocol (struct dsa_port *cpu_dp, +const struct dsa_device_ops *tag_ops);int dsa_port_set_state (struct dsa_port *dp,u8 state);int dsa_port_enable_rt (struct dsa_port *dp,struct phy_device *phy);int dsa_port_enable (struct dsa_port *dp,struct phy_device *phy);
@@ -201,6 +213,8 @@ int dsa_slave_suspend(struct net_device *slave_dev);int dsa_slave_resume (struct net_device *slave_dev);int dsa_slave_register_notifier (void );void dsa_slave_unregister_notifier (void ); +void dsa_slave_setup_tagger (struct net_device *slave); +int dsa_slave_change_mtu (struct net_device *dev,int new_mtu);static inline struct dsa_port *dsa_slave_to_port (const struct net_device *dev) {
@@ -283,6 +297,10 @@ void dsa_switch_unregister_notifier(struct dsa_switch *ds);/* dsa2.c */ void dsa_lag_map (struct dsa_switch_tree *dst,struct net_device *lag);void dsa_lag_unmap (struct dsa_switch_tree *dst,struct net_device *lag); +int dsa_tree_change_tag_proto (struct dsa_switch_tree *dst, +struct net_device *master, +const struct dsa_device_ops *tag_ops, +const struct dsa_device_ops *old_tag_ops);extern struct list_head dsa_tree_list;
net/dsa/master.c +25 -1
@@ -280,7 +280,31 @@ static ssize_t tagging_show(struct device *d, struct device_attribute *attr,return sprintf (buf,"%s\n" ,dsa_tag_protocol_to_str (cpu_dp->tag_ops)); } -static DEVICE_ATTR_RO (tagging); + +static ssize_t tagging_store (struct device *d,struct device_attribute *attr, +const char *buf,size_t count) +{ +struct net_device *dev =to_net_dev (d); +struct dsa_port *cpu_dp = dev->dsa_ptr; +const struct dsa_device_ops *ops; +int err; + + ops =dsa_find_tagger_by_name (buf); +/* Bad tagger name, or module is not loaded? */ +if (!ops) +return -ENOENT ; + +if (ops == cpu_dp->tag_ops) + goto out; + + err =dsa_tree_change_tag_proto (cpu_dp->ds->dst, dev, ops, + cpu_dp->tag_ops); +if (err) +return err; +out: +return count; +} +static DEVICE_ATTR_RW (tagging);static struct attribute *dsa_slave_attrs[] = { &dev_attr_tagging.attr,
net/dsa/port.c +9 -1
@@ -13,7 +13,7 @@#include "dsa_priv.h" -static int dsa_broadcast (unsigned long e,void *v) +int dsa_broadcast (unsigned long e,void *v) {struct dsa_switch_tree *dst;int err =0 ;
@@ -536,6 +536,14 @@ int dsa_port_vlan_del(struct dsa_port *dp,return dsa_port_notify (dp,DSA_NOTIFIER_VLAN_DEL , &info); } +void dsa_port_set_tag_protocol (struct dsa_port *cpu_dp, +const struct dsa_device_ops *tag_ops) +{ + cpu_dp->filter = tag_ops->filter; + cpu_dp->rcv = tag_ops->rcv; + cpu_dp->tag_ops = tag_ops; +} +static struct phy_device *dsa_port_get_phy_device (struct dsa_port *dp) {struct device_node *phy_dn;
net/dsa/slave.c +23 -12
@@ -1430,7 +1430,7 @@ static void dsa_bridge_mtu_normalization(struct dsa_port *dp)dsa_hw_port_list_free (&hw_port_list); } -static int dsa_slave_change_mtu (struct net_device *dev,int new_mtu) +int dsa_slave_change_mtu (struct net_device *dev,int new_mtu) {struct net_device *master =dsa_slave_to_master (dev);struct dsa_port *dp =dsa_slave_to_port (dev);
@@ -1708,6 +1708,27 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev)return ret; } +void dsa_slave_setup_tagger (struct net_device *slave) +{ +struct dsa_port *dp =dsa_slave_to_port (slave); +struct dsa_slave_priv *p =netdev_priv (slave); +const struct dsa_port *cpu_dp = dp->cpu_dp; +struct net_device *master = cpu_dp->master; + +if (cpu_dp->tag_ops->tail_tag) + slave->needed_tailroom = cpu_dp->tag_ops->overhead; +else + slave->needed_headroom = cpu_dp->tag_ops->overhead; +/* Try to save one extra realloc later in the TX path (in the master) +* by also inheriting the master's needed headroom and tailroom. +* The 8021q driver also does this. +*/ + slave->needed_headroom += master->needed_headroom; + slave->needed_tailroom += master->needed_tailroom; + + p->xmit = cpu_dp->tag_ops->xmit; +} +static struct lock_class_key dsa_slave_netdev_xmit_lock_key; static void dsa_slave_set_lockdep_class_one(struct net_device *dev, struct netdev_queue *txq,
@@ -1782,16 +1803,6 @@ int dsa_slave_create(struct dsa_port *port) slave_dev->netdev_ops = &dsa_slave_netdev_ops;if (ds->ops->port_max_mtu) slave_dev->max_mtu = ds->ops->port_max_mtu (ds, port->index); -if (cpu_dp->tag_ops->tail_tag) - slave_dev->needed_tailroom = cpu_dp->tag_ops->overhead; -else - slave_dev->needed_headroom = cpu_dp->tag_ops->overhead; -/* Try to save one extra realloc later in the TX path (in the master) -* by also inheriting the master's needed headroom and tailroom. -* The 8021q driver also does this. -*/ - slave_dev->needed_headroom += master->needed_headroom; - slave_dev->needed_tailroom += master->needed_tailroom;SET_NETDEV_DEVTYPE (slave_dev, &dsa_type); netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,
@@ -1814,8 +1825,8 @@ int dsa_slave_create(struct dsa_port *port) p->dp = port;INIT_LIST_HEAD (&p->mall_tc_list); - p->xmit = cpu_dp->tag_ops->xmit; port->slave = slave_dev; +dsa_slave_setup_tagger (slave_dev);rtnl_lock (); ret =dsa_slave_change_mtu (slave_dev,ETH_DATA_LEN );
net/dsa/switch.c +96 -0
108 lines not on this page · raw message
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 7/16 net: dsa: felix: add new VLAN-based tagger
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
There are use cases for which the existing tagger, based on the NPI (Node Processor Interface) functionality, is insufficient.
Namely:
- Frames injected through the NPI port bypass the frame analyzer, so no source address learning is performed, no TSN stream classification, etc.
- Flow control is not functional over an NPI port (PAUSE frames are encapsulated in the same Extraction Frame Header as all other frames)
- There can be at most one NPI port configured for an Ocelot switch. But in NXP LS1028A and T1040 there are two Ethernet CPU ports. The non-NPI port is currently either disabled, or operated as a plain user port (albeit an internally-facing one). Having the ability to configure the two CPU ports symmetrically could pave the way for e.g. creating a LAG between them, to increase bandwidth seamlessly for the system.
So, there is a desire to have an alternative to the NPI mode.
This patch brings an implementation of the software-defined tag_8021q.c tagger format, which also preserves full functionality under a vlan_filtering bridge (unlike sja1105, the only other user of tag_8021q).
It does this by using the TCAM engines for:
- pushing the RX VLAN as a second, outer tag, on egress towards the CPU port
- redirecting towards the correct front port based on TX VLAN and popping that on egress
---
Changes in v4:
- Support simultaneous compilation of tag_ocelot.c and tag_ocelot_8021q.c.
- Support runtime switchover between these two taggers.
- We are now actually performing cleanup instead of just probe-time setup, which is required for supporting tagger switchover.
Changes in v3:
- Use a per-port bool is_dsa_8021q_cpu instead of a single dsa_8021q_cpu variable, to be compatible with future work where there may be potentially multiple tag_8021q CPU ports in a LAG.
- Initialize ocelot->npi = -1 in felix_8021q_cpu_port_init to ensure we don't mistakenly trigger NPI-specific code in ocelot.
Changes in v2:
Clean up the hardcoding of random VCAP filter IDs and the inclusion of a private ocelot header.
MAINTAINERS | 1 + drivers/net/dsa/ocelot/Kconfig | 2 + drivers/net/dsa/ocelot/felix.c | 473 +++++++++++++++++++++-- drivers/net/dsa/ocelot/felix.h | 2 + drivers/net/dsa/ocelot/felix_vsc9959.c | 1 + drivers/net/dsa/ocelot/seville_vsc9953.c | 1 + drivers/net/ethernet/mscc/ocelot.c | 36 +- drivers/net/ethernet/mscc/ocelot_vcap.c | 1 + drivers/net/ethernet/mscc/ocelot_vcap.h | 3 - include/net/dsa.h | 2 + include/soc/mscc/ocelot.h | 2 + include/soc/mscc/ocelot_vcap.h | 3 + net/dsa/Kconfig | 21 +- net/dsa/Makefile | 1 + net/dsa/tag_ocelot_8021q.c | 68 ++++ 15 files changed, 566 insertions(+), 51 deletions(-) create mode 100644 net/dsa/tag_ocelot_8021q.c
MAINTAINERS +1 -0
@@ -12842,6 +12842,7 @@ F: drivers/net/dsa/ocelot/* F: drivers/net/ethernet/mscc/ F: include/soc/mscc/ocelot* F: net/dsa/tag_ocelot.c +F: net/dsa/tag_ocelot_8021q.c F: tools/testing/selftests/drivers/net/ocelot/* OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
drivers/net/dsa/ocelot/Kconfig +2 -0
@@ -6,6 +6,7 @@ config NET_DSA_MSCC_FELIX depends on NET_VENDOR_FREESCALE depends on HAS_IOMEM select MSCC_OCELOT_SWITCH_LIB + select NET_DSA_TAG_OCELOT_8021Q select NET_DSA_TAG_OCELOT select FSL_ENETC_MDIO select PCS_LYNX
@@ -19,6 +20,7 @@ config NET_DSA_MSCC_SEVILLE depends on NET_VENDOR_MICROSEMI depends on HAS_IOMEM select MSCC_OCELOT_SWITCH_LIB + select NET_DSA_TAG_OCELOT_8021Q select NET_DSA_TAG_OCELOT select PCS_LYNX help
drivers/net/dsa/ocelot/felix.c +437 -36
518 lines not on this page · raw message
drivers/net/dsa/ocelot/felix.h +2 -0
@@ -48,6 +48,8 @@ struct felix {struct lynx_pcs **pcs;resource_size_t switch_base;resource_size_t imdio_base; +struct dsa_8021q_context *dsa_8021q_ctx; +enum dsa_tag_protocol tag_proto; };struct net_device *felix_port_to_netdev (struct ocelot *ocelot,int port);
drivers/net/dsa/ocelot/felix_vsc9959.c +1 -0
@@ -1467,6 +1467,7 @@ static int felix_pci_probe(struct pci_dev *pdev, ds->ops = &felix_switch_ops; ds->priv = ocelot; felix->ds = ds; + felix->tag_proto =DSA_TAG_PROTO_OCELOT ; err =dsa_register_switch (ds);if (err) {
drivers/net/dsa/ocelot/seville_vsc9953.c +1 -0
@@ -1246,6 +1246,7 @@ static int seville_probe(struct platform_device *pdev) ds->ops = &felix_switch_ops; ds->priv = ocelot; felix->ds = ds; + felix->tag_proto =DSA_TAG_PROTO_OCELOT ; err =dsa_register_switch (ds);if (err) {
drivers/net/ethernet/mscc/ocelot.c +27 -9
@@ -876,18 +876,39 @@ int ocelot_get_ts_info(struct ocelot *ocelot, int port, }EXPORT_SYMBOL (ocelot_get_ts_info); -static void ocelot_apply_bridge_fwd_mask (struct ocelot *ocelot) +void ocelot_apply_bridge_fwd_mask (struct ocelot *ocelot) { +unsigned long cpu_fwd_mask =0 ;int port; +/* If a DSA tag_8021q CPU exists, it needs to be unconditionally +* (i.e. regardless of whether the port is bridged or standalone) +* included in the regular forwarding path, as opposed to the +* hardware-based CPU port module which can be a destination for +* packets even if it isn't part of PGID_SRC. +*/ +for (port =0 ; port < ocelot->num_phys_ports; port++) +if (ocelot->ports[port]->is_dsa_8021q_cpu) + cpu_fwd_mask |=BIT (port); +/* Apply FWD mask. The loop is needed to add/remove the current port as * a source for the other ports. */ for (port =0 ; port < ocelot->num_phys_ports; port++) { -if (ocelot->bridge_fwd_mask &BIT (port)) { -unsigned long mask = ocelot->bridge_fwd_mask & ~BIT (port); +/* Standalone ports forward only to DSA tag_8021q CPU ports */ +unsigned long mask = cpu_fwd_mask; + +/* The DSA tag_8021q CPU ports need to be able to forward +* packets to all other ports except for themselves +*/ +if (ocelot->ports[port]->is_dsa_8021q_cpu) { + mask =GENMASK (ocelot->num_phys_ports -1 ,0 ); + mask &= ~cpu_fwd_mask; + }else if (ocelot->bridge_fwd_mask &BIT (port)) {int lag; + mask |= ocelot->bridge_fwd_mask & ~BIT (port); +for (lag =0 ; lag < ocelot->num_phys_ports; lag++) {unsigned long bond_mask = ocelot->lags[lag];
@@ -899,15 +920,12 @@ static void ocelot_apply_bridge_fwd_mask(struct ocelot *ocelot)break ; } } - -ocelot_write_rix (ocelot, mask, -ANA_PGID_PGID ,PGID_SRC + port); - }else { -ocelot_write_rix (ocelot,0 , -ANA_PGID_PGID ,PGID_SRC + port); } + +ocelot_write_rix (ocelot, mask,ANA_PGID_PGID ,PGID_SRC + port); } } +EXPORT_SYMBOL (ocelot_apply_bridge_fwd_mask);void ocelot_bridge_stp_state_set (struct ocelot *ocelot,int port,u8 state) {
drivers/net/ethernet/mscc/ocelot_vcap.c +1 -0
@@ -1009,6 +1009,7 @@ ocelot_vcap_block_find_filter_by_id(struct ocelot_vcap_block *block, int cookie,return NULL ; } +EXPORT_SYMBOL (ocelot_vcap_block_find_filter_by_id);/* If @on=false, then SNAP, ARP, IP and OAM frames will not match on keys based * on destination and source MAC addresses, but only on higher-level protocol
drivers/net/ethernet/mscc/ocelot_vcap.h +0 -3
@@ -14,9 +14,6 @@int ocelot_vcap_filter_stats_update (struct ocelot *ocelot,struct ocelot_vcap_filter *rule); -struct ocelot_vcap_filter * -ocelot_vcap_block_find_filter_by_id (struct ocelot_vcap_block *block,int id, -bool tc_offload);void ocelot_detect_vcap_constants (struct ocelot *ocelot);int ocelot_vcap_init (struct ocelot *ocelot);
include/net/dsa.h +2 -0
@@ -47,6 +47,7 @@ struct phylink_link_state;#define DSA_TAG_PROTO_RTL4_A_VALUE 17#define DSA_TAG_PROTO_HELLCREEK_VALUE 18#define DSA_TAG_PROTO_XRS700X_VALUE 19 +#define DSA_TAG_PROTO_OCELOT_8021Q_VALUE 20enum dsa_tag_protocol {DSA_TAG_PROTO_NONE =DSA_TAG_PROTO_NONE_VALUE ,
@@ -69,6 +70,7 @@ enum dsa_tag_protocol {DSA_TAG_PROTO_RTL4_A =DSA_TAG_PROTO_RTL4_A_VALUE ,DSA_TAG_PROTO_HELLCREEK =DSA_TAG_PROTO_HELLCREEK_VALUE ,DSA_TAG_PROTO_XRS700X =DSA_TAG_PROTO_XRS700X_VALUE , + DSA_TAG_PROTO_OCELOT_8021Q = DSA_TAG_PROTO_OCELOT_8021Q_VALUE, };struct packet_type ;
include/soc/mscc/ocelot.h +2 -0
@@ -610,6 +610,7 @@ struct ocelot_port {phy_interface_t phy_mode;u8 *xmit_template; +bool is_dsa_8021q_cpu; };struct ocelot {
@@ -760,6 +761,7 @@ void ocelot_adjust_link(struct ocelot *ocelot, int port, struct phy_device *phydev);int ocelot_port_vlan_filtering (struct ocelot *ocelot,int port,bool enabled);void ocelot_bridge_stp_state_set (struct ocelot *ocelot,int port,u8 state); +void ocelot_apply_bridge_fwd_mask (struct ocelot *ocelot);int ocelot_port_bridge_join (struct ocelot *ocelot,int port,struct net_device *bridge); int ocelot_port_bridge_leave(struct ocelot *ocelot, int port,
include/soc/mscc/ocelot_vcap.h +3 -0
@@ -693,5 +693,8 @@ int ocelot_vcap_filter_add(struct ocelot *ocelot, struct netlink_ext_ack *extack);int ocelot_vcap_filter_del (struct ocelot *ocelot,struct ocelot_vcap_filter *rule); +struct ocelot_vcap_filter * +ocelot_vcap_block_find_filter_by_id (struct ocelot_vcap_block *block,int id, +bool tc_offload);#endif /* _OCELOT_VCAP_H_ */
net/dsa/Kconfig +18 -3
@@ -105,11 +105,26 @@ config NET_DSA_TAG_RTL4_A the Realtek RTL8366RB. config NET_DSA_TAG_OCELOT - tristate "Tag driver for Ocelot family of switches" + tristate "Tag driver for Ocelot family of switches, using NPI port" select PACKING help - Say Y or M if you want to enable support for tagging frames for the - Ocelot switches (VSC7511, VSC7512, VSC7513, VSC7514, VSC9959). + Say Y or M if you want to enable NPI tagging for the Ocelot switches + (VSC7511, VSC7512, VSC7513, VSC7514, VSC9953, VSC9959). In this mode, + the frames over the Ethernet CPU port are prepended with a + hardware-defined injection/extraction frame header. Flow control + (PAUSE frames) over the CPU port is not supported when operating in + this mode. + +config NET_DSA_TAG_OCELOT_8021Q + tristate "Tag driver for Ocelot family of switches, using VLAN" + select NET_DSA_TAG_8021Q + help + Say Y or M if you want to enable support for tagging frames with a + custom VLAN-based header. Frames that require timestamping, such as + PTP, are not delivered over Ethernet but over register-based MMIO. + Flow control over the CPU port is functional in this mode. When using + this mode, less TCAM resources (VCAP IS1, IS2, ES0) are available for + use with tc-flower. config NET_DSA_TAG_QCA tristate "Tag driver for Qualcomm Atheros QCA8K switches"
net/dsa/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_DSA_TAG_RTL4_A) += tag_rtl4_a.o obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o obj-$(CONFIG_NET_DSA_TAG_MTK) += tag_mtk.o obj-$(CONFIG_NET_DSA_TAG_OCELOT) += tag_ocelot.o +obj-$(CONFIG_NET_DSA_TAG_OCELOT_8021Q) += tag_ocelot_8021q.o obj-$(CONFIG_NET_DSA_TAG_QCA) += tag_qca.o obj-$(CONFIG_NET_DSA_TAG_SJA1105) += tag_sja1105.o obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
net/dsa/tag_ocelot_8021q.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 8/16 net: mscc: ocelot: stop returning IRQ_NONE in ocelot_xtr_irq_handler
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Since the xtr (extraction) IRQ of the ocelot switch is not shared, then if it fired, it means that some data must be present in the queues of the CPU port module. So simplify the code.
---
Changes in v3:
None.
Changes in v2:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot_vsc7514.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/mscc/ocelot_vsc7514.c +2 -5
@@ -604,10 +604,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)int i =0 , grp =0 ;int err =0 ; -if (!(ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp))) -return IRQ_NONE ; - - do { +while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp)) {struct skb_shared_hwtstamps *shhwtstamps;struct ocelot_port_private *priv;struct ocelot_port *ocelot_port;
@@ -702,7 +699,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)netif_rx (skb); dev->stats.rx_bytes += len; dev->stats.rx_packets++; - }while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp)); + }if (err)while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp))
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 9/16 net: mscc: ocelot: only drain extraction queue on error
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
It appears that the intention of this snippet of code is to not exit ocelot_xtr_irq_handler() while in the middle of extracting a frame. The problem in extracting it word by word is that future extraction attempts are really easy to get desynchronized, since the IRQ handler assumes that the first 16 bytes are the IFH, which give further information about the frame, such as frame length.
But during normal operation, "err" will not be 0, but 4, set from here:
for (i = 0; i < OCELOT_TAG_LEN / 4; i++) {
err = ocelot_rx_frame_word(ocelot, grp, true, &ifh[i]);
if (err != 4)
break;
}
if (err != 4)
break;In that case, draining the extraction queue is a no-op. So explicitly make this code execute only on negative err.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot_vsc7514.c +1 -1
@@ -701,7 +701,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) dev->stats.rx_packets++; } -if (err) +if (err <0 )while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp))ocelot_read_rix (ocelot,QS_XTR_RD , grp);
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 10/16 net: mscc: ocelot: better error handling in ocelot_xtr_irq_handler
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
The ocelot_rx_frame_word() function can return a negative error code, however this isn't being checked for consistently. Errors being ignored have not been seen in practice though.
Also, some constructs can be simplified by using "goto" instead of repeated "break" statements.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot_vsc7514.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/ethernet/mscc/ocelot_vsc7514.c +12 -10
@@ -619,12 +619,9 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)for (i =0 ; i <OCELOT_TAG_LEN /4 ; i++) { err =ocelot_rx_frame_word (ocelot, grp, true, &ifh[i]);if (err !=4 ) -break ; + goto out; } -if (err !=4 ) -break ; -/* At this point the IFH was read correctly, so it is safe to * presume that there is no error. The err needs to be reset * otherwise a frame could come in CPU queue between the while
@@ -645,7 +642,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)if (unlikely (!skb)) {netdev_err (dev,"Unable to allocate sk_buff\n" ); err = -ENOMEM ; -break ; + goto out; } buf_len = info.len -ETH_FCS_LEN ; buf = (u32 *)skb_put (skb, buf_len);
@@ -653,12 +650,21 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) len =0 ;do { sz =ocelot_rx_frame_word (ocelot, grp, false, &val); +if (sz <0 ) { + err = sz; + goto out; + } *buf++ = val; len += sz; }while (len < buf_len);/* Read the FCS */ sz =ocelot_rx_frame_word (ocelot, grp, false, &val); +if (sz <0 ) { + err = sz; + goto out; + } +/* Update the statistics if part of the FCS was read before */ len -=ETH_FCS_LEN - sz;
@@ -667,11 +673,6 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) *buf = val; } -if (sz <0 ) { - err = sz; -break ; - } -if (ocelot->ptp) {ocelot_ptp_gettime64 (&ocelot->ptp_info, &ts);
@@ -701,6 +702,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) dev->stats.rx_packets++; } +out:if (err <0 )while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp))ocelot_read_rix (ocelot,QS_XTR_RD , grp);
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 11/16 net: mscc: ocelot: use DIV_ROUND_UP helper in ocelot_port_inject_frame
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
This looks a bit nicer than the open-coded "(x + 3) % 4" idiom.
---
Changes in v3:
None.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot_net.c +1 -1
@@ -563,7 +563,7 @@ static int ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev)ocelot_write_rix (ocelot, (__force u32 )cpu_to_be32 (ifh[i]),QS_INJ_WR , grp); - count = (skb->len +3 ) /4 ; + count =DIV_ROUND_UP (skb->len,4 ); last = skb->len %4 ;for (i =0 ; i < count; i++)ocelot_write_rix (ocelot, ((u32 *)skb->data)[i],QS_INJ_WR , grp);
Signature · 1 line
2.25.1
Re: [PATCH v4 net-next 11/16] net: mscc: ocelot: use DIV_ROUND_UP helper in ocelot_port_inject_frame
Quoted 5 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
This looks a bit nicer than the open-coded "(x + 3) % 4" idiom.
Signed-off-by Vladimir Oltean <[email protected]>
Signature · 1 line
Florian
Vladimir Oltean
maintainerPATCH v4 12/16 net: mscc: ocelot: refactor ocelot_port_inject_frame out of ocelot_port_xmit
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
The felix DSA driver will inject some frames through register MMIO, same as ocelot switchdev currently does. So we need to be able to reuse the common code.
---
Changes in v4:
Added the missing EXPORT_SYMBOL bits for proper compilation as module.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot.c | 80 +++++++++++++++++++++++++ drivers/net/ethernet/mscc/ocelot_net.c | 81 +++----------------------- include/soc/mscc/ocelot.h | 4 ++ 3 files changed, 91 insertions(+), 74 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +80 -0
@@ -561,6 +561,86 @@ void ocelot_get_txtstamp(struct ocelot *ocelot) }EXPORT_SYMBOL (ocelot_get_txtstamp); +/* Generate the IFH for frame injection +* +* The IFH is a 128bit-value +* bit 127: bypass the analyzer processing +* bit 56-67: destination mask +* bit 28-29: pop_cnt: 3 disables all rewriting of the frame +* bit 20-27: cpu extraction queue mask +* bit 16: tag type 0: C-tag, 1: S-tag +* bit 0-11: VID +*/ +static int ocelot_gen_ifh (u32 *ifh,struct frame_info *info) +{ + ifh[0 ] =IFH_INJ_BYPASS | ((0x1ff & info->rew_op) <<21 ); + ifh[1 ] = (0xf00 & info->port) >>8 ; + ifh[2 ] = (0xff & info->port) <<24 ; + ifh[3 ] = (info->tag_type <<16 ) | info->vid; + +return 0 ; +} + +bool ocelot_can_inject (struct ocelot *ocelot,int grp) +{ +u32 val =ocelot_read (ocelot,QS_INJ_STATUS ); + +if (!(val &QS_INJ_STATUS_FIFO_RDY (BIT (grp)))) +return false; +if (val &QS_INJ_STATUS_WMARK_REACHED (BIT (grp))) +return false; + +return true; +} +EXPORT_SYMBOL (ocelot_can_inject); + +void ocelot_port_inject_frame (struct ocelot *ocelot,int port,int grp, +u32 rew_op,struct sk_buff *skb) +{ +struct frame_info info = {}; +u32 ifh[OCELOT_TAG_LEN /4 ]; +unsigned int i, count, last; + +ocelot_write_rix (ocelot,QS_INJ_CTRL_GAP_SIZE (1 ) | +QS_INJ_CTRL_SOF ,QS_INJ_CTRL , grp); + + info.port =BIT (port); + info.tag_type =IFH_TAG_TYPE_C ; + info.vid =skb_vlan_tag_get (skb); + info.rew_op = rew_op; + +ocelot_gen_ifh (ifh, &info); + +for (i =0 ; i <OCELOT_TAG_LEN /4 ; i++) +ocelot_write_rix (ocelot, (__force u32 )cpu_to_be32 (ifh[i]), +QS_INJ_WR , grp); + + count =DIV_ROUND_UP (skb->len,4 ); + last = skb->len %4 ; +for (i =0 ; i < count; i++) +ocelot_write_rix (ocelot, ((u32 *)skb->data)[i],QS_INJ_WR , grp); + +/* Add padding */ +while (i < (OCELOT_BUFFER_CELL_SZ /4 )) { +ocelot_write_rix (ocelot,0 ,QS_INJ_WR , grp); + i++; + } + +/* Indicate EOF and valid bytes in last word */ +ocelot_write_rix (ocelot,QS_INJ_CTRL_GAP_SIZE (1 ) | +QS_INJ_CTRL_VLD_BYTES (skb->len <OCELOT_BUFFER_CELL_SZ ?0 : last) | +QS_INJ_CTRL_EOF , +QS_INJ_CTRL , grp); + +/* Add dummy CRC */ +ocelot_write_rix (ocelot,0 ,QS_INJ_WR , grp); +skb_tx_timestamp (skb); + + skb->dev->stats.tx_packets++; + skb->dev->stats.tx_bytes += skb->len; +} +EXPORT_SYMBOL (ocelot_port_inject_frame); +int ocelot_fdb_add (struct ocelot *ocelot,int port,const unsigned char *addr,u16 vid) {
drivers/net/ethernet/mscc/ocelot_net.c +7 -74
105 lines not on this page · raw message
include/soc/mscc/ocelot.h +4 -0
@@ -832,4 +832,8 @@ int ocelot_sb_occ_tc_port_bind_get(struct ocelot *ocelot, int port,enum devlink_sb_pool_type pool_type, u32 *p_cur, u32 *p_max); +bool ocelot_can_inject (struct ocelot *ocelot,int grp); +void ocelot_port_inject_frame (struct ocelot *ocelot,int port,int grp, +u32 rew_op,struct sk_buff *skb); +#endif
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 13/16 net: mscc: ocelot: export struct ocelot_frame_info
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Because felix DSA must now be able to extract a frame in 2 stages over MMIO (first the XFH then the frame data), it needs access to this internal ocelot structure that holds the unpacked information from the Extraction Frame Header.
---
Changes in v4:
None.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot.c | 4 ++-- drivers/net/ethernet/mscc/ocelot.h | 9 --------- drivers/net/ethernet/mscc/ocelot_vsc7514.c | 4 ++-- include/soc/mscc/ocelot.h | 9 +++++++++ 4 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +2 -2
@@ -571,7 +571,7 @@ EXPORT_SYMBOL(ocelot_get_txtstamp);* bit 16: tag type 0: C-tag, 1: S-tag * bit 0-11: VID */ -static int ocelot_gen_ifh (u32 *ifh,struct frame_info *info) +static int ocelot_gen_ifh (u32 *ifh,struct ocelot_frame_info *info) { ifh[0 ] =IFH_INJ_BYPASS | ((0x1ff & info->rew_op) <<21 ); ifh[1 ] = (0xf00 & info->port) >>8 ;
@@ -597,7 +597,7 @@ EXPORT_SYMBOL(ocelot_can_inject);void ocelot_port_inject_frame (struct ocelot *ocelot,int port,int grp,u32 rew_op,struct sk_buff *skb) { -struct frame_info info = {}; +struct ocelot_frame_info info = {};u32 ifh[OCELOT_TAG_LEN /4 ];unsigned int i, count, last;
drivers/net/ethernet/mscc/ocelot.h +0 -9
@@ -32,15 +32,6 @@#define OCELOT_PTP_QUEUE_SZ 128 -struct frame_info { -u32 len; -u16 port; -u16 vid; -u8 tag_type; -u16 rew_op; -u32 timestamp;/* rew_val */ -}; -struct ocelot_port_tc {bool block_shared;unsigned long offload_cnt;
drivers/net/ethernet/mscc/ocelot_vsc7514.c +2 -2
@@ -532,7 +532,7 @@ static int ocelot_chip_init(struct ocelot *ocelot, const struct ocelot_ops *ops)return 0 ; } -static int ocelot_parse_ifh (u32 *_ifh,struct frame_info *info) +static int ocelot_parse_ifh (u32 *_ifh,struct ocelot_frame_info *info) {u8 llen, wlen;u64 ifh[2 ];
@@ -606,10 +606,10 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp)) {struct skb_shared_hwtstamps *shhwtstamps; +struct ocelot_frame_info info = {};struct ocelot_port_private *priv;struct ocelot_port *ocelot_port;u64 tod_in_ns, full_ts_in_ns; -struct frame_info info = {};struct net_device *dev;u32 ifh[4 ], val, *buf;struct timespec64 ts;
include/soc/mscc/ocelot.h +9 -0
@@ -688,6 +688,15 @@ struct ocelot_policer {u32 burst;/* bytes */ }; +struct ocelot_frame_info { +u32 len; +u16 port; +u16 vid; +u8 tag_type; +u16 rew_op; +u32 timestamp;/* rew_val */ +}; +#define ocelot_read_ix (ocelot, reg, gi, ri) __ocelot_read_ix(ocelot, reg, reg##_GSZ * (gi) + reg##_RSZ * (ri))#define ocelot_read_gix (ocelot, reg, gi) __ocelot_read_ix(ocelot, reg, reg##_GSZ * (gi))#define ocelot_read_rix (ocelot, reg, ri) __ocelot_read_ix(ocelot, reg, reg##_RSZ * (ri))
Signature · 1 line
2.25.1
Re: [PATCH v4 net-next 13/16] net: mscc: ocelot: export struct ocelot_frame_info
Quoted 8 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Because felix DSA must now be able to extract a frame in 2 stages over MMIO (first the XFH then the frame data), it needs access to this internal ocelot structure that holds the unpacked information from the Extraction Frame Header.
Signed-off-by Vladimir Oltean <[email protected]>
Signature · 1 line
Florian
Vladimir Oltean
maintainerPATCH v4 14/16 net: mscc: ocelot: refactor ocelot_xtr_irq_handler into ocelot_xtr_poll
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Since the felix DSA driver will need to poll the CPU port module for extracted frames as well, let's create some common functions that read an Extraction Frame Header, and then an skb, from a CPU extraction group.
This is so complicated, because the procedure to retrieve a struct net_device pointer based on the source port is different for DSA and switchdev. So this is the reason why the polling function is split in the middle. The ocelot_xtr_poll_xfh() permits the caller to get a struct net_device pointer based on the XFH port field, then pass this to the ocelot_xtr_poll_frame() function.
---
Changes in v4:
Add the missing EXPORT_SYMBOL bits.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/ethernet/mscc/ocelot.c | 165 +++++++++++++++++++++ drivers/net/ethernet/mscc/ocelot_vsc7514.c | 158 ++------------------ include/soc/mscc/ocelot.h | 6 + 3 files changed, 181 insertions(+), 148 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +165 -0
@@ -12,6 +12,9 @@#define TABLE_UPDATE_SLEEP_US 10#define TABLE_UPDATE_TIMEOUT_US 100000 +#define IFH_EXTRACT_BITFIELD64 (x, o, w) \ + (((x) >> (o)) & GENMASK_ULL((w) - 1, 0)) +struct ocelot_mact_entry {u8 mac[ETH_ALEN ];u16 vid;
@@ -561,6 +564,168 @@ void ocelot_get_txtstamp(struct ocelot *ocelot) }EXPORT_SYMBOL (ocelot_get_txtstamp); +static int ocelot_parse_xfh (u32 *_ifh,struct ocelot_frame_info *info) +{ +u8 llen, wlen; +u64 ifh[2 ]; + + ifh[0 ] =be64_to_cpu (((__force __be64 *)_ifh)[0 ]); + ifh[1 ] =be64_to_cpu (((__force __be64 *)_ifh)[1 ]); + + wlen =IFH_EXTRACT_BITFIELD64 (ifh[0 ],7 ,8 ); + llen =IFH_EXTRACT_BITFIELD64 (ifh[0 ],15 ,6 ); + + info->len =OCELOT_BUFFER_CELL_SZ * wlen + llen -80 ; + + info->timestamp =IFH_EXTRACT_BITFIELD64 (ifh[0 ],21 ,32 ); + + info->port =IFH_EXTRACT_BITFIELD64 (ifh[1 ],43 ,4 ); + + info->tag_type =IFH_EXTRACT_BITFIELD64 (ifh[1 ],16 ,1 ); + info->vid =IFH_EXTRACT_BITFIELD64 (ifh[1 ],0 ,12 ); + +return 0 ; +} + +static int ocelot_rx_frame_word (struct ocelot *ocelot,u8 grp,bool ifh, +u32 *rval) +{ +u32 val; +u32 bytes_valid; + + val =ocelot_read_rix (ocelot,QS_XTR_RD , grp); +if (val ==XTR_NOT_READY ) { +if (ifh) +return -EIO ; + +do { + val =ocelot_read_rix (ocelot,QS_XTR_RD , grp); + }while (val ==XTR_NOT_READY ); + } + +switch (val) { +case XTR_ABORT : +return -EIO ; +case XTR_EOF_0 : +case XTR_EOF_1 : +case XTR_EOF_2 : +case XTR_EOF_3 : +case XTR_PRUNED : + bytes_valid =XTR_VALID_BYTES (val); + val =ocelot_read_rix (ocelot,QS_XTR_RD , grp); +if (val ==XTR_ESCAPE ) + *rval =ocelot_read_rix (ocelot,QS_XTR_RD , grp); +else + *rval = val; + +return bytes_valid; +case XTR_ESCAPE : + *rval =ocelot_read_rix (ocelot,QS_XTR_RD , grp); + +return 4 ; +default : + *rval = val; + +return 4 ; + } +} + +int ocelot_xtr_poll_xfh (struct ocelot *ocelot,int grp, +struct ocelot_frame_info *info) +{ +u32 ifh[OCELOT_TAG_LEN /4 ]; +int i, err =0 ; + +for (i =0 ; i <OCELOT_TAG_LEN /4 ; i++) { + err =ocelot_rx_frame_word (ocelot, grp, true, &ifh[i]); +if (err !=4 ) +return (err <0 ) ? err : -EIO ; + } + +ocelot_parse_xfh (ifh, info); + +return 0 ; +} +EXPORT_SYMBOL (ocelot_xtr_poll_xfh); + +int ocelot_xtr_poll_frame (struct ocelot *ocelot,int grp, +struct net_device *dev, +struct ocelot_frame_info *info, +struct sk_buff **nskb) +{ +struct skb_shared_hwtstamps *shhwtstamps; +u64 tod_in_ns, full_ts_in_ns; +struct timespec64 ts; +int sz, len, buf_len; +struct sk_buff *skb; +u32 val, *buf; +int err =0 ; + + skb =netdev_alloc_skb (dev, info->len); +if (unlikely (!skb)) { +netdev_err (dev,"Unable to allocate sk_buff\n" ); + err = -ENOMEM ; + goto out; + } + + buf_len = info->len -ETH_FCS_LEN ; + buf = (u32 *)skb_put (skb, buf_len); + + len =0 ; +do { + sz =ocelot_rx_frame_word (ocelot, grp, false, &val); +if (sz <0 ) { + err = sz; + goto out; + } + *buf++ = val; + len += sz; + }while (len < buf_len); + +/* Read the FCS */ + sz =ocelot_rx_frame_word (ocelot, grp, false, &val); +if (sz <0 ) { + err = sz; + goto out; + } + +/* Update the statistics if part of the FCS was read before */ + len -=ETH_FCS_LEN - sz; + +if (unlikely (dev->features &NETIF_F_RXFCS )) { + buf = (u32 *)skb_put (skb,ETH_FCS_LEN ); + *buf = val; + } + +if (ocelot->ptp) { +ocelot_ptp_gettime64 (&ocelot->ptp_info, &ts); + + tod_in_ns =ktime_set (ts.tv_sec, ts.tv_nsec); +if ((tod_in_ns &0xffffffff ) < info->timestamp) + full_ts_in_ns = (((tod_in_ns >>32 ) -1 ) <<32 ) | + info->timestamp; +else + full_ts_in_ns = (tod_in_ns &GENMASK_ULL (63 ,32 )) | + info->timestamp; + + shhwtstamps =skb_hwtstamps (skb); +memset (shhwtstamps,0 ,sizeof (struct skb_shared_hwtstamps )); + shhwtstamps->hwtstamp = full_ts_in_ns; + } + +/* Everything we see on an interface that is in the HW bridge +* has already been forwarded. +*/ +if (ocelot->bridge_mask &BIT (info->port)) + skb->offload_fwd_mark =1 ; + + skb->protocol =eth_type_trans (skb, dev); + *nskb = skb; +out: +return err; +} +EXPORT_SYMBOL (ocelot_xtr_poll_frame); +/* Generate the IFH for frame injection * * The IFH is a 128bit-value
drivers/net/ethernet/mscc/ocelot_vsc7514.c +10 -148
191 lines not on this page · raw message
include/soc/mscc/ocelot.h +6 -0
@@ -844,5 +844,11 @@ int ocelot_sb_occ_tc_port_bind_get(struct ocelot *ocelot, int port,bool ocelot_can_inject (struct ocelot *ocelot,int grp);void ocelot_port_inject_frame (struct ocelot *ocelot,int port,int grp,u32 rew_op,struct sk_buff *skb); +int ocelot_xtr_poll_xfh (struct ocelot *ocelot,int grp, +struct ocelot_frame_info *info); +int ocelot_xtr_poll_frame (struct ocelot *ocelot,int grp, +struct net_device *dev, +struct ocelot_frame_info *info, +struct sk_buff **skb);#endif
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v4 15/16 net: dsa: felix: setup MMIO filtering rules for PTP when using tag_8021q
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Since the tag_8021q tagger is software-defined, it has no means by itself for retrieving hardware timestamps of PTP event messages.
Because we do want to support PTP on ocelot even with tag_8021q, we need to use the CPU port module for that. The RX timestamp is present in the Extraction Frame Header. And because we can't use NPI mode which redirects the CPU queues to an "external CPU" (meaning the ARM CPU running Linux), then we need to poll the CPU port module through the MMIO registers to retrieve TX and RX timestamps.
Sadly, on NXP LS1028A, the Felix switch was integrated into the SoC without wiring the extraction IRQ line to the ARM GIC. So, if we want to be notified of any PTP packets received on the CPU port module, we have a problem.
There is a possible workaround, which is to use the Ethernet CPU port as a notification channel that packets are available on the CPU port module as well. When a PTP packet is received by the DSA tagger (without timestamp, of course), we go to the CPU extraction queues, poll for it there, then we drop the original Ethernet packet and masquerade the packet retrieved over MMIO (plus the timestamp) as the original when we inject it up the stack.
Create a quirk in struct felix is selected by the Felix driver (but not by Seville, since that doesn't support PTP at all). We want to do this such that the workaround is minimally invasive for future switches that don't require this workaround.
The only traffic for which we need timestamps is PTP traffic, so add a redirection rule to the CPU port module for this. Currently we only have the need for PTP over L2, so redirection rules for UDP ports 319 and 320 are TBD for now.
Note that for the workaround of matching of PTP-over-Ethernet-port with PTP-over-MMIO queues to work properly, both channels need to be absolutely lossless. There are two parts to achieving that:
- We keep flow control enabled on the tag_8021q CPU port
- We put the DSA master interface in promiscuous mode, so it will never drop a PTP frame (for the profiles we are interested in, these are sent to the multicast MAC addresses of 01-80-c2-00-00-0e and 01-1b-19-00-00-00).
---
Changes in v4:
- Actually perform teardown.
- Squash with next one-line patch "net: dsa: felix: use promisc on master for PTP with tag_8021q".
Changes in v3:
Make as much use as possible of dsa_is_cpu_port and dsa_upstream_port as possible instead of ocelot->dsa_8021q_cpu.
Changes in v2:
Patch is new.
drivers/net/dsa/ocelot/felix.c | 127 ++++++++++++++++++++++++- drivers/net/dsa/ocelot/felix.h | 13 +++ drivers/net/dsa/ocelot/felix_vsc9959.c | 1 + net/dsa/tag_ocelot_8021q.c | 1 + 4 files changed, 138 insertions(+), 4 deletions(-)
drivers/net/dsa/ocelot/felix.c +123 -4
@@ -231,6 +231,120 @@ static const struct dsa_8021q_ops felix_tag_8021q_ops = { .vlan_del = felix_tag_8021q_vlan_del, }; +/* Set up a VCAP IS2 rule for delivering PTP frames to the CPU port module. +* If the quirk_no_xtr_irq is in place, then also copy those PTP frames to the +* tag_8021q CPU port. +*/ +static int felix_setup_mmio_filtering (struct felix *felix) +{ +unsigned long user_ports =0 , cpu_ports =0 ; +struct ocelot_vcap_filter *redirect_rule; +struct ocelot_vcap_filter *tagging_rule; +struct ocelot *ocelot = &felix->ocelot; +struct dsa_switch *ds = felix->ds; +int port, ret; + + tagging_rule =kzalloc (sizeof (struct ocelot_vcap_filter ),GFP_KERNEL ); +if (!tagging_rule) +return -ENOMEM ; + + redirect_rule =kzalloc (sizeof (struct ocelot_vcap_filter ),GFP_KERNEL ); +if (!redirect_rule) { +kfree (tagging_rule); +return -ENOMEM ; + } + +for (port =0 ; port < ocelot->num_phys_ports; port++) { +if (dsa_is_user_port (ds, port)) + user_ports |=BIT (port); +if (dsa_is_cpu_port (ds, port)) + cpu_ports |=BIT (port); + } + + tagging_rule->key_type =OCELOT_VCAP_KEY_ETYPE ; + *(u16 *)tagging_rule->key.etype.etype.value =htons (ETH_P_1588 ); + *(u16 *)tagging_rule->key.etype.etype.mask =0xffff ; + tagging_rule->ingress_port_mask = user_ports; + tagging_rule->prio =1 ; + tagging_rule->id.cookie = ocelot->num_phys_ports; + tagging_rule->id.tc_offload = false; + tagging_rule->block_id =VCAP_IS1 ; + tagging_rule->type =OCELOT_VCAP_FILTER_OFFLOAD ; + tagging_rule->lookup =0 ; + tagging_rule->action.pag_override_mask =0xff ; + tagging_rule->action.pag_val = ocelot->num_phys_ports; + + ret =ocelot_vcap_filter_add (ocelot, tagging_rule,NULL ); +if (ret) { +kfree (tagging_rule); +kfree (redirect_rule); +return ret; + } + + redirect_rule->key_type =OCELOT_VCAP_KEY_ANY ; + redirect_rule->ingress_port_mask = user_ports; + redirect_rule->pag = ocelot->num_phys_ports; + redirect_rule->prio =1 ; + redirect_rule->id.cookie = ocelot->num_phys_ports; + redirect_rule->id.tc_offload = false; + redirect_rule->block_id =VCAP_IS2 ; + redirect_rule->type =OCELOT_VCAP_FILTER_OFFLOAD ; + redirect_rule->lookup =0 ; + redirect_rule->action.cpu_copy_ena = true; +if (felix->info->quirk_no_xtr_irq) { +/* Redirect to the tag_8021q CPU but also copy PTP packets to +* the CPU port module +*/ + redirect_rule->action.mask_mode =OCELOT_MASK_MODE_REDIRECT ; + redirect_rule->action.port_mask = cpu_ports; + }else { +/* Trap PTP packets only to the CPU port module (which is +* redirected to the NPI port) +*/ + redirect_rule->action.mask_mode =OCELOT_MASK_MODE_PERMIT_DENY ; + redirect_rule->action.port_mask =0 ; + } + + ret =ocelot_vcap_filter_add (ocelot, redirect_rule,NULL ); +if (ret) { +ocelot_vcap_filter_del (ocelot, tagging_rule); +kfree (redirect_rule); +return ret; + } + +return 0 ; +} + +static int felix_teardown_mmio_filtering (struct felix *felix) +{ +struct ocelot_vcap_filter *tagging_rule, *redirect_rule; +struct ocelot_vcap_block *block_vcap_is1; +struct ocelot_vcap_block *block_vcap_is2; +struct ocelot *ocelot = &felix->ocelot; +int err; + + block_vcap_is1 = &ocelot->block[VCAP_IS1 ]; + block_vcap_is2 = &ocelot->block[VCAP_IS2 ]; + + tagging_rule =ocelot_vcap_block_find_filter_by_id (block_vcap_is1, + ocelot->num_phys_ports, + false); +if (!tagging_rule) +return -ENOENT ; + + err =ocelot_vcap_filter_del (ocelot, tagging_rule); +if (err) +return err; + + redirect_rule =ocelot_vcap_block_find_filter_by_id (block_vcap_is2, + ocelot->num_phys_ports, + false); +if (!redirect_rule) +return -ENOENT ; + +return ocelot_vcap_filter_del (ocelot, redirect_rule); +} +static enum dsa_tag_protocol felix_get_tag_protocol (struct dsa_switch *ds,int port,enum dsa_tag_protocol mp)
@@ -370,9 +484,9 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu) ANA_PORT_CPU_FWD_BPDU_CFG, port); } -/* In tag_8021q mode, the CPU port module is unused. So we -* want to disable flooding of any kind to the CPU port module, -* since packets going there will end in a black hole. +/* In tag_8021q mode, the CPU port module is unused, except for PTP +* frames. So we want to disable flooding of any kind to the CPU port +* module, since packets going there will end in a black hole. */ cpu_flood =ANA_PGID_PGID_PGID (BIT (ocelot->num_phys_ports));ocelot_rmw_rix (ocelot,0 , cpu_flood,ANA_PGID_PGID ,PGID_UC );
@@ -393,7 +507,7 @@ static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu) err =dsa_8021q_setup (felix->dsa_8021q_ctx, true);rtnl_unlock (); -return err; +return felix_setup_mmio_filtering (felix); }static void felix_teardown_tag_8021q (struct dsa_switch *ds,int cpu)
@@ -402,6 +516,11 @@ static void felix_teardown_tag_8021q(struct dsa_switch *ds, int cpu)struct felix *felix =ocelot_to_felix (ocelot);int err, port; + err =felix_teardown_mmio_filtering (felix); +if (err) +dev_err (ds->dev,"felix_teardown_mmio_filtering returned %d" , + err); +rtnl_lock (); err =dsa_8021q_setup (felix->dsa_8021q_ctx, false);rtnl_unlock ();
drivers/net/dsa/ocelot/felix.h +13 -0
@@ -23,6 +23,19 @@ struct felix_info {int switch_pci_bar;int imdio_pci_bar;const struct ptp_clock_info *ptp_caps; + +/* Some Ocelot switches are integrated into the SoC without the +* extraction IRQ line connected to the ARM GIC. By enabling this +* workaround, the few packets that are delivered to the CPU port +* module (currently only PTP) are copied not only to the hardware CPU +* port module, but also to the 802.1Q Ethernet CPU port, and polling +* the extraction registers is triggered once the DSA tagger sees a PTP +* frame. The Ethernet frame is only used as a notification: it is +* dropped, and the original frame is extracted over MMIO and annotated +* with the RX timestamp. +*/ +bool quirk_no_xtr_irq; +int (*mdio_bus_alloc)(struct ocelot *ocelot);void (*mdio_bus_free)(struct ocelot *ocelot); void (*phylink_validate)(struct ocelot *ocelot, int port,
drivers/net/dsa/ocelot/felix_vsc9959.c +1 -0
@@ -1379,6 +1379,7 @@ static const struct felix_info felix_info_vsc9959 = { .num_tx_queues = OCELOT_NUM_TC, .switch_pci_bar = 4, .imdio_pci_bar = 0, + .quirk_no_xtr_irq = true, .ptp_caps = &vsc9959_ptp_caps, .mdio_bus_alloc = vsc9959_mdio_bus_alloc, .mdio_bus_free = vsc9959_mdio_bus_free,
net/dsa/tag_ocelot_8021q.c +1 -0
@@ -60,6 +60,7 @@ static struct dsa_device_ops ocelot_netdev_ops = { .xmit = ocelot_xmit, .rcv = ocelot_rcv, .overhead = VLAN_HLEN, + .promisc_on_master = true, };MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH v4 net-next 15/16] net: dsa: felix: setup MMIO filtering rules for PTP when using tag_8021q
I love your patch! Perhaps something to improve:
Hi Vladimir,
I love your patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/Vladimir-Oltean/tag_8021q-for-Ocelot-switches/20210120-145800 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 7b8fc0103bb51d1d3e1fb5fd67958612e709f883 config: nds32-allyesconfig (attached as .config) compiler: nds32le-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/c1cb52858ce53bff4293bc96d800bbb0bd22fc74
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Vladimir-Oltean/tag_8021q-for-Ocelot-switches/20210120-145800 git checkout c1cb52858ce53bff4293bc96d800bbb0bd22fc74
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=nds32
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/net/dsa/ocelot/felix.c: In function 'felix_setup_tag_8021q':
>> drivers/net/dsa/ocelot/felix.c:464:12: warning: variable 'err' set but not used [-Wunused-but-set-variable]
464 | int port, err;
| ^~~vim +/err +464 drivers/net/dsa/ocelot/felix.c
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 458
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 459 static int felix_setup_tag_8021q(struct dsa_switch *ds, int cpu)
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 460 {
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 461 struct ocelot *ocelot = ds->priv;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 462 struct felix *felix = ocelot_to_felix(ocelot);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 463 unsigned long cpu_flood;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 @464 int port, err;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 465
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 466 felix_8021q_cpu_port_init(ocelot, cpu);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 467
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 468 for (port = 0; port < ds->num_ports; port++) {
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 469 if (dsa_is_unused_port(ds, port))
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 470 continue;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 471
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 472 /* This overwrites ocelot_init():
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 473 * Do not forward BPDU frames to the CPU port module,
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 474 * for 2 reasons:
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 475 * - When these packets are injected from the tag_8021q
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 476 * CPU port, we want them to go out, not loop back
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 477 * into the system.
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 478 * - STP traffic ingressing on a user port should go to
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 479 * the tag_8021q CPU port, not to the hardware CPU
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 480 * port module.
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 481 */
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 482 ocelot_write_gix(ocelot,
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 483 ANA_PORT_CPU_FWD_BPDU_CFG_BPDU_REDIR_ENA(0),
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 484 ANA_PORT_CPU_FWD_BPDU_CFG, port);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 485 }
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 486
c1cb52858ce53bf Vladimir Oltean 2021-01-20 487 /* In tag_8021q mode, the CPU port module is unused, except for PTP
c1cb52858ce53bf Vladimir Oltean 2021-01-20 488 * frames. So we want to disable flooding of any kind to the CPU port
c1cb52858ce53bf Vladimir Oltean 2021-01-20 489 * module, since packets going there will end in a black hole.
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 490 */
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 491 cpu_flood = ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports));
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 492 ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_UC);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 493 ocelot_rmw_rix(ocelot, 0, cpu_flood, ANA_PGID_PGID, PGID_MC);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 494
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 495 ocelot_apply_bridge_fwd_mask(ocelot);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 496
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 497 felix->dsa_8021q_ctx = kzalloc(sizeof(*felix->dsa_8021q_ctx),
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 498 GFP_KERNEL);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 499 if (!felix->dsa_8021q_ctx)
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 500 return -ENOMEM;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 501
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 502 felix->dsa_8021q_ctx->ops = &felix_tag_8021q_ops;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 503 felix->dsa_8021q_ctx->proto = htons(ETH_P_8021AD);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 504 felix->dsa_8021q_ctx->ds = ds;
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 505
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 506 rtnl_lock();
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 507 err = dsa_8021q_setup(felix->dsa_8021q_ctx, true);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 508 rtnl_unlock();
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 509
c1cb52858ce53bf Vladimir Oltean 2021-01-20 510 return felix_setup_mmio_filtering(felix);
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 511 }
7bc3a3dc54b2bb6 Vladimir Oltean 2021-01-20 512 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Jakub Kicinski
maintainerRe: [PATCH v4 net-next 15/16] net: dsa: felix: setup MMIO filtering rules for PTP when using tag_8021q
In reply to Vladimir OlteanQuoted 44 lines · On Wed, 20 Jan 2021 01:07:48 +0200 Vladimir Oltean wrote:
From: Vladimir Oltean <[email protected]>
Since the
tag_8021qtagger is software-defined, it has no means by itself for retrieving hardware timestamps of PTP event messages.Because we do want to support PTP on ocelot even with
tag_8021q, we need to use the CPU port module for that. The RX timestamp is present in the Extraction Frame Header. And because we can't use NPI mode which redirects the CPU queues to an "external CPU" (meaning the ARM CPU running Linux), then we need to poll the CPU port module through the MMIO registers to retrieve TX and RX timestamps.Sadly, on NXP LS1028A, the Felix switch was integrated into the SoC without wiring the extraction IRQ line to the ARM GIC. So, if we want to be notified of any PTP packets received on the CPU port module, we have a problem.
There is a possible workaround, which is to use the Ethernet CPU port as a notification channel that packets are available on the CPU port module as well. When a PTP packet is received by the DSA tagger (without timestamp, of course), we go to the CPU extraction queues, poll for it there, then we drop the original Ethernet packet and masquerade the packet retrieved over MMIO (plus the timestamp) as the original when we inject it up the stack.
Create a quirk in struct felix is selected by the Felix driver (but not by Seville, since that doesn't support PTP at all). We want to do this such that the workaround is minimally invasive for future switches that don't require this workaround.
The only traffic for which we need timestamps is PTP traffic, so add a redirection rule to the CPU port module for this. Currently we only have the need for PTP over L2, so redirection rules for UDP ports 319 and 320 are TBD for now.
Note that for the workaround of matching of PTP-over-Ethernet-port with PTP-over-MMIO queues to work properly, both channels need to be absolutely lossless. There are two parts to achieving that:
- We keep flow control enabled on thetag_8021qCPU port
- We put the DSA master interface in promiscuous mode, so it will never drop a PTP frame (for the profiles we are interested in, these are sent to the multicast MAC addresses of 01-80-c2-00-00-0e and 01-1b-19-00-00-00).
Quoted 1 line
Signed-off-by Vladimir Oltean <[email protected]>
drivers/net/dsa/ocelot/felix.c:464:12: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
464 | int port, err;
| ^~~drivers/net/dsa/ocelot/felix.c:265:53: warning: incorrect type in assignment (different base types)drivers/net/dsa/ocelot/felix.c:265:53: expected unsigned short [usertype]drivers/net/dsa/ocelot/felix.c:265:53: got restricted __be16 [usertype]
Please build test the patches locally, the patchwork testing thing is not keeping up with the volume, and it's running on the largest VM available thru the provider already :/
I need to add this "don't post your patches to get them build tested or you'll make Kuba very angry" to the netdev FAQ.
Vladimir Oltean
maintainerRe: [PATCH v4 net-next 15/16] net: dsa: felix: setup MMIO filtering rules for PTP when using tag_8021q
Quoted 11 lines · Jakub Kicinski
drivers/net/dsa/ocelot/felix.c:464:12: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
464 | int port, err;
| ^~~drivers/net/dsa/ocelot/felix.c:265:53: warning: incorrect type in assignment (different base types)drivers/net/dsa/ocelot/felix.c:265:53: expected unsigned short [usertype]drivers/net/dsa/ocelot/felix.c:265:53: got restricted__be16[usertype]Please build test the patches locally, the patchwork testing thing is not keeping up with the volume, and it's running on the largest VM available thru the provider already :/
I updated my compiler now, so that W=1 C=1 builds would not fail. That should hopefully prevent this from happening in the future.
Quoted 2 lines
I need to add this "don't post your patches to get them build tested or you'll make Kuba very angry" to the netdev FAQ.
Since I definitely don't want to upset Kuba, how bad is it to exceed the 15 patches per series limit? Do I need to do something about it?
Jakub Kicinski
maintainerRe: [PATCH v4 net-next 15/16] net: dsa: felix: setup MMIO filtering rules for PTP when using tag_8021q
Quoted 9 lines · On Wed, 20 Jan 2021 19:32:41 +0200 Vladimir Oltean wrote:
Quoted 8 lines · Jakub Kicinski
drivers/net/dsa/ocelot/felix.c:464:12: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
464 | int port, err;
| ^~~drivers/net/dsa/ocelot/felix.c:265:53: warning: incorrect type in assignment (different base types)drivers/net/dsa/ocelot/felix.c:265:53: expected unsigned short [usertype]drivers/net/dsa/ocelot/felix.c:265:53: got restricted__be16[usertype]
Quoted 6 lines
Quoted 3 lines
Please build test the patches locally, the patchwork testing thing is not keeping up with the volume, and it's running on the largest VM available thru the provider already :/
I updated my compiler now, so that W=1 C=1 builds would not fail. That should hopefully prevent this from happening in the future.
Thanks.
Quoted 4 lines
Quoted 2 lines
I need to add this "don't post your patches to get them build tested or you'll make Kuba very angry" to the netdev FAQ.
Since I definitely don't want to upset Kuba,
:)
Quoted 2 lines
how bad is it to exceed the 15 patches per series limit? Do I need to do something about it?
It's not a hard rule IIUC, if you have 16, 17 patches as an atomic series which is hard to split, I'd think that's acceptable from time to time. Especially if the patches themselves are not huge. If you're already splitting a larger effort, keeping it < 15 is best. In general if you can split a smaller logically contained series out that's always preferred. The point is if the series is too large reviewers are likely to postpone reviewing it until they can allocate sufficiently large continuous block of time, which may be never. It's all about efficient code review.
At least that's my recollection / understanding. There may be more reasons, we'd have to ask Dave.
Vladimir Oltean
maintainerRe: [PATCH v4 net-next 15/16] net: dsa: felix: setup MMIO filtering rules for PTP when using tag_8021q
Quoted 13 lines · Jakub Kicinski
Quoted 2 lines
how bad is it to exceed the 15 patches per series limit? Do I need to do something about it?
It's not a hard rule IIUC, if you have 16, 17 patches as an atomic series which is hard to split, I'd think that's acceptable from time to time. Especially if the patches themselves are not huge. If you're already splitting a larger effort, keeping it < 15 is best. In general if you can split a smaller logically contained series out that's always preferred. The point is if the series is too large reviewers are likely to postpone reviewing it until they can allocate sufficiently large continuous block of time, which may be never. It's all about efficient code review.
Quoted 2 lines
At least that's my recollection / understanding. There may be more reasons, we'd have to ask Dave.
To be fair this series is abusively large even for me to read, and _is_ easy to split. In v1 I had posted just the first half, but then figured that reviewers might want to have the full picture of where I'm trying to get at. But now that the picture has been given, I'm going back to the split format. Thanks.
Vladimir Oltean
maintainerPATCH v4 16/16 net: dsa: tag_ocelot_8021q: add support for PTP timestamping
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
On TX, use the result of the ptp_classify_raw() BPF classifier from dsa_skb_tx_timestamp() to divert some frames over to the MMIO-based injection registers.
On RX, set up a VCAP IS2 rule that redirects the frames with an EtherType for 1588 to the CPU port module (for MMIO based extraction) and, if the "no XTR IRQ" workaround is in place, copies them to the dsa_8021q CPU port as well (for notification).
There is a conflict between the VCAP IS2 trapping rule and the semantics of the BPF classifier. Namely, ptp_classify_raw() deems general messages as non-timestampable, but still, those are trapped to the CPU port module since they have an EtherType of ETH_P_1588. So, if the "no XTR IRQ" workaround is in place, we need to run another BPF classifier on the frames extracted over MMIO, to avoid duplicates being sent to the stack (once over Ethernet, once over MMIO). It doesn't look like it's possible to install VCAP IS2 rules based on keys extracted from the 1588 frame headers.
---
Changes in v4:
Now draining the CPU queues by continuously reading QS_XTR_READ, same as Ocelot, instead of one-time asserting QS_XTR_FLUSH, which actually needed a sleep to be effective.
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/dsa/ocelot/felix.c | 81 ++++++++++++++++++++++ drivers/net/ethernet/mscc/ocelot.c | 7 ++ drivers/net/ethernet/mscc/ocelot_vsc7514.c | 3 +- include/soc/mscc/ocelot.h | 1 + net/dsa/tag_ocelot_8021q.c | 24 +++++++ 5 files changed, 114 insertions(+), 2 deletions(-)
drivers/net/dsa/ocelot/felix.c +81 -0
@@ -16,6 +16,7 @@#include <linux/dsa/8021q.h> #include <linux/platform_device.h> #include <linux/packing.h> +#include <linux/ptp_classify.h> #include <linux/module.h> #include <linux/of_net.h> #include <linux/pci.h>
@@ -312,6 +313,15 @@ static int felix_setup_mmio_filtering(struct felix *felix)return ret; } +/* The ownership of the CPU port module's queues might have just been +* transferred to the tag_8021q tagger from the NPI-based tagger. +* So there might still be all sorts of crap in the queues. On the +* other hand, the MMIO-based matching of PTP frames is very brittle, +* so we need to be careful that there are no extra frames to be +* dequeued over MMIO, since we would never know to discard them. +*/ +ocelot_drain_cpu_queue (ocelot,0 ); +return 0 ; }
@@ -1159,6 +1169,67 @@ static int felix_hwtstamp_set(struct dsa_switch *ds, int port,return ocelot_hwstamp_set (ocelot, port, ifr); } +static bool felix_check_xtr_pkt (struct ocelot *ocelot,unsigned int ptp_type) +{ +struct felix *felix =ocelot_to_felix (ocelot); +int err, grp =0 ; + +if (felix->tag_proto ==DSA_TAG_PROTO_OCELOT ) +return false; + +if (!felix->info->quirk_no_xtr_irq) +return false; + +if (ptp_type ==PTP_CLASS_NONE ) +return false; + +while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp)) { +struct ocelot_frame_info info = {}; +struct dsa_port *dp; +struct sk_buff *skb; +unsigned int type; + + err =ocelot_xtr_poll_xfh (ocelot, grp, &info); +if (err) +break ; + +if (WARN_ON (info.port >= ocelot->num_phys_ports)) + goto out; + + dp =dsa_to_port (felix->ds, info.port); + + err =ocelot_xtr_poll_frame (ocelot, grp, dp->slave, + &info, &skb); +if (err) +break ; + +/* We trap to the CPU port module all PTP frames, but +* felix_rxtstamp() only gets called for event frames. +* So we need to avoid sending duplicate general +* message frames by running a second BPF classifier +* here and dropping those. +*/ +__skb_push (skb,ETH_HLEN ); + + type =ptp_classify_raw (skb); + +__skb_pull (skb,ETH_HLEN ); + +if (type ==PTP_CLASS_NONE ) { +kfree_skb (skb); +continue ; + } + +netif_rx (skb); + } + +out: +if (err <0 ) +ocelot_drain_cpu_queue (ocelot,0 ); + +return true; +} +static bool felix_rxtstamp (struct dsa_switch *ds,int port,struct sk_buff *skb,unsigned int type) {
@@ -1169,6 +1240,16 @@ static bool felix_rxtstamp(struct dsa_switch *ds, int port,struct timespec64 ts;u64 tstamp, val; +/* If the "no XTR IRQ" workaround is in use, tell DSA to defer this skb +* for RX timestamping. Then free it, and poll for its copy through +* MMIO in the CPU port module, and inject that into the stack from +* ocelot_xtr_poll(). +*/ +if (felix_check_xtr_pkt (ocelot, type)) { +kfree_skb (skb); +return true; + } +ocelot_ptp_gettime64 (&ocelot->ptp_info, &ts); tstamp =ktime_set (ts.tv_sec, ts.tv_nsec);
drivers/net/ethernet/mscc/ocelot.c +7 -0
@@ -806,6 +806,13 @@ void ocelot_port_inject_frame(struct ocelot *ocelot, int port, int grp, }EXPORT_SYMBOL (ocelot_port_inject_frame); +void ocelot_drain_cpu_queue (struct ocelot *ocelot,int grp) +{ +while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp)) +ocelot_read_rix (ocelot,QS_XTR_RD , grp); +} +EXPORT_SYMBOL (ocelot_drain_cpu_queue); +int ocelot_fdb_add (struct ocelot *ocelot,int port,const unsigned char *addr,u16 vid) {
drivers/net/ethernet/mscc/ocelot_vsc7514.c +1 -2
@@ -566,8 +566,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) out:if (err <0 ) -while (ocelot_read (ocelot,QS_XTR_DATA_PRESENT ) &BIT (grp)) -ocelot_read_rix (ocelot,QS_XTR_RD , grp); +ocelot_drain_cpu_queue (ocelot,0 );return IRQ_HANDLED ; }
include/soc/mscc/ocelot.h +1 -0
@@ -850,5 +850,6 @@ int ocelot_xtr_poll_frame(struct ocelot *ocelot, int grp,struct net_device *dev, struct ocelot_frame_info *info, struct sk_buff **skb); +void ocelot_drain_cpu_queue (struct ocelot *ocelot,int grp);#endif
net/dsa/tag_ocelot_8021q.c +24 -0
@@ -9,6 +9,8 @@* that on egress */ #include <linux/dsa/8021q.h> +#include <soc/mscc/ocelot.h> +#include <soc/mscc/ocelot_ptp.h> #include "dsa_priv.h" static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
@@ -18,6 +20,28 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb,u16 tx_vid =dsa_8021q_tx_vid (dp->ds, dp->index);u16 queue_mapping =skb_get_queue_mapping (skb);u8 pcp =netdev_txq_to_tc (netdev, queue_mapping); +struct sk_buff *clone =DSA_SKB_CB (skb)->clone; + +/* TX timestamping was requested, so inject through MMIO */ +if (clone) { +struct ocelot *ocelot = dp->ds->priv; +struct ocelot_port *ocelot_port; +int port = dp->index; +u32 rew_op; + + ocelot_port = ocelot->ports[port]; + rew_op = ocelot_port->ptp_cmd; + +/* Retrieve timestamp ID populated inside skb->cb[0] of the +* clone by ocelot_port_add_txtstamp_skb +*/ +if (ocelot_port->ptp_cmd ==IFH_REW_OP_TWO_STEP_PTP ) + rew_op |= clone->cb[0 ] <<3 ; + +ocelot_port_inject_frame (ocelot, dp->index,0 , rew_op, skb); + +return NULL ; + }return dsa_8021q_xmit (skb, netdev,ETH_P_8021Q , ((pcp <<VLAN_PRIO_SHIFT ) | tx_vid));
Signature · 1 line
2.25.1