1. 27 Sep, 2020 24 commits
  2. 26 Sep, 2020 16 commits
    • Jakub Kicinski's avatar
      netdevsim: fix duplicated debugfs directory · 090bc03b
      Jakub Kicinski authored
      The "ethtool" debugfs directory holds per-netdev knobs, so move
      it from the device instance directory to the port directory.
      
      This fixes the following warning when creating multiple ports:
      
       debugfs: Directory 'ethtool' with parent 'netdevsim1' already present!
      
      Fixes: ff1f7c17 ("netdevsim: add pause frame stats")
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      090bc03b
    • David S. Miller's avatar
      Merge branch 'Generic-adjustment-for-flow-dissector-in-DSA' · dfa66921
      David S. Miller authored
      Vladimir Oltean says:
      
      ====================
      Generic adjustment for flow dissector in DSA
      
      This is the v2 of a series initially submitted in May:
      https://www.spinics.net/lists/netdev/msg651866.html
      
      The end goal is to get rid of the unintuitive code for the flow
      dissector that currently exists in the taggers. It can all be replaced
      by a single, common function.
      
      Some background work needs to be done for that. Especially the ocelot
      driver poses some problems, since it has a different tag length between
      RX and TX, and I didn't want to make DSA aware of that, since I could
      instead make the tag lengths equal.
      
      Changes in v3:
      - Added an optimization (08/15) that makes the generic case not need to
        call the .flow_dissect function pointer. Basically .flow_dissect now
        currently only exists for sja1105.
      - Moved the .promisc_on_master property to the tagger structure.
      - Added the .tail_tag property to the tagger structure.
      - Disabled "suppresscc = all" from my .gitconfig.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dfa66921
    • Vladimir Oltean's avatar
      net: dsa: tag_rtl4_a: use the generic flow dissector procedure · 300fd579
      Vladimir Oltean authored
      Remove the .flow_dissect procedure, so the flow dissector will call the
      generic variant which works for this tagging protocol.
      
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: DENG Qingfang <dqfext@gmail.com>
      Cc: Mauri Sandberg <sandberg@mailfence.com>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      300fd579
    • Vladimir Oltean's avatar
      net: dsa: tag_sja1105: use a custom flow dissector procedure · e6652979
      Vladimir Oltean authored
      The sja1105 is a bit of a special snowflake, in that not all frames are
      transmitted/received in the same way. L2 link-local frames are received
      with the source port/switch ID information put in the destination MAC
      address. For the rest, a tag_8021q header is used. So only the latter
      frames displace the rest of the headers and need to use the generic flow
      dissector procedure.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e6652979
    • Vladimir Oltean's avatar
      net: dsa: tag_qca: use the generic flow dissector procedure · 6b04f171
      Vladimir Oltean authored
      Remove the .flow_dissect procedure, so the flow dissector will call the
      generic variant which works for this tagging protocol.
      
      Cc: John Crispin <john@phrozen.org>
      Cc: Alexander Lobakin <alobakin@pm.me>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6b04f171
    • Vladimir Oltean's avatar
      net: dsa: tag_mtk: use the generic flow dissector procedure · b1af3656
      Vladimir Oltean authored
      Remove the .flow_dissect procedure, so the flow dissector will call the
      generic variant which works for this tagging protocol.
      
      Cc: DENG Qingfang <dqfext@gmail.com>
      Cc: Sean Wang <sean.wang@mediatek.com>
      Cc: John Crispin <john@phrozen.org>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1af3656
    • Vladimir Oltean's avatar
      net: dsa: tag_edsa: use the generic flow dissector procedure · 742b2e19
      Vladimir Oltean authored
      Remove the .flow_dissect procedure, so the flow dissector will call the
      generic variant which works for this tagging protocol.
      
      Cc: Andrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      742b2e19
    • Vladimir Oltean's avatar
      net: dsa: tag_dsa: use the generic flow dissector procedure · 11f50111
      Vladimir Oltean authored
      Remove the .flow_dissect procedure, so the flow dissector will call the
      generic variant which works for this tagging protocol.
      
      Cc: Andrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      11f50111
    • Vladimir Oltean's avatar
      net: dsa: tag_brcm: use generic flow dissector procedure · f569ad52
      Vladimir Oltean authored
      There are 2 Broadcom tags in use, one places the DSA tag before the
      Ethernet destination MAC address, and the other before the EtherType.
      Nonetheless, both displace the rest of the headers, so this tagger can
      use the generic flow dissector procedure which accounts for that.
      
      The ASCII art drawing is a good reference though, so keep it but move it
      somewhere else.
      
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f569ad52
    • Vladimir Oltean's avatar
      net: flow_dissector: avoid indirect call to DSA .flow_dissect for generic case · 54fec335
      Vladimir Oltean authored
      With the recent mitigations against speculative execution exploits,
      indirect function calls are more expensive and it would be good to avoid
      them where possible.
      
      In the case of DSA, most switch taggers will shift the EtherType and
      next headers by a fixed amount equal to that tag's length in bytes.
      So we can use a generic procedure to determine that, without calling
      into custom tagger code. However we still leave the flow_dissect method
      inside struct dsa_device_ops as an override for the generic function.
      Suggested-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      54fec335
    • Vladimir Oltean's avatar
      net: dsa: point out the tail taggers · 7a6ffe76
      Vladimir Oltean authored
      The Marvell 88E6060 uses tag_trailer.c and the KSZ8795, KSZ9477 and
      KSZ9893 switches also use tail tags.
      
      Tell that to the DSA core, since this makes a difference for the flow
      dissector. Most switches break the parsing of frame headers, but these
      ones don't, so no flow dissector adjustment needs to be done for them.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7a6ffe76
    • Vladimir Oltean's avatar
      net: dsa: add a generic procedure for the flow dissector · 9790cf20
      Vladimir Oltean authored
      For all DSA formats that don't use tail tags, it looks like behind the
      obscure number crunching they're all doing the same thing: locating the
      real EtherType behind the DSA tag. Nonetheless, this is not immediately
      obvious, so create a generic helper for those DSA taggers that put the
      header before the EtherType.
      
      Another assumption for the generic function is that the DSA tags are of
      equal length on RX and on TX. Prior to the previous patch, this was not
      true for ocelot and for gswip. The problem was resolved for ocelot, but
      for gswip it still remains, so that can't use this helper yet.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9790cf20
    • Vladimir Oltean's avatar
      net: dsa: make the .flow_dissect tagger callback return void · 2e8cb1b3
      Vladimir Oltean authored
      There is no tagger that returns anything other than zero, so just change
      the return type appropriately.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2e8cb1b3
    • Vladimir Oltean's avatar
      net: dsa: tag_ocelot: use a short prefix on both ingress and egress · 5124197c
      Vladimir Oltean authored
      There are 2 goals that we follow:
      
      - Reduce the header size
      - Make the header size equal between RX and TX
      
      The issue that required long prefix on RX was the fact that the ocelot
      DSA tag, being put before Ethernet as it is, would overlap with the area
      that a DSA master uses for RX filtering (destination MAC address
      mainly).
      
      Now that we can ask DSA to put the master in promiscuous mode, in theory
      we could remove the prefix altogether and call it a day, but it looks
      like we can't. Using no prefix on ingress, some packets (such as ICMP)
      would be received, while others (such as PTP) would not be received.
      This is because the DSA master we use (enetc) triggers parse errors
      ("MAC rx frame errors") presumably because it sees Ethernet frames with
      a bad length. And indeed, when using no prefix, the EtherType (bytes
      12-13 of the frame, bits 96-111) falls over the REW_VAL field from the
      extraction header, aka the PTP timestamp.
      
      When turning the short (32-bit) prefix on, the EtherType overlaps with
      bits 64-79 of the extraction header, which are a reserved area
      transmitted as zero by the switch. The packets are not dropped by the
      DSA master with a short prefix. Actually, the frames look like this in
      tcpdump (below is a PTP frame, with an extra dsa_8021q tag - dadb 0482 -
      added by a downstream sja1105).
      
      89:0c:a9:f2:01:00 > 88:80:00:0a:00:1d, 802.3, length 0: LLC, \
      	dsap Unknown (0x10) Individual, ssap ProWay NM (0x0e) Response, \
      	ctrl 0x0004: Information, send seq 2, rcv seq 0, \
      	Flags [Response], length 78
      
      0x0000:  8880 000a 001d 890c a9f2 0100 0000 100f  ................
      0x0010:  0400 0000 0180 c200 000e 001f 7b63 0248  ............{c.H
      0x0020:  dadb 0482 88f7 1202 0036 0000 0000 0000  .........6......
      0x0030:  0000 0000 0000 0000 0000 001f 7bff fe63  ............{..c
      0x0040:  0248 0001 1f81 0500 0000 0000 0000 0000  .H..............
      0x0050:  0000 0000 0000 0000 0000 0000            ............
      
      So the short prefix is our new default: we've shortened our RX frames by
      12 octets, increased TX by 4, and headers are now equal between RX and
      TX. Note that we still need promiscuous mode for the DSA master to not
      drop it.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5124197c
    • Vladimir Oltean's avatar
      net: dsa: tag_sja1105: request promiscuous mode for master · 707091eb
      Vladimir Oltean authored
      Currently PTP is broken when ports are in standalone mode (the tagger
      keeps printing this message):
      
      sja1105 spi0.1: Expected meta frame, is 01-80-c2-00-00-0e in the DSA master multicast filter?
      
      Sure, one might say "simply add 01-80-c2-00-00-0e to the master's RX
      filter" but things become more complicated because:
      
      - Actually all frames in the 01-80-c2-xx-xx-xx and 01-1b-19-xx-xx-xx
        range are trapped to the CPU automatically
      - The switch mangles bytes 3 and 4 of the MAC address via the incl_srcpt
        ("include source port [in the DMAC]") option, which is how source port
        and switch id identification is done for link-local traffic on RX. But
        this means that an address installed to the RX filter would, at the
        end of the day, not correspond to the final address seen by the DSA
        master.
      
      Assume RX filtering lists on DSA masters are typically too small to
      include all necessary addresses for PTP to work properly on sja1105, and
      just request promiscuous mode unconditionally.
      
      Just an example:
      Assuming the following addresses are trapped to the CPU:
      01-80-c2-00-00-00 to 01-80-c2-00-00-ff
      01-1b-19-00-00-00 to 01-1b-19-00-00-ff
      
      These are 512 addresses.
      Now let's say this is a board with 3 switches, and 4 ports per switch.
      The 512 addresses become 6144 addresses that must be managed by the DSA
      master's RX filtering lists.
      
      This may be refined in the future, but for now, it is simply not worth
      it to add the additional addresses to the master's RX filter, so simply
      request it to become promiscuous as soon as the driver probes.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      707091eb
    • Vladimir Oltean's avatar
      net: dsa: allow drivers to request promiscuous mode on master · c3975400
      Vladimir Oltean authored
      Currently DSA assumes that taggers don't mess with the destination MAC
      address of the frames on RX. That is not always the case. Some DSA
      headers are placed before the Ethernet header (ocelot), and others
      simply mangle random bytes from the destination MAC address (sja1105
      with its incl_srcpt option).
      
      Currently the DSA master goes to promiscuous mode automatically when the
      slave devices go too (such as when enslaved to a bridge), but in
      standalone mode this is a problem that needs to be dealt with.
      
      So give drivers the possibility to signal that their tagging protocol
      will get randomly dropped otherwise, and let DSA deal with fixing that.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c3975400