[PATCH stable-5.15.y 0/2] Fix PTP received on wrong port with bridged SJA1105 DSA

Vladimir Oltean posted 2 patches 1 year, 8 months ago
There is a newer version of this series
drivers/net/dsa/sja1105/sja1105_main.c |  9 ++-----
net/dsa/tag_sja1105.c                  | 34 ++++++++++++++++++++------
2 files changed, 28 insertions(+), 15 deletions(-)
[PATCH stable-5.15.y 0/2] Fix PTP received on wrong port with bridged SJA1105 DSA
Posted by Vladimir Oltean 1 year, 8 months ago
It has been brought to my attention that what had been fixed 1 year ago
here for kernels 5.18 and later:
https://lore.kernel.org/netdev/20230626155112.3155993-1-vladimir.oltean@nxp.com/

is still broken on linux-5.15.y. Short summary: PTP boundary clock is
broken for ports under a VLAN-aware bridge.

The reason is that the Fixes: tags in those patches were wrong. The
issue originated from earlier, but the changes from 5.18 (blamed there),
aka DSA FDB isolation, masked that.

A straightforward cherry-pick was not possible, due to the conflict with
the aforementioned DSA FDB isolation work from 5.18. So I redid patch
2/2 and marked what I had to adapt.

Tested on the NXP LS1021A-TSN board.

Vladimir Oltean (2):
  net: dsa: sja1105: always enable the INCL_SRCPT option
  net: dsa: tag_sja1105: always prefer source port information from
    INCL_SRCPT

 drivers/net/dsa/sja1105/sja1105_main.c |  9 ++-----
 net/dsa/tag_sja1105.c                  | 34 ++++++++++++++++++++------
 2 files changed, 28 insertions(+), 15 deletions(-)
---

I'm sorry for the people who will want to backport DSA FDB isolation to
linux-5.15.y :(

-- 
2.34.1
Re: [PATCH stable-5.15.y 0/2] Fix PTP received on wrong port with bridged SJA1105 DSA
Posted by Greg Kroah-Hartman 1 year, 8 months ago
On Fri, May 31, 2024 at 07:50:14PM +0300, Vladimir Oltean wrote:
> It has been brought to my attention that what had been fixed 1 year ago
> here for kernels 5.18 and later:
> https://lore.kernel.org/netdev/20230626155112.3155993-1-vladimir.oltean@nxp.com/
> 
> is still broken on linux-5.15.y. Short summary: PTP boundary clock is
> broken for ports under a VLAN-aware bridge.
> 
> The reason is that the Fixes: tags in those patches were wrong. The
> issue originated from earlier, but the changes from 5.18 (blamed there),
> aka DSA FDB isolation, masked that.
> 
> A straightforward cherry-pick was not possible, due to the conflict with
> the aforementioned DSA FDB isolation work from 5.18. So I redid patch
> 2/2 and marked what I had to adapt.
> 
> Tested on the NXP LS1021A-TSN board.
> 
> Vladimir Oltean (2):
>   net: dsa: sja1105: always enable the INCL_SRCPT option
>   net: dsa: tag_sja1105: always prefer source port information from
>     INCL_SRCPT
> 
>  drivers/net/dsa/sja1105/sja1105_main.c |  9 ++-----
>  net/dsa/tag_sja1105.c                  | 34 ++++++++++++++++++++------
>  2 files changed, 28 insertions(+), 15 deletions(-)
> ---
> 
> I'm sorry for the people who will want to backport DSA FDB isolation to
> linux-5.15.y :(

Now queued up, thanks.

greg k-h