Skip to content
  1. Mar 20, 2021
  2. Mar 19, 2021
    • David S. Miller's avatar
      Merge branch 'net-xps-improve-the-xps-maps-handling' · c2ed62b9
      David S. Miller authored
      
      
      Antoine Tenart says:
      
      ====================
      net: xps: improve the xps maps handling
      
      This series aims at fixing various issues with the xps code, including
      out-of-bound accesses and use-after-free. While doing so we try to
      improve the xps code maintainability and readability.
      
      The main change is moving dev->num_tc and dev->nr_ids in the xps maps, to
      avoid out-of-bound accesses as those two fields can be updated after the
      maps have been allocated. This allows further reworks, to improve the
      xps code readability and allow to stop taking the rtnl lock when
      reading the maps in sysfs. The maps are moved to an array in net_device,
      which simplifies the code a lot.
      
      One future improvement may be to remove the use of xps_map_mutex from
      net/core/dev.c, but that may require extra care.
      
      Thanks!
      Antoine
      
      Since v3:
        - Removed the 3 patches about the rtnl lock and __netif_set_xps_queue
          as there are extra issues. Those patches were not tied to the
          others, and I'll see want can be done as a separate effort.
        - One small fix in patch 12.
      
      Since v2:
        - Patches 13-16 are new to the series.
        - Fixed another issue I found while preparing v3 (use after free of
          old xps maps).
        - Kept the rtnl lock when calling netdev_get_tx_queue and
          netdev_txq_to_tc.
        - Use get_device/put_device when using the sb_dev.
        - Take the rtnl lock in mlx5 and virtio_net when calling
          netif_set_xps_queue.
        - Fixed a coding style issue.
      
      Since v1:
        - Reordered the patches to improve readability and avoid introducing
          issues in between patches.
        - Use dev_maps->nr_ids to allocate the mask in xps_queue_show but
          still default to nr_cpu_ids/dev->num_rx_queues in xps_queue_show
          when dev_maps hasn't been allocated yet for backward
          compatibility.:w
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c2ed62b9
    • Antoine Tenart's avatar
      net: NULL the old xps map entries when freeing them · 75b2758a
      Antoine Tenart authored
      
      
      In __netif_set_xps_queue, old map entries from the old dev_maps are
      freed but their corresponding entry in the old dev_maps aren't NULLed.
      Fix this.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      75b2758a
    • Antoine Tenart's avatar
      net: fix use after free in xps · 2d05bf01
      Antoine Tenart authored
      
      
      When setting up an new dev_maps in __netif_set_xps_queue, we remove and
      free maps from unused CPUs/rx-queues near the end of the function; by
      calling remove_xps_queue. However it's possible those maps are also part
      of the old not-freed-yet dev_maps, which might be used concurrently.
      When that happens, a map can be freed while its corresponding entry in
      the old dev_maps table isn't NULLed, leading to: "BUG: KASAN:
      use-after-free" in different places.
      
      This fixes the map freeing logic for unused CPUs/rx-queues, to also NULL
      the map entries from the old dev_maps table.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2d05bf01
    • Antoine Tenart's avatar
      net-sysfs: move the xps cpus/rxqs retrieval in a common function · 2db6cdae
      Antoine Tenart authored
      
      
      Most of the xps_cpus_show and xps_rxqs_show functions share the same
      logic. Having it in two different functions does not help maintenance.
      This patch moves their common logic into a new function, xps_queue_show,
      to improve this.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2db6cdae
    • Antoine Tenart's avatar
      net-sysfs: move the rtnl unlock up in the xps show helpers · d7be87a6
      Antoine Tenart authored
      
      
      Now that nr_ids and num_tc are stored in the xps dev_maps, which are RCU
      protected, we do not have the need to protect the maps in the rtnl lock.
      Move the rtnl unlock up so we reduce the rtnl locking section.
      
      We also increase the reference count on the subordinate device if any,
      as we don't want this device to be freed while we use it (now that the
      rtnl lock isn't protecting it in the whole function).
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d7be87a6
    • Antoine Tenart's avatar
      net: improve queue removal readability in __netif_set_xps_queue · 132f743b
      Antoine Tenart authored
      
      
      Improve the readability of the loop removing tx-queue from unused
      CPUs/rx-queues in __netif_set_xps_queue. The change should only be
      cosmetic.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      132f743b
    • Antoine Tenart's avatar
      net: add an helper to copy xps maps to the new dev_maps · 402fbb99
      Antoine Tenart authored
      
      
      This patch adds an helper, xps_copy_dev_maps, to copy maps from dev_maps
      to new_dev_maps at a given index. The logic should be the same, with an
      improved code readability and maintenance.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      402fbb99
    • Antoine Tenart's avatar
      net: move the xps maps to an array · 044ab86d
      Antoine Tenart authored
      
      
      Move the xps maps (xps_cpus_map and xps_rxqs_map) to an array in
      net_device. That will simplify a lot the code removing the need for lots
      of if/else conditionals as the correct map will be available using its
      offset in the array.
      
      This should not modify the xps maps behaviour in any way.
      
      Suggested-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      044ab86d
    • Antoine Tenart's avatar
      net: remove the xps possible_mask · 6f36158e
      Antoine Tenart authored
      
      
      Remove the xps possible_mask. It was an optimization but we can just
      loop from 0 to nr_ids now that it is embedded in the xps dev_maps. That
      simplifies the code a bit.
      
      Suggested-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6f36158e
    • Antoine Tenart's avatar
      net: embed nr_ids in the xps maps · 5478fcd0
      Antoine Tenart authored
      
      
      Embed nr_ids (the number of cpu for the xps cpus map, and the number of
      rxqs for the xps cpus map) in dev_maps. That will help not accessing out
      of bound memory if those values change after dev_maps was allocated.
      
      Suggested-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5478fcd0
    • Antoine Tenart's avatar
      net: embed num_tc in the xps maps · 255c04a8
      Antoine Tenart authored
      
      
      The xps cpus/rxqs map is accessed using dev->num_tc, which is used when
      allocating the map. But later updates of dev->num_tc can lead to having
      a mismatch between the maps and how they're accessed. In such cases the
      map values do not make any sense and out of bound accesses can occur
      (that can be easily seen using KASAN).
      
      This patch aims at fixing this by embedding num_tc into the maps, using
      the value at the time the map is created. This brings two improvements:
      - The maps can be accessed using the embedded num_tc, so we know for
        sure we won't have out of bound accesses.
      - Checks can be made before accessing the maps so we know the values
        retrieved will make sense.
      
      We also update __netif_set_xps_queue to conditionally copy old maps from
      dev_maps in the new one only if the number of traffic classes from both
      maps match.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      255c04a8
    • Antoine Tenart's avatar
      net-sysfs: make xps_cpus_show and xps_rxqs_show consistent · 73f5e52b
      Antoine Tenart authored
      
      
      Make the implementations of xps_cpus_show and xps_rxqs_show to converge,
      as the two share the same logic but diverted over time. This should not
      modify their behaviour but will help future changes and improve
      maintenance.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      73f5e52b
    • Antoine Tenart's avatar
      net-sysfs: store the return of get_netdev_queue_index in an unsigned int · d9a063d2
      Antoine Tenart authored
      
      
      In net-sysfs, get_netdev_queue_index returns an unsigned int. Some of
      its callers use an unsigned long to store the returned value. Update the
      code to be consistent, this should only be cosmetic.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d9a063d2
    • Antoine Tenart's avatar
      net-sysfs: convert xps_cpus_show to bitmap_zalloc · ea4fe7e8
      Antoine Tenart authored
      
      
      Use bitmap_zalloc instead of zalloc_cpumask_var in xps_cpus_show to
      align with xps_rxqs_show. This will improve maintenance and allow us to
      factorize the two functions. The function should behave the same.
      
      Signed-off-by: default avatarAntoine Tenart <atenart@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ea4fe7e8
    • Rafał Miłecki's avatar
      net: dsa: bcm_sf2: fix BCM4908 RGMII reg(s) · 6859d915
      Rafał Miłecki authored
      BCM4908 has only 1 RGMII reg for controlling port 7.
      
      Fixes: 73b7a604
      
       ("net: dsa: bcm_sf2: support BCM4908's integrated switch")
      Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
      Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6859d915
    • Rafał Miłecki's avatar
      net: dsa: bcm_sf2: add function finding RGMII register · 55cfeb39
      Rafał Miłecki authored
      Simple macro like REG_RGMII_CNTRL_P() is insufficient as:
      1. It doesn't validate port argument
      2. It doesn't support chipsets with non-lineral RGMII regs layout
      
      Missing port validation could result in getting register offset from out
      of array. Random memory -> random offset -> random reads/writes. It
      affected e.g. BCM4908 for REG_RGMII_CNTRL_P(7).
      
      Fixes: a78e86ed
      
       ("net: dsa: bcm_sf2: Prepare for different register layouts")
      Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
      Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      55cfeb39
    • Álvaro Fernández Rojas's avatar
      net: dsa: b53: mmap: Add device tree support · a5538a77
      Álvaro Fernández Rojas authored
      
      
      Add device tree support to b53_mmap.c while keeping platform devices support.
      
      Signed-off-by: default avatarÁlvaro Fernández Rojas <noltari@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a5538a77
    • David S. Miller's avatar
      Merge branch 'stmmac-EST-interrupts-and-ethtool' · 7b78702e
      David S. Miller authored
      
      
      Mohammad Athari Bin Ismail says:
      
      ====================
      net: stmmac: EST interrupts and ethtool
      
      This patchset adds support for handling EST interrupts and reporting EST
      errors. Additionally, the errors are added into ethtool statistic.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7b78702e
    • Ong Boon Leong's avatar
      net: stmmac: Add EST errors into ethtool statistic · 9f298959
      Ong Boon Leong authored
      
      
      Below EST errors are added into ethtool statistic:
      1) Constant Gate Control Error (CGCE):
         The counter "mtl_est_cgce" increases everytime CGCE interrupt is
         triggered.
      
      2) Head-of-Line Blocking due to Scheduling (HLBS):
         The counter "mtl_est_hlbs" increases everytime HLBS interrupt is
         triggered.
      
      3) Head-of-Line Blocking due to Frame Size (HLBF):
         The counter "mtl_est_hlbf" increases everytime HLBF interrupt is
         triggered.
      
      4) Base Time Register error (BTRE):
         The counter "mtl_est_btre" increases everytime BTRE interrupt is
         triggered but BTRL not reaches maximum value of 15.
      
      5) Base Time Register Error Loop Count (BTRL) reaches maximum value:
         The counter "mtl_est_btrlm" increases everytime BTRE interrupt is
         triggered and BTRL value reaches maximum value of 15.
      
      Please refer to MTL_EST_STATUS register in DesignWare Cores Ethernet
      Quality-of-Service Databook for more detail explanation.
      
      Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
      Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
      Co-developed-by: default avatarMohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
      Signed-off-by: default avatarMohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9f298959
    • Voon Weifeng's avatar
      net: stmmac: EST interrupts handling and error reporting · e49aa315
      Voon Weifeng authored
      
      
      Enabled EST related interrupts as below:
      1) Constant Gate Control Error (CGCE)
      2) Head-of-Line Blocking due to Scheduling (HLBS)
      3) Head-of-Line Blocking due to Frame Size (HLBF).
      4) Base Time Register error (BTRE)
      5) Switch to S/W owned list Complete (SWLC)
      
      For HLBS, the user will get the info of all the queues that shows this
      error. For HLBF, the user will get the info of all the queue with the
      latest frame size which causes the error. Frame size 0 indicates no
      error.
      
      The ISR handling takes place when EST feature is enabled by user.
      
      Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
      Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
      Co-developed-by: default avatarMohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
      Signed-off-by: default avatarMohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e49aa315
    • David S. Miller's avatar
      Merge branch 'stmmac-vlan-priority-rx-steering' · 09bef832
      David S. Miller authored
      
      
      Ong Boon Leong says:
      
      ====================
      stmmac: add VLAN priority based RX steering
      
      The current tc flower implementation in stmmac supports both L3 and L4
      filter offloading. This patch adds the support of VLAN priority based
      RX frame steering into different Rx Queues.
      
      The patches have been tested on both configuration test (include L3/L4)
      and traffic test (multi VLAN ping streams with RX Frame Steering) below:-
      
      > tc qdisc delete dev eth0 ingress
      
      > tc qdisc del dev eth0 parent root 2&> /dev/null
      > tc qdisc del dev eth0 parent ffff: 2&> /dev/null
      
      > tc qdisc add dev eth0 ingress
      
      > tc filter add dev eth0 parent ffff: protocol ip flower dst_ip 192.168.0.1 \
        src_ip 192.168.1.1 ip_proto tcp dst_port 5201 src_port 6201 action drop
      
      > tc filter add dev eth0 parent ffff: protocol ip flower dst_ip 192.168.0.2 \
        src_ip 192.168.1.2 ip_proto tcp dst_port 5202 src_port 6202 action drop
      
      > tc filter show dev eth0 ingress
      filter parent ffff: protocol ip pref 49151 flower chain 0
      filter parent ffff: protocol ip pref 49151 flower chain 0 handle 0x1
        eth_type ipv4
        ip_proto tcp
        dst_ip 192.168.0.2
        src_ip 192.168.1.2
        dst_port 5202
        src_port 6202
        in_hw in_hw_count 1
              action order 1: gact action drop
               random type none pass val 0
               index 2 ref 1 bind 1
      
      filter parent ffff: protocol ip pref 49152 flower chain 0
      filter parent ffff: protocol ip pref 49152 flower chain 0 handle 0x1
        eth_type ipv4
        ip_proto tcp
        dst_ip 192.168.0.1
        src_ip 192.168.1.1
        dst_port 5201
        src_port 6201
        in_hw in_hw_count 1
              action order 1: gact action drop
               random type none pass val 0
               index 1 ref 1 bind 1
      
      > tc qdisc delete dev eth0 ingress
      
      > tc qdisc del dev eth0 parent root 2&> /dev/null
      > tc qdisc del dev eth0 parent ffff: 2&> /dev/null
      
      > tc qdisc add dev eth0 ingress
      
      > tc qdisc add dev eth0 root mqprio num_tc 4 \
        map 0 1 2 3 0 0 0 0 0 0 0 0 0 0 0 0 \
        queues 1@0 1@1 1@2 1@3 hw 0
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 0 hw_tc 3
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 1 hw_tc 2
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 2 hw_tc 1
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 3 hw_tc 0
      
      > tc filter show dev eth0 ingress
      filter parent ffff: protocol 802.1Q pref 49149 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49149 flower chain 0 handle 0x1 hw_tc 0
        vlan_prio 3
        in_hw in_hw_count 1
      filter parent ffff: protocol 802.1Q pref 49150 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49150 flower chain 0 handle 0x1 hw_tc 1
        vlan_prio 2
        in_hw in_hw_count 1
      filter parent ffff: protocol 802.1Q pref 49151 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49151 flower chain 0 handle 0x1 hw_tc 2
        vlan_prio 1
        in_hw in_hw_count 1
      filter parent ffff: protocol 802.1Q pref 49152 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49152 flower chain 0 handle 0x1 hw_tc 3
        vlan_prio 0
        in_hw in_hw_count 1
      
      > tc qdisc delete dev eth0 ingress
      
      > ip address flush dev eth0
      > ip address add 169.254.1.11/24 dev eth0
      
      > ip link delete dev eth0.vlan1 2> /dev/null
      > ip link add link eth0 name eth0.vlan1 type vlan id 1
      > ip address flush dev eth0.vlan1 2> /dev/null
      > ip address add 169.254.11.11/24 dev eth0.vlan1
      
      > ip link delete dev eth0.vlan2 2> /dev/null
      > ip link add link eth0 name eth0.vlan2 type vlan id 2
      > ip address flush dev eth0.vlan2 2> /dev/null
      > ip address add 169.254.12.11/24 dev eth0.vlan2
      
      > ip link delete dev eth0.vlan3 2> /dev/null
      > ip link add link eth0 name eth0.vlan3 type vlan id 3
      > ip address flush dev eth0.vlan3 2> /dev/null
      > ip address add 169.254.13.11/24 dev eth0.vlan3
      
      > ip link delete dev eth0.vlan4 2> /dev/null
      > ip link add link eth0 name eth0.vlan4 type vlan id 4
      > ip address flush dev eth0.vlan4 2> /dev/null
      > ip address add 169.254.14.11/24 dev eth0.vlan4
      
      > ip address flush dev eth0
      > ip address add 169.254.1.22/24 dev eth0
      
      > ip link delete dev eth0.vlan1 2> /dev/null
      > ip link add link eth0 name eth0.vlan1 type vlan id 1
      > ip address flush dev eth0.vlan1 2> /dev/null
      > ip address add 169.254.11.22/24 dev eth0.vlan1
      
      > ip link delete dev eth0.vlan2 2> /dev/null
      > ip link add link eth0 name eth0.vlan2 type vlan id 2
      > ip address flush dev eth0.vlan2 2> /dev/null
      > ip address add 169.254.12.22/24 dev eth0.vlan2
      
      > ip link delete dev eth0.vlan3 2> /dev/null
      > ip link add link eth0 name eth0.vlan3 type vlan id 3
      > ip address flush dev eth0.vlan3 2> /dev/null
      > ip address add 169.254.13.22/24 dev eth0.vlan3
      
      > ip link delete dev eth0.vlan4 2> /dev/null
      > ip link add link eth0 name eth0.vlan4 type vlan id 4
      > ip address flush dev eth0.vlan4 2> /dev/null
      > ip address add 169.254.14.22/24 dev eth0.vlan4
      
      > mkdir -p /sys/fs/cgroup/net_prio/grp0
      > echo eth0 0 > /sys/fs/cgroup/net_prio/grp0/net_prio.ifpriomap
      > echo eth0.vlan1 0 >  /sys/fs/cgroup/net_prio/grp0/net_prio.ifpriomap
      > mkdir -p /sys/fs/cgroup/net_prio/grp1
      > echo eth0 0 > /sys/fs/cgroup/net_prio/grp1/net_prio.ifpriomap
      > echo eth0.vlan2 1 >  /sys/fs/cgroup/net_prio/grp1/net_prio.ifpriomap
      > mkdir -p /sys/fs/cgroup/net_prio/grp2
      > echo eth0 0 > /sys/fs/cgroup/net_prio/grp2/net_prio.ifpriomap
      > echo eth0.vlan3 2 >  /sys/fs/cgroup/net_prio/grp2/net_prio.ifpriomap
      > mkdir -p /sys/fs/cgroup/net_prio/grp3
      > echo eth0 0 > /sys/fs/cgroup/net_prio/grp3/net_prio.ifpriomap
      > echo eth0.vlan4 3 >  /sys/fs/cgroup/net_prio/grp3/net_prio.ifpriomap
      
      > tc qdisc del dev eth0 parent root 2&> /dev/null
      > tc qdisc del dev eth0 parent ffff: 2&> /dev/null
      
      > tc qdisc add dev eth0 ingress
      > tc qdisc add dev eth0 root mqprio num_tc 4 map 0 1 2 3 0 0 0 0 0 0 0 0 0 0 0 0 queues 1@0 1@1 1@2 1@3 hw 0
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 0 hw_tc 0
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 1 hw_tc 1
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 2 hw_tc 2
      
      > tc filter add dev eth0 parent ffff: protocol 802.1Q flower vlan_prio 3 hw_tc 3
      
      > ip link set eth0.vlan1 type vlan egress-qos-map 0:0
      > ip link set eth0.vlan2 type vlan egress-qos-map 1:1
      > ip link set eth0.vlan3 type vlan egress-qos-map 2:2
      > ip link set eth0.vlan4 type vlan egress-qos-map 3:3
      
      > tc filter show dev eth0 ingress
      filter parent ffff: protocol 802.1Q pref 49149 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49149 flower chain 0 handle 0x1 hw_tc 3
        vlan_prio 3
        in_hw in_hw_count 1
      filter parent ffff: protocol 802.1Q pref 49150 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49150 flower chain 0 handle 0x1 hw_tc 2
        vlan_prio 2
        in_hw in_hw_count 1
      filter parent ffff: protocol 802.1Q pref 49151 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49151 flower chain 0 handle 0x1 hw_tc 1
        vlan_prio 1
        in_hw in_hw_count 1
      filter parent ffff: protocol 802.1Q pref 49152 flower chain 0
      filter parent ffff: protocol 802.1Q pref 49152 flower chain 0 handle 0x1 hw_tc 0
        vlan_prio 0
        in_hw in_hw_count 1
      
      > echo 1 > /proc/irq/131/smp_affinity
      > echo 1 > /proc/irq/132/smp_affinity
      
      > echo 4 > /proc/irq/133/smp_affinity
      > echo 4 > /proc/irq/134/smp_affinity
      
      > echo 4 > /proc/irq/135/smp_affinity
      > echo 4 > /proc/irq/136/smp_affinity
      
      > echo 2 > /proc/irq/137/smp_affinity
      > echo 2 > /proc/irq/138/smp_affinity
      
      > ping -i 0.001 169.254.11.22 2&> /dev/null &
      > PID1="$!"
      > echo $PID1 >  /sys/fs/cgroup/net_prio/grp0/cgroup.procs
      
      > ping -i 0.001 169.254.12.22 2&> /dev/null &
      > PID2="$!"
      > echo $PID2 >  /sys/fs/cgroup/net_prio/grp1/cgroup.procs
      
      > ping -i 0.001 169.254.13.22 2&> /dev/null &
      > PID3="$!"
      > echo $PID3 >  /sys/fs/cgroup/net_prio/grp2/cgroup.procs
      
      > ping -i 0.001 169.254.14.22 2&> /dev/null &
      > PID4="$!"
      > echo $PID4 >  /sys/fs/cgroup/net_prio/grp3/cgroup.procs
      
      > ping -i 0.001 169.254.11.11 2&> /dev/null &
      > PID1="$!"
      > echo $PID1 >  /sys/fs/cgroup/net_prio/grp0/cgroup.procs
      
      > ping -i 0.001 169.254.12.11 2&> /dev/null &
      > PID2="$!"
      > echo $PID2 >  /sys/fs/cgroup/net_prio/grp1/cgroup.procs
      
      > ping -i 0.001 169.254.13.11 2&> /dev/null &
      > PID3="$!"
      > echo $PID3 >  /sys/fs/cgroup/net_prio/grp2/cgroup.procs
      
      > ping -i 0.001 169.254.14.11 2&> /dev/null &
      > PID4="$!"
      > echo $PID4 >  /sys/fs/cgroup/net_prio/grp3/cgroup.procs
      
      > watch -n 0.5 -d "cat /proc/interrupts | grep eth0"
       131:     251918         41          0          0  IR-PCI-MSI 477184-edge      eth0:rx-0
       132:      18969          1          0          0  IR-PCI-MSI 477185-edge      eth0:tx-0
       133:          0          0     295872          0  IR-PCI-MSI 477186-edge      eth0:rx-1
       134:          0          0      16136          0  IR-PCI-MSI 477187-edge      eth0:tx-1
       135:          0          0     288042          0  IR-PCI-MSI 477188-edge      eth0:rx-2
       136:          0          0      16135          0  IR-PCI-MSI 477189-edge      eth0:tx-2
       137:          0     211177          0          0  IR-PCI-MSI 477190-edge      eth0:rx-3
       138:          2      16144          0          0  IR-PCI-MSI 477191-edge      eth0:tx-3
       139:          0          0          0          0  IR-PCI-MSI 477192-edge      eth0:rx-4
       140:          0          0          0          0  IR-PCI-MSI 477193-edge      eth0:tx-4
       141:          0          0          0          0  IR-PCI-MSI 477194-edge      eth0:rx-5
       142:          0          0          0          0  IR-PCI-MSI 477195-edge      eth0:tx-5
       143:          0          0          0          0  IR-PCI-MSI 477196-edge      eth0:rx-6
       144:          0          0          0          0  IR-PCI-MSI 477197-edge      eth0:tx-6
       145:          0          0          0          0  IR-PCI-MSI 477198-edge      eth0:rx-7
       146:          0          0          0          0  IR-PCI-MSI 477199-edge      eth0:tx-7
       157:          0          0          0          0  IR-PCI-MSI 477210-edge      eth0:safety-ue
      
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      09bef832
    • Ong Boon Leong's avatar
      net: stmmac: add RX frame steering based on VLAN priority in tc flower · 0e039f5c
      Ong Boon Leong authored
      
      
      We extend tc flower to support configuration of VLAN priority-based RX
      frame steering hardware offloading.
      
      To map VLAN <PCP> to Traffic Class <TC>:
        $ tc filter add dev <IFNAME> parent ffff: protocol 802.1Q flower \
             vlan_prio <PCP> hw_tc <TC>
      
        Note: <TC> < N whereby "tc qdisc ... num_tc N ..."
      
      To delete all tc flower configurations:
        $ tc qdisc delete dev <IFNAME> ingress
      
      Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0e039f5c
    • Ong Boon Leong's avatar
      net: stmmac: restructure tc implementation for RX VLAN Priority steering · bd0f670e
      Ong Boon Leong authored
      
      
      The current tc_add_flow() and tc_del_flow() use hardware L3 & L4 filters
      as offloading. The number of L3/L4 filters is read from L3L4FNUM field
      from MAC_HW_Feature1 register and is used to alloc priv->tc_entries[].
      
      For RX frame steering based on VLAN priority offloading, we use
      MAC_RXQ_CTRL2 & MAC_RXQ_CTRL3 registers and all VLAN priority level
      can be configured independent from L3 & L4 filters.
      
      Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bd0f670e
    • David S. Miller's avatar
      Merge branch 'octeon-tc-offloads' · 31222162
      David S. Miller authored
      
      
      Naveen Mamindlapalli says:
      
      ====================
      Add tc hardware offloads
      
      This patch series adds support for tc hardware offloads.
      
      Patch #1 adds support for offloading flows that matches IP tos and IP
               protocol which will be used by tc hw offload support. Also
               added ethtool n-tuple filter to code to offload the flows
               matching the above fields.
      Patch #2 adds tc flower hardware offload support on ingress traffic.
      Patch #3 adds TC flower offload stats.
      Patch #4 adds tc TC_MATCHALL egress ratelimiting offload.
      
      * tc flower hardware offload in PF driver
      
      The driver parses the flow match fields and actions received from the tc
      subsystem and adds/delete MCAM rules for the same. Each flow contains set
      of match and action fields. If the action or fields are not supported,
      the rule cannot be offloaded to hardware. The tc uses same set of MCAM
      rules allocated for ethtool n-tuple filters. So, at a time only one entity
      can offload the flows to hardware, they're made mutually exclusive in the
      driver.
      
      Following match and actions are supported.
      
      Match: Eth dst_mac, EtherType, 802.1Q {vlan_id,vlan_prio}, vlan EtherType,
             IP proto {tcp,udp,sctp,icmp,icmp6}, IPv4 tos, IPv4{dst_ip,src_ip},
             L4 proto {dst_port|src_port number}.
      Actions: drop, accept, vlan pop, redirect to another port on the device.
      
      The Hardware stats are also supported. Currently only packet counter stats
      are updated.
      
      * tc egress rate limiting support
      Added TC-MATCHALL classifier offload with police action applied for all
      egress traffic on the specified interface.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      31222162
    • Sunil Goutham's avatar
      octeontx2-pf: TC_MATCHALL egress ratelimiting offload · e638a83f
      Sunil Goutham authored
      
      
      Add TC_MATCHALL egress ratelimiting offload support with POLICE
      action for entire traffic going out of the interface.
      
      Eg: To ratelimit egress traffic to 100Mbps
      
      $ ethtool -K eth0 hw-tc-offload on
      $ tc qdisc add dev eth0 clsact
      $ tc filter add dev eth0 egress matchall skip_sw \
                      action police rate 100Mbit burst 16Kbit
      
      HW supports a max burst size of ~128KB.
      Only one ratelimiting filter can be installed at a time.
      
      Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
      Signed-off-by: default avatarNaveen Mamindlapalli <naveenm@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e638a83f
    • Naveen Mamindlapalli's avatar
      octeontx2-pf: add tc flower stats handler for hw offloads · d8ce30e0
      Naveen Mamindlapalli authored
      
      
      Add support to get the stats for tc flower flows that are
      offloaded to hardware. To support this feature, added a
      new AF mbox handler which returns the MCAM entry stats
      for a flow that has hardware stat counter enabled.
      
      Signed-off-by: default avatarNaveen Mamindlapalli <naveenm@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d8ce30e0
    • Naveen Mamindlapalli's avatar
      octeontx2-pf: Add tc flower hardware offload on ingress traffic · 1d4d9e42
      Naveen Mamindlapalli authored
      
      
      This patch adds support for tc flower hardware offload on ingress
      traffic. Since the tc-flower filter rules use the same set of MCAM
      rules as the n-tuple filters, the n-tuple filters and tc flower
      rules are mutually exclusive. When one of the feature is enabled
      using ethtool, the other feature is disabled in the driver. By default
      the driver enables n-tuple filters during initialization.
      
      The following flow keys are supported.
          -> Ethernet: dst_mac
          -> L2 proto: all protocols
          -> VLAN (802.1q): vlan_id/vlan_prio
          -> IPv4: dst_ip/src_ip/ip_proto{tcp|udp|sctp|icmp}/ip_tos
          -> IPv6: ip_proto{icmpv6}
          -> L4(tcp/udp/sctp): dst_port/src_port
      
      The following flow actions are supported.
          -> drop
          -> accept
          -> redirect
          -> vlan pop
      
      The flow action supports multiple actions when vlan pop is specified
      as the first action. The redirect action supports redirecting to the
      PF/VF of same PCI device. Redirecting to other PCI NIX devices is not
      supported.
      
      Example #1: Add a tc filter rule to drop UDP traffic with dest port 80
          # ethtool -K eth0 hw-tc-offload on
          # tc qdisc add dev eth0 ingress
          # tc filter add dev eth0 protocol ip parent ffff: flower ip_proto \
                udp dst_port 80 action drop
      
      Example #2: Add a tc filter rule to redirect ingress traffic on eth0
      with vlan id 3 to eth6 (ex: eth0 vf0) after stripping the vlan hdr.
          # ethtool -K eth0 hw-tc-offload on
          # tc qdisc add dev eth0 ingress
          # tc filter add dev eth0 parent ffff: protocol 802.1Q flower \
                vlan_id 3 vlan_ethtype ipv4 action vlan pop action mirred \
                ingress redirect dev eth6
      
      Example #3: List the ingress filter rules
          # tc -s filter show dev eth4 ingress
      
      Example #4: Delete tc flower filter rule with handle 0x1
          # tc filter del dev eth0 ingress protocol ip pref 49152 \
            handle 1 flower
      
      Signed-off-by: default avatarNaveen Mamindlapalli <naveenm@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1d4d9e42
    • Naveen Mamindlapalli's avatar
      octeontx2-pf: Add ip tos and ip proto icmp/icmpv6 flow offload support · 2b9cef66
      Naveen Mamindlapalli authored
      
      
      Add support for programming the HW MCAM match key with IP tos, IP(v6)
      proto icmp/icmpv6, allowing flow offload rules to be installed using
      those fields. The NPC HW extracts layer type, which will be used as a
      matching criteria for different IP protocols.
      
      The ethtool n-tuple filter logic has been updated to parse the IP tos
      and l4proto for HW offloading. l4proto tcp/udp/sctp/ah/esp/icmp are
      supported. See example usage below.
      
      Ex: Redirect l4proto icmp to vf 0 queue 0
      ethtool -U eth0 flow-type ip4 l4proto 1 action vf 0 queue 0
      
      Ex: Redirect flow with ip tos 8 to vf 0 queue 0
      ethtool -U eth0 flow-type ip4 tos 8 vf 0 queue 0
      
      Signed-off-by: default avatarNaveen Mamindlapalli <naveenm@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2b9cef66
  3. Mar 18, 2021
    • Michael Tretter's avatar
      net: macb: simplify clk_init with dev_err_probe · a04be4b6
      Michael Tretter authored
      
      
      On some platforms, e.g., the ZynqMP, devm_clk_get can return
      -EPROBE_DEFER if the clock controller, which is implemented in firmware,
      has not been probed yet.
      
      As clk_init is only called during probe, use dev_err_probe to simplify
      the error message and hide it for -EPROBE_DEFER.
      
      Signed-off-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a04be4b6
    • David S. Miller's avatar
      Merge branch 'mv88e6393x' · 4cb50d00
      David S. Miller authored
      
      
      Marek Behún says:
      
      ====================
      Add support for mv88e6393x family of Marvell
      
      after 2 months I finally had time to send v17 of Amethyst patches.
      
      This series is tested on Marvell CN9130-CRB.
      
      Changes since v16:
      - dropped patches adding 5gbase-r, since they are already merged
      - rebased onto net-next/master
      - driver API renamed set_egress_flood() method into 2 methods for
        ucast/mcast floods, so this is fixed
      
      Changes from v15:
      - put 10000baseKR_Full back into phylink_validate method for Amethyst,
        it seems I misunderstood the meaning behind things and removed it
        from v15
      - removed erratum 3.7, since the procedure is done anyway in
        mv88e6390_serdes_pcs_config
      - renumbered errata 3.6 and 3.8 to 4.6 and 4.8, according to newer
        version of the errata document
      - refactored errata code a little and removed duplicate macro
        definitions (for example MV88E6390_SGMII_CONTROL is already called
        MV88E6390_SGMII_BMCR)
      
      Changes from v14:
      - added my Signed-off-by tags to Pavana's patches, since I am sending
        them (as suggested by Andrew)
      - added documentation to second patch adding 5gbase-r mode (as requested
        by Russell)
      - added Reviewed-by tags
      - applied Vladimir's suggestions:
        - reduced indentation level in mv88e6xxx_set_egress_port and
          mv88e6393x_serdes_port_config
        - removed 10000baseKR_Full from mv88e6393x_phylink_validate
        - removed PHY_INTERFACE_MODE_10GKR from mv88e6xxx_port_set_cmode
      
      Changes from v13:
      - added patch that wraps .set_egress_port into mv88e6xxx_set_egress_port,
        so that we do not have to set chip->*gress_dest_port members in every
        implementation of this method
      - for the patch that adds Amethyst support:
        - added more information into commit message
        - added these methods for mv88e6393x_ops:
            .port_sync_link
            .port_setup_message_port
            .port_max_speed_mode (new implementation needed)
            .atu_get_hash
            .atu_set_hash
            .serdes_pcs_config
            .serdes_pcs_an_restart
            .serdes_pcs_link_up
        - this device can set upstream port per port, so implement
            .port_set_upstream_port
          instead of
            .set_cpu_port
        - removed USXGMII cmode (not yet supported, working on it)
        - added debug messages into mv88e6393x_port_set_speed_duplex
        - added Amethyst errata 4.5 (EEE should be disabled on SERDES ports)
        - fixed 5gbase-r serdes configuration and interrupt handling
        - refactored mv88e6393x_serdes_setup_errata
        - refactored mv88e6393x_port_policy_write
      - added patch implementing .port_set_policy for Amethyst
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4cb50d00
    • Marek Behún's avatar
      net: dsa: mv88e6xxx: implement .port_set_policy for Amethyst · 6584b260
      Marek Behún authored
      
      
      The 16-bit Port Policy CTL register from older chips is on 6393x changed
      to Port Policy MGMT CTL, which can access more data, but indirectly and
      via 8-bit registers.
      
      The original 16-bit value is divided into first two 8-bit register in
      the Port Policy MGMT CTL.
      
      We can therefore use the previous code to compute the mask and shift,
      and then
      - if 0 <= shift < 8, we access register 0 in Port Policy MGMT CTL
      - if 8 <= shift < 16, we access register 1 in Port Policy MGMT CTL
      
      There are in fact other possible policy settings for Amethyst which
      could be added here, but this can be done in the future.
      
      Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
      Reviewed-by: default avatarPavana Sharma <pavana.sharma@digi.com>
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6584b260
    • Pavana Sharma's avatar
      net: dsa: mv88e6xxx: add support for mv88e6393x family · de776d0d
      Pavana Sharma authored
      
      
      The Marvell 88E6393X device is a single-chip integration of a 11-port
      Ethernet switch with eight integrated Gigabit Ethernet (GbE)
      transceivers and three 10-Gigabit interfaces.
      
      This patch adds functionalities specific to mv88e6393x family (88E6393X,
      88E6193X and 88E6191X).
      
      The main differences between previous devices and this one are:
      - port 0 can be a SERDES port
      - all SERDESes are one-lane, eg. no XAUI nor RXAUI
      - on the other hand the SERDESes can do USXGMII, 10GBASER and 5GBASER
        (on 6191X only one SERDES is capable of more than 1g; USXGMII is not
        yet supported with this change)
      - Port Policy CTL register is changed to Port Policy MGMT CTL register,
        via which several more registers can be accessed indirectly
      - egress monitor port is configured differently
      - ingress monitor/CPU/mirror ports are configured differently and can be
        configured per port (ie. each port can have different ingress monitor
        port, for example)
      - port speed AltBit works differently than previously
      - PHY registers can be also accessed via MDIO address 0x18 and 0x19
        (on previous devices they could be accessed only via Global 2 offsets
         0x18 and 0x19, which means two indirections; this feature is not yet
         leveraged with thiis commit)
      
      Co-developed-by: default avatarAshkan Boldaji <ashkan.boldaji@digi.com>
      Signed-off-by: default avatarAshkan Boldaji <ashkan.boldaji@digi.com>
      Signed-off-by: default avatarPavana Sharma <pavana.sharma@digi.com>
      Co-developed-by: default avatarMarek Behún <kabel@kernel.org>
      Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      de776d0d
    • Marek Behún's avatar
      net: dsa: mv88e6xxx: wrap .set_egress_port method · 2fda45f0
      Marek Behún authored
      
      
      There are two implementations of the .set_egress_port method, and both
      of them, if successful, set chip->*gress_dest_port variable.
      
      To avoid code repetition, wrap this method into
      mv88e6xxx_set_egress_port.
      
      Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
      Reviewed-by: default avatarPavana Sharma <pavana.sharma@digi.com>
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2fda45f0
    • Pavana Sharma's avatar
      net: dsa: mv88e6xxx: change serdes lane parameter type from u8 type to int · 193c5b26
      Pavana Sharma authored
      
      
      Returning 0 is no more an error case with MV88E6393 family
      which has serdes lane numbers 0, 9 or 10.
      So with this change .serdes_get_lane will return lane number
      or -errno (-ENODEV or -EOPNOTSUPP).
      
      Signed-off-by: default avatarPavana Sharma <pavana.sharma@digi.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      193c5b26
    • dingsenjie's avatar
      ethernet/microchip:remove unneeded variable: "ret" · ac1bbf8a
      dingsenjie authored
      
      
      remove unneeded variable: "ret".
      
      Signed-off-by: default avatardingsenjie <dingsenjie@yulong.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ac1bbf8a