1. 29 Jun, 2022 7 commits
  2. 28 Jun, 2022 23 commits
  3. 27 Jun, 2022 10 commits
    • Eric Dumazet's avatar
      ipmr: fix a lockdep splat in ipmr_rtm_dumplink() · 0fcae3c8
      Eric Dumazet authored
      vif_dev_read() should be used from RCU protected sections only.
      
      ipmr_rtm_dumplink() is holding RTNL, so the data structures
      can not be changed.
      
      syzbot reported:
      
      net/ipv4/ipmr.c:84 suspicious rcu_dereference_check() usage!
      
      other info that might help us debug this:
      
      rcu_scheduler_active = 2, debug_locks = 1
      1 lock held by syz-executor.4/3068:
      
      stack backtrace:
      CPU: 1 PID: 3068 Comm: syz-executor.4 Not tainted 5.19.0-rc3-syzkaller-00565-g5d04b0b6 #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
      Call Trace:
      <TASK>
      __dump_stack lib/dump_stack.c:88 [inline]
      dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106
      vif_dev_read net/ipv4/ipmr.c:84 [inline]
      vif_dev_read net/ipv4/ipmr.c:82 [inline]
      ipmr_fill_vif net/ipv4/ipmr.c:2756 [inline]
      ipmr_rtm_dumplink+0x1343/0x18c0 net/ipv4/ipmr.c:2866
      netlink_dump+0x541/0xc20 net/netlink/af_netlink.c:2275
      __netlink_dump_start+0x647/0x900 net/netlink/af_netlink.c:2380
      netlink_dump_start include/linux/netlink.h:245 [inline]
      rtnetlink_rcv_msg+0x73e/0xc90 net/core/rtnetlink.c:6046
      netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2501
      netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline]
      netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345
      netlink_sendmsg+0x917/0xe10 net/netlink/af_netlink.c:1921
      sock_sendmsg_nosec net/socket.c:714 [inline]
      sock_sendmsg+0xcf/0x120 net/socket.c:734
      ____sys_sendmsg+0x334/0x810 net/socket.c:2489
      ___sys_sendmsg+0xf3/0x170 net/socket.c:2543
      __sys_sendmmsg+0x195/0x470 net/socket.c:2629
      __do_sys_sendmmsg net/socket.c:2658 [inline]
      __se_sys_sendmmsg net/socket.c:2655 [inline]
      __x64_sys_sendmmsg+0x99/0x100 net/socket.c:2655
      do_syscall_x64 arch/x86/entry/common.c:50 [inline]
      do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
      entry_SYSCALL_64_after_hwframe+0x46/0xb0
      RIP: 0033:0x7fefd8a89109
      Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
      RSP: 002b:00007fefd9ca6168 EFLAGS: 00000246 ORIG_RAX: 0000000000000133
      RAX: ffffffffffffffda RBX: 00007fefd8b9bf60 RCX: 00007fefd8a89109
      RDX: 0000000004924b68 RSI: 0000000020000140 RDI: 0000000000000003
      RBP: 00007fefd8ae305d R08: 0000000000000000 R09: 0000000000000000
      R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
      R13: 00007ffc346febaf R14: 00007fefd9ca6300 R15: 0000000000022000
      </TASK>
      
      Fixes: ebc31979 ("ipmr: add rcu protection over (struct vif_device)->dev")
      Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0fcae3c8
    • Jilin Yuan's avatar
      sfc:falcon: fix repeated words in comments · bb4a0c88
      Jilin Yuan authored
      Delete the redundant word 'in'.
      Signed-off-by: default avatarJilin Yuan <yuanjilin@cdjrlc.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb4a0c88
    • Jilin Yuan's avatar
      sfc: fix repeated words in comments · 982a2b5f
      Jilin Yuan authored
      Delete the redundant word 'set'.
      Delete the redundant word 'a'.
      Delete the redundant word 'in'.
      Found the same error as before.
      Signed-off-by: default avatarJilin Yuan <yuanjilin@cdjrlc.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      982a2b5f
    • Subash Abhinov Kasiviswanathan's avatar
      net: Print hashed skb addresses for all net and qdisc events · 6deb209d
      Subash Abhinov Kasiviswanathan authored
      The following commits added support for printing the real address-
      65875073 ("net: use %px to print skb address in trace_netif_receive_skb")
      70713ddd ("net_sched: introduce tracepoint trace_qdisc_enqueue()")
      851f36e4 ("net_sched: use %px to print skb address in trace_qdisc_dequeue()")
      
      However, tracing the packet traversal shows a mix of hashes and real
      addresses. Pasting a sample trace for reference-
      
      ping-14249   [002] .....  3424.046612: netif_rx_entry: dev=lo napi_id=0x3 queue_mapping=0
      skbaddr=00000000dcbed83e vlan_tagged=0 vlan_proto=0x0000 vlan_tci=0x0000 protocol=0x0800
      ip_summed=0 hash=0x00000000 l4_hash=0 len=84 data_len=0 truesize=768 mac_header_valid=1
      mac_header=-14 nr_frags=0 gso_size=0 gso_type=0x0
      ping-14249   [002] .....  3424.046615: netif_rx: dev=lo skbaddr=ffffff888e5d1000 len=84
      
      Switch the trace print formats to %p for all the events to have a
      consistent format of printing the hashed addresses in all cases.
      Signed-off-by: default avatarSean Tranchetti <quic_stranche@quicinc.com>
      Signed-off-by: default avatarSubash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6deb209d
    • David S. Miller's avatar
      Merge tag 'linux-can-next-for-5.20-20220625' of... · 9dd094ee
      David S. Miller authored
      Merge tag 'linux-can-next-for-5.20-20220625' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2022-06-25
      
      this is a pull request of 22 patches for net-next/master.
      
      The first 2 patches target the xilinx driver. Srinivas Neeli's patch
      adds Transmitter Delay Compensation (TDC) support, a patch by me fixes
      a typo.
      
      The next patch is by me and fixes a typo in the m_can driver.
      
      Another patch by me allows the configuration of fixed bit rates
      without need for do_set_bittiming callback.
      
      The following 7 patches are by Vincent Mailhol and refactor the
      can-dev module and Kbuild, de-inline the can_dropped_invalid_skb()
      function, which has grown over the time, and drop outgoing skbs if the
      controller is in listen only mode.
      
      Max Staudt's patch fixes a reference in the networking/can.rst
      documentation.
      
      Vincent Mailhol provides 2 patches with cleanups for the etas_es58x
      driver.
      
      Conor Dooley adds bindings for the mpfs-can to the PolarFire SoC dtsi.
      
      Another patch by me allows the configuration of fixed data bit rates
      without need for do_set_data_bittiming callback.
      
      The last 5 patches are by Frank Jungclaus. They prepare the esd_usb
      driver to add support for the the CAN-USB/3 device in a later series.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9dd094ee
    • David S. Miller's avatar
      Merge branch 'Renesas-rz-n1' · c83bc86a
      David S. Miller authored
      Clément Léger says:
      
      ====================
      net: add support for Renesas RZ/N1 ethernet su
      
      The Renesas RZ/N1 SoCs features an ethernet subsystem which contains
      (most notably) a switch, two GMACs, and a MII converter [1]. This
      series adds support for the switch and the MII converter.
      
      The MII converter present on this SoC has been represented as a PCS
      which sit between the MACs and the PHY. This PCS driver is probed from
      the device-tree since it requires to be configured. Indeed the MII
      converter also contains the registers that are handling the muxing of
      ports (Switch, MAC, HSR, RTOS, etc) internally to the SoC.
      
      The switch driver is based on DSA and exposes 4 ports + 1 CPU
      management port. It include basic bridging support as well as FDB and
      statistics support.
      
      Link: [1] https://www.renesas.com/us/en/document/mah/rzn1d-group-rzn1s-group-rzn1l-group-users-manual-r-engine-and-ethernet-peripherals
      
      -----
      Changes in V9:
      - Cover letter:
        - Remove comment about RZN1 patches that are now in the master branch.
      - Commits:
        - Add Vladimir Oltean Reviewed-by
      - PCS:
        - Add "Depends on OF" for PCS_RZN1_MIIC due to error found by intel
          kernel test robot <lkp@intel.com>.
        - Check return value of of_property_read_u32() for
          "renesas,miic-switch-portin" property before setting conf.
        - Return miic_parse_dt() return value in miic_probe() on error
      - Switch:
        - Add "Depends on OF" for NET_DSA_RZN1_A5PSW due to errors found by
          intel kernel test robot <lkp@intel.com>.
      - DT:
        - Add spaces between switch port and '{'
      ====================
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c83bc86a
    • Clément Léger's avatar
      MAINTAINERS: add Renesas RZ/N1 switch related driver entry · 717a5c56
      Clément Léger authored
      After contributing the drivers, volunteer for maintenance and add
      myself as the maintainer for Renesas RZ/N1 switch related drivers.
      Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      717a5c56
    • Clément Léger's avatar
      ARM: dts: r9a06g032-rzn1d400-db: add switch description · 9aab31d6
      Clément Léger authored
      Add description for the switch, GMAC2 and MII converter. With these
      definitions, the switch port 0 and 1 (MII port 5 and 4) are working on
      RZ/N1D-DB board.
      Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9aab31d6
    • Clément Léger's avatar
      ARM: dts: r9a06g032: describe switch · cf9695d8
      Clément Léger authored
      Add description of the switch that is present on the RZ/N1 SoC. This
      description includes ethernet-ports description for all the ports that
      are present on the switch along with their connection to the MII
      converter ports and to the GMAC for the CPU port.
      Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
      Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cf9695d8
    • Clément Léger's avatar
      ARM: dts: r9a06g032: describe GMAC2 · 3f5261f1
      Clément Léger authored
      RZ/N1 SoC includes two MAC named GMACx that are compatible with the
      "snps,dwmac" driver. GMAC1 is connected directly to the MII converter
      port 1. GMAC2 however can be used as the MAC for the switch CPU
      management port or can be muxed to be connected directly to the MII
      converter port 2. This commit add description for the GMAC2 which will
      be used by the switch description.
      Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3f5261f1