1. 20 Nov, 2019 25 commits
    • David S. Miller's avatar
      Merge branch 'page_pool-API-for-numa-node-change-handling' · 77c05d2f
      David S. Miller authored
      Saeed Mahameed says:
      
      ====================
      page_pool: API for numa node change handling
      
      This series extends page pool API to allow page pool consumers to update
      page pool numa node on the fly. This is required since on some systems,
      rx rings irqs can migrate between numa nodes, due to irq balancer or user
      defined scripts, current page pool has no way to know of such migration
      and will keep allocating and holding on to pages from a wrong numa node,
      which is bad for the consumer performance.
      
      1) Add API to update numa node id of the page pool
      Consumers will call this API to update the page pool numa node id.
      
      2) Don't recycle non-reusable pages:
      Page pool will check upon page return whether a page is suitable for
      recycling or not.
       2.1) when it belongs to a different num node.
       2.2) when it was allocated under memory pressure.
      
      3) mlx5 will use the new API to update page pool numa id on demand.
      
      The series is a joint work between me and Jonathan, we tested it and it
      proved itself worthy to avoid page allocator bottlenecks and improve
      packet rate and cpu utilization significantly for the described
      scenarios above.
      
      Performance testing:
      XDP drop/tx rate and TCP single/multi stream, on mlx5 driver
      while migrating rx ring irq from close to far numa:
      
      mlx5 internal page cache was locally disabled to get pure page pool
      results.
      
      CPU: Intel(R) Xeon(R) CPU E5-2603 v4 @ 1.70GHz
      NIC: Mellanox Technologies MT27700 Family [ConnectX-4] (100G)
      
      XDP Drop/TX single core:
      NUMA  | XDP  | Before    | After
      ---------------------------------------
      Close | Drop | 11   Mpps | 10.9 Mpps
      Far   | Drop | 4.4  Mpps | 5.8  Mpps
      
      Close | TX   | 6.5 Mpps  | 6.5 Mpps
      Far   | TX   | 3.5 Mpps  | 4   Mpps
      
      Improvement is about 30% drop packet rate, 15% tx packet rate for numa
      far test.
      No degradation for numa close tests.
      
      TCP single/multi cpu/stream:
      NUMA  | #cpu | Before  | After
      --------------------------------------
      Close | 1    | 18 Gbps | 18 Gbps
      Far   | 1    | 15 Gbps | 18 Gbps
      Close | 12   | 80 Gbps | 80 Gbps
      Far   | 12   | 68 Gbps | 80 Gbps
      
      In all test cases we see improvement for the far numa case, and no
      impact on the close numa case.
      
      ==================
      
      Performance analysis and conclusions by Jesper [1]:
      Impact on XDP drop x86_64 is inconclusive and shows only 0.3459ns
      slow-down, as this is below measurement accuracy of system.
      
      v2->v3:
       - Rebase on top of latest net-next and Jesper's page pool object
         release patchset [2]
       - No code changes
       - Performance analysis by Jesper added to the cover letter.
      
      v1->v2:
        - Drop last patch, as requested by Ilias and Jesper.
        - Fix documentation's performance numbers order.
      
      [1] https://github.com/xdp-project/xdp-project/blob/master/areas/mem/page_pool04_inflight_changes.org#performance-notes
      [2] https://patchwork.ozlabs.org/cover/1192098/
      ====================
      Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      77c05d2f
    • Saeed Mahameed's avatar
      net/mlx5e: Rx, Update page pool numa node when changed · 6849c6d8
      Saeed Mahameed authored
      Once every napi poll cycle, check if numa node is different than
      the page pool's numa id, and update it using page_pool_update_nid().
      
      Alternatively, we could have registered an irq affinity change handler,
      but page_pool_update_nid() must be called from napi context anyways, so
      the handler won't actually help.
      
      Performance testing:
      XDP drop/tx rate and TCP single/multi stream, on mlx5 driver
      while migrating rx ring irq from close to far numa:
      
      mlx5 internal page cache was locally disabled to get pure page pool
      results.
      
      CPU: Intel(R) Xeon(R) CPU E5-2603 v4 @ 1.70GHz
      NIC: Mellanox Technologies MT27700 Family [ConnectX-4] (100G)
      
      XDP Drop/TX single core:
      NUMA  | XDP  | Before    | After
      ---------------------------------------
      Close | Drop | 11   Mpps | 10.9 Mpps
      Far   | Drop | 4.4  Mpps | 5.8  Mpps
      
      Close | TX   | 6.5 Mpps  | 6.5 Mpps
      Far   | TX   | 3.5 Mpps  | 4  Mpps
      
      Improvement is about 30% drop packet rate, 15% tx packet rate for numa
      far test.
      No degradation for numa close tests.
      
      TCP single/multi cpu/stream:
      NUMA  | #cpu | Before  | After
      --------------------------------------
      Close | 1    | 18 Gbps | 18 Gbps
      Far   | 1    | 15 Gbps | 18 Gbps
      Close | 12   | 80 Gbps | 80 Gbps
      Far   | 12   | 68 Gbps | 80 Gbps
      
      In all test cases we see improvement for the far numa case, and no
      impact on the close numa case.
      Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
      Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
      Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6849c6d8
    • Saeed Mahameed's avatar
      page_pool: Don't recycle non-reusable pages · d5394610
      Saeed Mahameed authored
      A page is NOT reusable when at least one of the following is true:
      1) allocated when system was under some pressure. (page_is_pfmemalloc)
      2) belongs to a different NUMA node than pool->p.nid.
      
      To update pool->p.nid users should call page_pool_update_nid().
      
      Holding on to such pages in the pool will hurt the consumer performance
      when the pool migrates to a different numa node.
      
      Performance testing:
      XDP drop/tx rate and TCP single/multi stream, on mlx5 driver
      while migrating rx ring irq from close to far numa:
      
      mlx5 internal page cache was locally disabled to get pure page pool
      results.
      
      CPU: Intel(R) Xeon(R) CPU E5-2603 v4 @ 1.70GHz
      NIC: Mellanox Technologies MT27700 Family [ConnectX-4] (100G)
      
      XDP Drop/TX single core:
      NUMA  | XDP  | Before    | After
      ---------------------------------------
      Close | Drop | 11   Mpps | 10.9 Mpps
      Far   | Drop | 4.4  Mpps | 5.8  Mpps
      
      Close | TX   | 6.5 Mpps  | 6.5 Mpps
      Far   | TX   | 3.5 Mpps  | 4  Mpps
      
      Improvement is about 30% drop packet rate, 15% tx packet rate for numa
      far test.
      No degradation for numa close tests.
      
      TCP single/multi cpu/stream:
      NUMA  | #cpu | Before  | After
      --------------------------------------
      Close | 1    | 18 Gbps | 18 Gbps
      Far   | 1    | 15 Gbps | 18 Gbps
      Close | 12   | 80 Gbps | 80 Gbps
      Far   | 12   | 68 Gbps | 80 Gbps
      
      In all test cases we see improvement for the far numa case, and no
      impact on the close numa case.
      
      The impact of adding a check per page is very negligible, and shows no
      performance degradation whatsoever, also functionality wise it seems more
      correct and more robust for page pool to verify when pages should be
      recycled, since page pool can't guarantee where pages are coming from.
      Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
      Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
      Reviewed-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d5394610
    • Saeed Mahameed's avatar
      page_pool: Add API to update numa node · bc836748
      Saeed Mahameed authored
      Add page_pool_update_nid() to be called by page pool consumers when they
      detect numa node changes.
      
      It will update the page pool nid value to start allocating from the new
      effective numa node.
      
      This is to mitigate page pool allocating pages from a wrong numa node,
      where the pool was originally allocated, and holding on to pages that
      belong to a different numa node, which causes performance degradation.
      
      For pages that are already being consumed and could be returned to the
      pool by the consumer, in next patch we will add a check per page to avoid
      recycling them back to the pool and return them to the page allocator.
      Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
      Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
      Reviewed-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bc836748
    • David S. Miller's avatar
      Merge branch 'cpsw-switchdev' · 1f12177b
      David S. Miller authored
      Grygorii Strashko says:
      
      ====================
      net: ethernet: ti: introduce new cpsw switchdev based driver
      
      Thank you All for review of v6.
      
      There are no significant changes in this version, just fixed comments to v6.
      
      --- v6
      The major change in this version is DT bindings conversation to json-schema, and
      fixed other comments to v5. Also added patch to clean up ALE on init and netif
      restart.
      
      --- v5
      The major part of work done in this iteration is rebasing on top of net-next
      with XDP series from Ivan Khoronzhuk [3], and enable XDP support in the new
      CPSW switchdev driver (it was little bit painful ;(). There are mostly no
      functional changes in new CPSW driver, just few fixes, sync with old driver
      and cleanups/optimizations. So, I've kept rest of cover letter unchanged.
      
      ---
      This series originally based on work [1][2] done by
      Ilias Apalodimas <ilias.apalodimas@linaro.org>.
      
      This the RFC v5 which introduces new CPSW switchdev based driver which is
      operating in dual-emac mode by default, thus working as 2 individual
      network interfaces. The Switch mode can be enabled by configuring devlink driver
      parameter "switch_mode" to 1/true:
      	devlink dev param set platform/48484000.switch \
      	name switch_mode value 1 cmode runtime
      This can be done regardless of the state of Port's netdev devices - UP/DOWN, but
      Port's netdev devices have to be in UP before joining the bridge to avoid
      overwriting of bridge configuration as CPSW switch driver completely reloads its
      configuration when first Port changes its state to UP.
      When the both interfaces joined the bridge - CPSW switch driver will start
      marking packets with offload_fwd_mark flag unless "ale_bypass=0".
      All configuration is implemented via switchdev API.
      
      The previous solution of tracking both Ports joined the bridge
      (from netdevice_notifier) proved to be not correct as changing CPSW switch
      driver mode required cleanup of ALE table and CPSW settings which happens
      while second Port is joined bridge and as result configuration loaded
      by bridge for the first Port became corrupted.
      
      The introduction of the new CPSW switchdev based driver (cpsw_new.c) is split
      on two parts: Part 1 - basic dual-emac driver; Part 2 switchdev support.
      Such approach has simplified code development and testing alot. And, I hope,
      it will help with better review.
      
      patches #1 - 5: preparation patches which also moves common code to cpsw_priv.c
      patches #6 - 9: Introduce TI CPSW switch driver based on switchdev and new
       DT bindings
      patch #10: new CPSW switchdev driver documentation
      patch #11: adds DT nodes for new CPSW switchdev driver added for DRA7 SoC
      patch #12: adds DT nodes for new cpsw switchdev driver for am571x-idk board
      patch #13: enables build of TI CPSW driver
      
      Most of the contents of the previous cover-letter have been added in
      new driver documentation, so please refer to that for configuration,
      testing and future work.
      
      These patches can be found at (branch contains some additional patches required
      for testing on top of net-next):
       https://github.com/grygoriyS/linux.git
       branch: lkml-5.4-switch-tbd-v7
      
      changes in v7:
       - patch 2: added check for devm_kmalloc_array() return value
       - patch 6: fixed comments
      
      changes in v6: https://lkml.org/lkml/2019/11/9/108
       - DT bindings converted to json-schema
       - netdev initialization is split on creation and registration.
         The netdevs registration happens now at the end of the pobe.
       - reworked cpsw_set_pauseparam() to use PHYlib APIs.
       - other comments for v5 fixed
      
      v5: https://patchwork.kernel.org/cover/11208785/
       - rebase on top of net-next with XDP series from Ivan Khoronzhuk [3],
         and enable XDP support in the new CPSW switchdev driver
         cpsw driver (tested XDP_DROP only)
       - sync with old cpsw driver
       - implement comments from  Ivan Khoronzhuk and Rob Herring
       - fixed "NETDEV WATCHDOG: .." warning after interface after interface UP/DOWN,
         missed TX wake in cpsw_adjust_link()
      
      v4: https://patchwork.kernel.org/cover/11010523/
       - finished split of common CPSW code
       - added devlink support
       - changed CPSW mode configuration approach: from netdevice_notifier to devlink
         parameter
       - refactor and clean up ALE changes which allows to modify VLANs/MDBs entries
       - added missed support for port QDISC_CBS and QDISC_MQPRIO
       - the CPSW is split on two parts: basic dual_mac driver and switchdev support
       - added missed callback .ndo_get_port_parent_id()
       - reworked ingress frames marking in switch mode (offload_fwd_mark)
       - applied comments from Andrew Lunn
      
      v3: https://lwn.net/Articles/786677/
      Changes in v3:
      - alot of work done to split properly common code between legacy and switchdev
        CPSW drivers and clean up code
      - CPSW switchdev interface updated to the current LKML switchdev interface
      - actually new CPSW switchdev based driver introduced
      - optimized dual_mac mode in new driver. Main change is that in promiscuous
      mode P0_UNI_FLOOD (both ports) is enabled in addition to ALLMULTI (current
      port) instead of ALE_BYPASS.  So, port in non promiscuous mode will keep
      possibility of mcast and vlan filtering.
      - changed bridge join sequnce: now switch mode will be enabled only when
      both ports joined the bridge. CPSW will be switched to dual_mac mode if any
      port leave bridge. ALE table is completly cleared and then refiled while
      switching to switch mode - this simplidies code a lot, but introduces some
      limitation to bridge setup sequence:
       ip link add name br0 type bridge
       ip link set dev br0 type bridge ageing_time 1000
       ip link set dev br0 type bridge vlan_filtering 0 <- disable
       echo 0 > /sys/class/net/br0/bridge/default_vlan
      
       ip link set dev sw0p1 up <- add ports
       ip link set dev sw0p2 up
       ip link set dev sw0p1 master br0
       ip link set dev sw0p2 master br0
      
       echo 1 > /sys/class/net/br0/bridge/default_vlan <- enable
       ip link set dev br0 type bridge vlan_filtering 1
       bridge vlan add dev br0 vid 1 pvid untagged self
      - STP tested with vlan_filtering 1/0. To make STP work I've had to set
        NO_SA_UPDATE for all slave ports (see comment in code). It also required to
        statically register STP mcast address {0x01, 0x80, 0xc2, 0x0, 0x0, 0x0};
      - allowed build both TI_CPSW and TI_CPSW_SWITCHDEV drivers
      - PTP can be enabled on both ports in dual_mac mode
      
      [1] https://patchwork.ozlabs.org/cover/929367/
      [2] https://patches.linaro.org/cover/136709/
      [3] https://patchwork.kernel.org/cover/11035813/
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1f12177b
    • Grygorii Strashko's avatar
      arm: omap2plus_defconfig: enable new cpsw switchdev driver · 3727d259
      Grygorii Strashko authored
      Add CONFIG_TI_CPSW_SWITCHDEV option to enable new cpsw switchdev driver
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3727d259
    • Grygorii Strashko's avatar
      ARM: dts: am571x-idk: enable for new cpsw switch dev driver · 15b991ad
      Grygorii Strashko authored
      Add DT nodes for new cpsw switchdev driver for am571x-idk board for now to
      enable testing of the new solution.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      15b991ad
    • Grygorii Strashko's avatar
      ARM: dts: dra7: add dt nodes for new cpsw switch dev driver · 39331a49
      Grygorii Strashko authored
      Add DT nodes for new cpsw switch dev driver.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      39331a49
    • Ilias Apalodimas's avatar
      Documentation: networking: add cpsw switchdev based driver documentation · 14c815a9
      Ilias Apalodimas authored
      A new cpsw dirver based on switchdev was added. Add documentation about
      basic configuration and future features
      Signed-off-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      14c815a9
    • Grygorii Strashko's avatar
      phy: ti: phy-gmii-sel: dependency from ti cpsw-switchdev driver · da84e50c
      Grygorii Strashko authored
      Add dependency from TI_CPSW_SWITCHDEV.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      da84e50c
    • Ilias Apalodimas's avatar
      net: ethernet: ti: introduce cpsw switchdev based driver part 2 - switch · 111cf1ab
      Ilias Apalodimas authored
      CPSW switchdev based driver which is operating in dual-emac mode by
      default, thus working as 2 individual network interfaces. The Switch mode
      can be enabled by configuring devlink driver parameter "switch_mode" to 1:
      
      	devlink dev param set platform/48484000.switch \
      	name switch_mode value 1 cmode runtime
      
      This can be done regardless of the state of Port's netdevs - UP/DOWN, but
      Port's netdev devices have to be UP before joining the bridge to avoid
      overwriting of bridge configuration as CPSW switch driver completely
      reloads its configuration when first Port changes its state to UP.
      When the both interfaces joined the bridge - CPSW switch driver will start
      marking packets with offload_fwd_mark flag unless "ale_bypass=0".
      
      All configuration is implemented via switchdev API and notifiers.
      Supported:
       - SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS
       - SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS: BR_MCAST_FLOOD
       - SWITCHDEV_ATTR_ID_PORT_STP_STATE
       - SWITCHDEV_OBJ_ID_PORT_VLAN
       - SWITCHDEV_OBJ_ID_PORT_MDB
       - SWITCHDEV_OBJ_ID_HOST_MDB
      
      Hence CPSW switchdev driver supports:
      - FDB offloading
      - MDB offloading
      - VLAN filtering and offloading
      - STP
      Signed-off-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      111cf1ab
    • Ilias Apalodimas's avatar
      net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac · ed3525ed
      Ilias Apalodimas authored
      Part 1:
       Introduce basic CPSW dual_mac driver (cpsw_new.c) which is operating in
      dual-emac mode by default, thus working as 2 individual network interfaces.
      Main differences from legacy CPSW driver are:
      
       - optimized promiscuous mode: The P0_UNI_FLOOD (both ports) is enabled in
      addition to ALLMULTI (current port) instead of ALE_BYPASS. So, Ports in
      promiscuous mode will keep possibility of mcast and vlan filtering, which
      is provides significant benefits when ports are joined to the same bridge,
      but without enabling "switch" mode, or to different bridges.
       - learning disabled on ports as it make not too much sense for
         segregated ports - no forwarding in HW.
       - enabled basic support for devlink.
      
      	devlink dev show
      		platform/48484000.switch
      
      	devlink dev param show
      	 platform/48484000.switch:
      	name ale_bypass type driver-specific
      	 values:
      		cmode runtime value false
      
       - "ale_bypass" devlink driver parameter allows to enable
      ALE_CONTROL(4).BYPASS mode for debug purposes.
       - updated DT bindings.
      Signed-off-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ed3525ed
    • Grygorii Strashko's avatar
      dt-bindings: net: ti: add new cpsw switch driver bindings · ef63fe72
      Grygorii Strashko authored
      Add bindings for the new TI CPSW switch driver. Comparing to the legacy
      bindings (net/cpsw.txt):
      - ports definition follows DSA bindings (net/dsa/dsa.txt) and ports can be
      marked as "disabled" if not physically wired.
      - all deprecated properties dropped;
      - all legacy propertiies dropped which represent constant HW cpapbilities
      (cpdma_channels, ale_entries, bd_ram_size, mac_control, slaves,
      active_slave)
      - TI CPTS DT properties are reused as is, but grouped in "cpts" sub-node
      - TI Davinci MDIO DT bindings are reused as is, because Davinci MDIO is
      reused.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ef63fe72
    • Grygorii Strashko's avatar
      net: ethernet: ti: cpsw: move set of common functions in cpsw_priv · c5013ac1
      Grygorii Strashko authored
      As a preparatory patch to add support for a switchdev based cpsw driver,
      move common functions to cpsw-priv.c so that they can be used across both
      drivers.
      Signed-off-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c5013ac1
    • Grygorii Strashko's avatar
      net: ethernet: ti: cpsw: resolve build deps of cpsw drivers · 51a95337
      Grygorii Strashko authored
      A following patches introduce new CPSW switchdev driver which uses common
      code with legacy CPSW driver. This will introduce build dependency between
      CPSW switchdev and CPSW legacy drivers related to for_each_slave() and
      cpsw_slave_index() - they can be compiled both, but only one of them will
      be not functional depending in Kconfig settings due to duffrences in Slave
      Ports indexes calculation.
      
      To fix this make for_each_slave() local (it's used now only by legacy CPSW
      driver) and convert cpsw_slave_index() to be a function pointer which is
      assigned in probe. Driver to probe is defined by DT.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      51a95337
    • Ilias Apalodimas's avatar
      net: ethernet: ti: ale: modify vlan/mdb api for switchdev · e85c1437
      Ilias Apalodimas authored
      A following patch introduces switchdev functionality, so modify
      ALE engine VLANs/MDBs API:
      - cpsw_ale_del_mcast(): update so it will remove only selected ports from
      mcast port_mask or delete whole mcast record if !port_mask
      - cpsw_ale_del_vlan(): update so it will remove only selected ports from
      all VLAN record's masks or delete whole VLAN record if !port_mask
      - add cpsw_ale_vlan_add_modify() to add or modify existing VLAN record's
      masks
      - add cpsw_ale_set_unreg_mcast() for enabling unreg mcast on port VLANs
      Signed-off-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e85c1437
    • Grygorii Strashko's avatar
      net: ethernet: ti: cpsw: allow untagged traffic on host port · 4b41d343
      Grygorii Strashko authored
      Now untagged vlan traffic is not support on Host P0 port. This patch adds
      in ALE context bitmap of VLANs for which Host P0 port bit set in Force
      Untagged Packet Egress bitmask in VLANs ALE entries, and adds corresponding
      check in VLAN incapsulation header parsing function cpsw_rx_vlan_encap().
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4b41d343
    • Grygorii Strashko's avatar
      net: ethernet: ti: ale: clean ale tbl on init and intf restart · 7fe579df
      Grygorii Strashko authored
      Clean CPSW ALE on init and intf restart (up/down) to avoid reading obsolete
      or garbage entries from ALE table.
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7fe579df
    • David S. Miller's avatar
      Merge branch 'nf_tables_offload-vlan-matching-support' · b9242da6
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      nf_tables_offload: vlan matching support
      
      The following patchset contains Netfilter support for vlan matching
      offloads:
      
      1) Constify nft_reg_load() as a preparation patch.
      2) Restrict rule matching to ingress interface type ARPHRD_ETHER.
      3) Add new vlan_tci field to flow_dissector_key_vlan structure,
         to allow to set up vlan_id, vlan_dei and vlan_priority in one go.
      4) C-VLAN matching support.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b9242da6
    • Pablo Neira Ayuso's avatar
      netfilter: nft_payload: add C-VLAN offload support · 89d8fd44
      Pablo Neira Ayuso authored
      Match on h_vlan_encapsulated_proto and set up protocol dependency. Check
      for protocol dependency before accessing the tci field. Allow to match
      on the encapsulated ethertype too.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      89d8fd44
    • Pablo Neira Ayuso's avatar
      netfilter: nft_payload: add VLAN offload support · a82055af
      Pablo Neira Ayuso authored
      Match on ethertype and set up protocol dependency. Check for protocol
      dependency before accessing the tci field. Allow to match on the
      encapsulated ethertype too.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a82055af
    • Pablo Neira Ayuso's avatar
      netfilter: nf_tables_offload: allow ethernet interface type only · 8819efc9
      Pablo Neira Ayuso authored
      Hardware offload support at this stage assumes an ethernet device in
      place. The flow dissector provides the intermediate representation to
      express this selector, so extend it to allow to store the interface
      type. Flower does not uses this, so skb_flow_dissect_meta() is not
      extended to match on this new field.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8819efc9
    • Pablo Neira Ayuso's avatar
      netfilter: nf_tables: constify nft_reg_load{8, 16, 64}() · 7cd9a58d
      Pablo Neira Ayuso authored
      This patch constifies the pointer to source register data that is passed
      as an input parameter.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7cd9a58d
    • Xin Long's avatar
      lwtunnel: add support for multiple geneve opts · 2f1d370b
      Xin Long authored
      geneve RFC (draft-ietf-nvo3-geneve-14) allows a geneve packet to carry
      multiple geneve opts, so it's necessary for lwtunnel to support adding
      multiple geneve opts in one lwtunnel route. But vxlan and erspan opts
      are still only allowed to add one option.
      
      With this patch, iproute2 could make it like:
      
        # ip r a 1.1.1.0/24 encap ip id 1 geneve_opts 0:0:12121212,1:2:12121212 \
          dst 10.1.0.2 dev geneve1
      
        # ip r a 1.1.1.0/24 encap ip id 1 vxlan_opts 456 \
          dst 10.1.0.2 dev erspan1
      
        # ip r a 1.1.1.0/24 encap ip id 1 erspan_opts 1:123:0:0 \
          dst 10.1.0.2 dev erspan1
      
      Which are pretty much like cls_flower and act_tunnel_key.
      Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2f1d370b
    • Rahul Lakkireddy's avatar
      cxgb4: remove unneeded semicolon for switch block · 272630fe
      Rahul Lakkireddy authored
      Semicolon is not required at the end of switch block. So, remove it.
      
      Addresses coccinelle warning:
      drivers/net/ethernet/chelsio/cxgb4/sge.c:2260:2-3: Unneeded semicolon
      
      Fixes: 4846d533 ("cxgb4: add Tx and Rx path for ETHOFLD traffic")
      Reported-by: default avatarkbuild test robot <lkp@intel.com>
      Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      272630fe
  2. 19 Nov, 2019 15 commits