1. 27 Jan, 2023 1 commit
  2. 26 Jan, 2023 4 commits
  3. 25 Jan, 2023 13 commits
  4. 24 Jan, 2023 17 commits
    • Paolo Abeni's avatar
      Revert "Merge branch 'ethtool-mac-merge'" · d968117a
      Paolo Abeni authored
      This reverts commit 0ad999c1, reversing
      changes made to e38553bd.
      
      It was not intended for net.
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      d968117a
    • Kuniyuki Iwashima's avatar
      netrom: Fix use-after-free of a listening socket. · 409db27e
      Kuniyuki Iwashima authored
      syzbot reported a use-after-free in do_accept(), precisely nr_accept()
      as sk_prot_alloc() allocated the memory and sock_put() frees it. [0]
      
      The issue could happen if the heartbeat timer is fired and
      nr_heartbeat_expiry() calls nr_destroy_socket(), where a socket
      has SOCK_DESTROY or a listening socket has SOCK_DEAD.
      
      In this case, the first condition cannot be true.  SOCK_DESTROY is
      flagged in nr_release() only when the file descriptor is close()d,
      but accept() is being called for the listening socket, so the second
      condition must be true.
      
      Usually, the AF_NETROM listener neither starts timers nor sets
      SOCK_DEAD.  However, the condition is met if connect() fails before
      listen().  connect() starts the t1 timer and heartbeat timer, and
      t1timer calls nr_disconnect() when timeout happens.  Then, SOCK_DEAD
      is set, and if we call listen(), the heartbeat timer calls
      nr_destroy_socket().
      
        nr_connect
          nr_establish_data_link(sk)
            nr_start_t1timer(sk)
          nr_start_heartbeat(sk)
                                          nr_t1timer_expiry
                                            nr_disconnect(sk, ETIMEDOUT)
                                              nr_sk(sk)->state = NR_STATE_0
                                              sk->sk_state = TCP_CLOSE
                                              sock_set_flag(sk, SOCK_DEAD)
      nr_listen
        if (sk->sk_state != TCP_LISTEN)
          sk->sk_state = TCP_LISTEN
                                          nr_heartbeat_expiry
                                            switch (nr->state)
                                            case NR_STATE_0
                                              if (sk->sk_state == TCP_LISTEN &&
                                                  sock_flag(sk, SOCK_DEAD))
                                                nr_destroy_socket(sk)
      
      This path seems expected, and nr_destroy_socket() is called to clean
      up resources.  Initially, there was sock_hold() before nr_destroy_socket()
      so that the socket would not be freed, but the commit 517a16b1
      ("netrom: Decrease sock refcount when sock timers expire") accidentally
      removed it.
      
      To fix use-after-free, let's add sock_hold().
      
      [0]:
      BUG: KASAN: use-after-free in do_accept+0x483/0x510 net/socket.c:1848
      Read of size 8 at addr ffff88807978d398 by task syz-executor.3/5315
      
      CPU: 0 PID: 5315 Comm: syz-executor.3 Not tainted 6.2.0-rc3-syzkaller-00165-gd9fc1511 #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022
      Call Trace:
       <TASK>
       __dump_stack lib/dump_stack.c:88 [inline]
       dump_stack_lvl+0xd1/0x138 lib/dump_stack.c:106
       print_address_description mm/kasan/report.c:306 [inline]
       print_report+0x15e/0x461 mm/kasan/report.c:417
       kasan_report+0xbf/0x1f0 mm/kasan/report.c:517
       do_accept+0x483/0x510 net/socket.c:1848
       __sys_accept4_file net/socket.c:1897 [inline]
       __sys_accept4+0x9a/0x120 net/socket.c:1927
       __do_sys_accept net/socket.c:1944 [inline]
       __se_sys_accept net/socket.c:1941 [inline]
       __x64_sys_accept+0x75/0xb0 net/socket.c:1941
       do_syscall_x64 arch/x86/entry/common.c:50 [inline]
       do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80
       entry_SYSCALL_64_after_hwframe+0x63/0xcd
      RIP: 0033:0x7fa436a8c0c9
      Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 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:00007fa437784168 EFLAGS: 00000246 ORIG_RAX: 000000000000002b
      RAX: ffffffffffffffda RBX: 00007fa436bac050 RCX: 00007fa436a8c0c9
      RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000005
      RBP: 00007fa436ae7ae9 R08: 0000000000000000 R09: 0000000000000000
      R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
      R13: 00007ffebc6700df R14: 00007fa437784300 R15: 0000000000022000
       </TASK>
      
      Allocated by task 5294:
       kasan_save_stack+0x22/0x40 mm/kasan/common.c:45
       kasan_set_track+0x25/0x30 mm/kasan/common.c:52
       ____kasan_kmalloc mm/kasan/common.c:371 [inline]
       ____kasan_kmalloc mm/kasan/common.c:330 [inline]
       __kasan_kmalloc+0xa3/0xb0 mm/kasan/common.c:380
       kasan_kmalloc include/linux/kasan.h:211 [inline]
       __do_kmalloc_node mm/slab_common.c:968 [inline]
       __kmalloc+0x5a/0xd0 mm/slab_common.c:981
       kmalloc include/linux/slab.h:584 [inline]
       sk_prot_alloc+0x140/0x290 net/core/sock.c:2038
       sk_alloc+0x3a/0x7a0 net/core/sock.c:2091
       nr_create+0xb6/0x5f0 net/netrom/af_netrom.c:433
       __sock_create+0x359/0x790 net/socket.c:1515
       sock_create net/socket.c:1566 [inline]
       __sys_socket_create net/socket.c:1603 [inline]
       __sys_socket_create net/socket.c:1588 [inline]
       __sys_socket+0x133/0x250 net/socket.c:1636
       __do_sys_socket net/socket.c:1649 [inline]
       __se_sys_socket net/socket.c:1647 [inline]
       __x64_sys_socket+0x73/0xb0 net/socket.c:1647
       do_syscall_x64 arch/x86/entry/common.c:50 [inline]
       do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80
       entry_SYSCALL_64_after_hwframe+0x63/0xcd
      
      Freed by task 14:
       kasan_save_stack+0x22/0x40 mm/kasan/common.c:45
       kasan_set_track+0x25/0x30 mm/kasan/common.c:52
       kasan_save_free_info+0x2b/0x40 mm/kasan/generic.c:518
       ____kasan_slab_free mm/kasan/common.c:236 [inline]
       ____kasan_slab_free+0x13b/0x1a0 mm/kasan/common.c:200
       kasan_slab_free include/linux/kasan.h:177 [inline]
       __cache_free mm/slab.c:3394 [inline]
       __do_kmem_cache_free mm/slab.c:3580 [inline]
       __kmem_cache_free+0xcd/0x3b0 mm/slab.c:3587
       sk_prot_free net/core/sock.c:2074 [inline]
       __sk_destruct+0x5df/0x750 net/core/sock.c:2166
       sk_destruct net/core/sock.c:2181 [inline]
       __sk_free+0x175/0x460 net/core/sock.c:2192
       sk_free+0x7c/0xa0 net/core/sock.c:2203
       sock_put include/net/sock.h:1991 [inline]
       nr_heartbeat_expiry+0x1d7/0x460 net/netrom/nr_timer.c:148
       call_timer_fn+0x1da/0x7c0 kernel/time/timer.c:1700
       expire_timers+0x2c6/0x5c0 kernel/time/timer.c:1751
       __run_timers kernel/time/timer.c:2022 [inline]
       __run_timers kernel/time/timer.c:1995 [inline]
       run_timer_softirq+0x326/0x910 kernel/time/timer.c:2035
       __do_softirq+0x1fb/0xadc kernel/softirq.c:571
      
      Fixes: 517a16b1 ("netrom: Decrease sock refcount when sock timers expire")
      Reported-by: syzbot+5fafd5cfe1fc91f6b352@syzkaller.appspotmail.com
      Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
      Link: https://lore.kernel.org/r/20230120231927.51711-1-kuniyu@amazon.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      409db27e
    • Sriram Yagnaraman's avatar
      netfilter: conntrack: unify established states for SCTP paths · a44b7651
      Sriram Yagnaraman authored
      An SCTP endpoint can start an association through a path and tear it
      down over another one. That means the initial path will not see the
      shutdown sequence, and the conntrack entry will remain in ESTABLISHED
      state for 5 days.
      
      By merging the HEARTBEAT_ACKED and ESTABLISHED states into one
      ESTABLISHED state, there remains no difference between a primary or
      secondary path. The timeout for the merged ESTABLISHED state is set to
      210 seconds (hb_interval * max_path_retrans + rto_max). So, even if a
      path doesn't see the shutdown sequence, it will expire in a reasonable
      amount of time.
      
      With this change in place, there is now more than one state from which
      we can transition to ESTABLISHED, COOKIE_ECHOED and HEARTBEAT_SENT, so
      handle the setting of ASSURED bit whenever a state change has happened
      and the new state is ESTABLISHED. Removed the check for dir==REPLY since
      the transition to ESTABLISHED can happen only in the reply direction.
      
      Fixes: 9fb9cbb1 ("[NETFILTER]: Add nf_conntrack subsystem.")
      Signed-off-by: default avatarSriram Yagnaraman <sriram.yagnaraman@est.tech>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      a44b7651
    • Sriram Yagnaraman's avatar
      Revert "netfilter: conntrack: add sctp DATA_SENT state" · 13bd9b31
      Sriram Yagnaraman authored
      This reverts commit (bff3d053: "netfilter: conntrack: add sctp
      DATA_SENT state")
      
      Using DATA/SACK to detect a new connection on secondary/alternate paths
      works only on new connections, while a HEARTBEAT is required on
      connection re-use. It is probably consistent to wait for HEARTBEAT to
      create a secondary connection in conntrack.
      Signed-off-by: default avatarSriram Yagnaraman <sriram.yagnaraman@est.tech>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      13bd9b31
    • Sriram Yagnaraman's avatar
      netfilter: conntrack: fix bug in for_each_sctp_chunk · 98ee0077
      Sriram Yagnaraman authored
      skb_header_pointer() will return NULL if offset + sizeof(_sch) exceeds
      skb->len, so this offset < skb->len test is redundant.
      
      if sch->length == 0, this will end up in an infinite loop, add a check
      for sch->length > 0
      
      Fixes: 9fb9cbb1 ("[NETFILTER]: Add nf_conntrack subsystem.")
      Suggested-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarSriram Yagnaraman <sriram.yagnaraman@est.tech>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      98ee0077
    • Sriram Yagnaraman's avatar
      netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE · a9993591
      Sriram Yagnaraman authored
      RFC 9260, Sec 8.5.1 states that for ABORT/SHUTDOWN_COMPLETE, the chunk
      MUST be accepted if the vtag of the packet matches its own tag and the
      T bit is not set OR if it is set to its peer's vtag and the T bit is set
      in chunk flags. Otherwise the packet MUST be silently dropped.
      
      Update vtag verification for ABORT/SHUTDOWN_COMPLETE based on the above
      description.
      
      Fixes: 9fb9cbb1 ("[NETFILTER]: Add nf_conntrack subsystem.")
      Signed-off-by: default avatarSriram Yagnaraman <sriram.yagnaraman@est.tech>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      a9993591
    • Jakub Kicinski's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue · 208a2110
      Jakub Kicinski authored
      Tony Nguyen says:
      
      ====================
      Intel Wired LAN Driver Updates 2023-01-20 (iavf)
      
      This series contains updates to iavf driver only.
      
      Michal Schmidt converts single iavf workqueue to per adapter to avoid
      deadlock issues.
      
      Marcin moves setting of VLAN related netdev features to watchdog task to
      avoid RTNL deadlock.
      
      Stefan Assmann schedules immediate watchdog task execution on changing
      primary MAC to avoid excessive delay.
      
      * '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
        iavf: schedule watchdog immediately when changing primary MAC
        iavf: Move netdev_update_features() into watchdog task
        iavf: fix temporary deadlock and failure to set MAC address
      ====================
      
      Link: https://lore.kernel.org/r/20230120211036.430946-1-anthony.l.nguyen@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      208a2110
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf · 571cca79
      Jakub Kicinski authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      1) Fix overlap detection in rbtree set backend: Detect overlap by going
         through the ordered list of valid tree nodes. To shorten the number of
         visited nodes in the list, this algorithm descends the tree to search
         for an existing element greater than the key value to insert that is
         greater than the new element.
      
      2) Fix for the rbtree set garbage collector: Skip inactive and busy
         elements when checking for expired elements to avoid interference
         with an ongoing transaction from control plane.
      
      This is a rather large fix coming at this stage of the 6.2-rc. Since
      33c7aba0 ("netfilter: nf_tables: do not set up extensions for end
      interval"), bogus overlap errors in the rbtree set occur more frequently.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
        netfilter: nft_set_rbtree: skip elements in transaction from garbage collection
        netfilter: nft_set_rbtree: Switch to node list walk for overlap detection
      ====================
      
      Link: https://lore.kernel.org/r/20230123211601.292930-1-pablo@netfilter.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      571cca79
    • Mat Martineau's avatar
      MAINTAINERS: Update MPTCP maintainer list and CREDITS · bce4affe
      Mat Martineau authored
      My responsibilities at Intel have changed, so I'm handing off exclusive
      MPTCP subsystem maintainer duties to Matthieu. It has been a privilege
      to see MPTCP through its initial upstreaming and first few years in the
      upstream kernel!
      Acked-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
      Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Link: https://lore.kernel.org/r/20230120231121.36121-1-mathew.j.martineau@linux.intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      bce4affe
    • Alexandru Tachici's avatar
      net: ethernet: adi: adin1110: Fix multicast offloading · 8a4f6d02
      Alexandru Tachici authored
      Driver marked broadcast/multicast frames as offloaded incorrectly.
      Mark them as offloaded only when HW offloading has been enabled.
      This should happen only for ADIN2111 when both ports are bridged
      by the software.
      
      Fixes: bc93e19d ("net: ethernet: adi: Add ADIN1110 support")
      Signed-off-by: default avatarAlexandru Tachici <alexandru.tachici@analog.com>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Link: https://lore.kernel.org/r/20230120090846.18172-1-alexandru.tachici@analog.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      8a4f6d02
    • Ahmad Fatoum's avatar
      net: dsa: microchip: fix probe of I2C-connected KSZ8563 · 360fdc99
      Ahmad Fatoum authored
      Starting with commit eee16b14 ("net: dsa: microchip: perform the
      compatibility check for dev probed"), the KSZ switch driver now bails
      out if it thinks the DT compatible doesn't match the actual chip ID
      read back from the hardware:
      
        ksz9477-switch 1-005f: Device tree specifies chip KSZ9893 but found
        KSZ8563, please fix it!
      
      For the KSZ8563, which used ksz_switch_chips[KSZ9893], this was fine
      at first, because it indeed shares the same chip id as the KSZ9893.
      
      Commit b4490809 ("net: dsa: microchip: add separate struct
      ksz_chip_data for KSZ8563 chip") started differentiating KSZ9893
      compatible chips by consulting the 0x1F register. The resulting breakage
      was fixed for the SPI driver in the same commit by introducing the
      appropriate ksz_switch_chips[KSZ8563], but not for the I2C driver.
      
      Fix this for I2C-connected KSZ8563 now to get it probing again.
      
      Fixes: b4490809 ("net: dsa: microchip: add separate struct ksz_chip_data for KSZ8563 chip").
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
      Acked-by: default avatarArun Ramadoss <arun.ramadoss@microchip.com>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Link: https://lore.kernel.org/r/20230120110933.1151054-1-a.fatoum@pengutronix.deSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      360fdc99
    • Eric Dumazet's avatar
      ipv4: prevent potential spectre v1 gadget in fib_metrics_match() · 5e9398a2
      Eric Dumazet authored
      if (!type)
              continue;
          if (type > RTAX_MAX)
              return false;
          ...
          fi_val = fi->fib_metrics->metrics[type - 1];
      
      @type being used as an array index, we need to prevent
      cpu speculation or risk leaking kernel memory content.
      
      Fixes: 5f9ae3d9 ("ipv4: do metrics match when looking up and deleting a route")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Link: https://lore.kernel.org/r/20230120133140.3624204-1-edumazet@google.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      5e9398a2
    • Eric Dumazet's avatar
      ipv4: prevent potential spectre v1 gadget in ip_metrics_convert() · 1d1d63b6
      Eric Dumazet authored
      if (!type)
      		continue;
      	if (type > RTAX_MAX)
      		return -EINVAL;
      	...
      	metrics[type - 1] = val;
      
      @type being used as an array index, we need to prevent
      cpu speculation or risk leaking kernel memory content.
      
      Fixes: 6cf9dfd3 ("net: fib: move metrics parsing to a helper")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Link: https://lore.kernel.org/r/20230120133040.3623463-1-edumazet@google.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      1d1d63b6
    • Jakub Kicinski's avatar
      Merge branch 'netlink-annotate-various-data-races' · d6ab640c
      Jakub Kicinski authored
      Eric Dumazet says:
      
      ====================
      netlink: annotate various data races
      
      A recent syzbot report came to my attention.
      
      After addressing it, I also fixed other related races.
      ====================
      
      Link: https://lore.kernel.org/r/20230120125955.3453768-1-edumazet@google.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      d6ab640c
    • Eric Dumazet's avatar
      netlink: annotate data races around sk_state · 9b663b5c
      Eric Dumazet authored
      netlink_getsockbyportid() reads sk_state while a concurrent
      netlink_connect() can change its value.
      
      Fixes: 1da177e4 ("Linux-2.6.12-rc2")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      9b663b5c
    • Eric Dumazet's avatar
      netlink: annotate data races around dst_portid and dst_group · 004db64d
      Eric Dumazet authored
      netlink_getname(), netlink_sendmsg() and netlink_getsockbyportid()
      can read nlk->dst_portid and nlk->dst_group while another
      thread is changing them.
      
      Fixes: 1da177e4 ("Linux-2.6.12-rc2")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      004db64d
    • Eric Dumazet's avatar
      netlink: annotate data races around nlk->portid · c1bb9484
      Eric Dumazet authored
      syzbot reminds us netlink_getname() runs locklessly [1]
      
      This first patch annotates the race against nlk->portid.
      
      Following patches take care of the remaining races.
      
      [1]
      BUG: KCSAN: data-race in netlink_getname / netlink_insert
      
      write to 0xffff88814176d310 of 4 bytes by task 2315 on cpu 1:
      netlink_insert+0xf1/0x9a0 net/netlink/af_netlink.c:583
      netlink_autobind+0xae/0x180 net/netlink/af_netlink.c:856
      netlink_sendmsg+0x444/0x760 net/netlink/af_netlink.c:1895
      sock_sendmsg_nosec net/socket.c:714 [inline]
      sock_sendmsg net/socket.c:734 [inline]
      ____sys_sendmsg+0x38f/0x500 net/socket.c:2476
      ___sys_sendmsg net/socket.c:2530 [inline]
      __sys_sendmsg+0x19a/0x230 net/socket.c:2559
      __do_sys_sendmsg net/socket.c:2568 [inline]
      __se_sys_sendmsg net/socket.c:2566 [inline]
      __x64_sys_sendmsg+0x42/0x50 net/socket.c:2566
      do_syscall_x64 arch/x86/entry/common.c:50 [inline]
      do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80
      entry_SYSCALL_64_after_hwframe+0x63/0xcd
      
      read to 0xffff88814176d310 of 4 bytes by task 2316 on cpu 0:
      netlink_getname+0xcd/0x1a0 net/netlink/af_netlink.c:1144
      __sys_getsockname+0x11d/0x1b0 net/socket.c:2026
      __do_sys_getsockname net/socket.c:2041 [inline]
      __se_sys_getsockname net/socket.c:2038 [inline]
      __x64_sys_getsockname+0x3e/0x50 net/socket.c:2038
      do_syscall_x64 arch/x86/entry/common.c:50 [inline]
      do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80
      entry_SYSCALL_64_after_hwframe+0x63/0xcd
      
      value changed: 0x00000000 -> 0xc9a49780
      
      Reported by Kernel Concurrency Sanitizer on:
      CPU: 0 PID: 2316 Comm: syz-executor.2 Not tainted 6.2.0-rc3-syzkaller-00030-ge8f60cd7-dirty #0
      Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022
      
      Fixes: 1da177e4 ("Linux-2.6.12-rc2")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      c1bb9484
  5. 23 Jan, 2023 5 commits
    • Pablo Neira Ayuso's avatar
      netfilter: nft_set_rbtree: skip elements in transaction from garbage collection · 5d235d6c
      Pablo Neira Ayuso authored
      Skip interference with an ongoing transaction, do not perform garbage
      collection on inactive elements. Reset annotated previous end interval
      if the expired element is marked as busy (control plane removed the
      element right before expiration).
      
      Fixes: 8d8540c4 ("netfilter: nft_set_rbtree: add timeout support")
      Reviewed-by: default avatarStefano Brivio <sbrivio@redhat.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      5d235d6c
    • Pablo Neira Ayuso's avatar
      netfilter: nft_set_rbtree: Switch to node list walk for overlap detection · c9e6978e
      Pablo Neira Ayuso authored
      ...instead of a tree descent, which became overly complicated in an
      attempt to cover cases where expired or inactive elements would affect
      comparisons with the new element being inserted.
      
      Further, it turned out that it's probably impossible to cover all those
      cases, as inactive nodes might entirely hide subtrees consisting of a
      complete interval plus a node that makes the current insertion not
      overlap.
      
      To speed up the overlap check, descent the tree to find a greater
      element that is closer to the key value to insert. Then walk down the
      node list for overlap detection. Starting the overlap check from
      rb_first() unconditionally is slow, it takes 10 times longer due to the
      full linear traversal of the list.
      
      Moreover, perform garbage collection of expired elements when walking
      down the node list to avoid bogus overlap reports.
      
      For the insertion operation itself, this essentially reverts back to the
      implementation before commit 7c84d414 ("netfilter: nft_set_rbtree:
      Detect partial overlaps on insertion"), except that cases of complete
      overlap are already handled in the overlap detection phase itself, which
      slightly simplifies the loop to find the insertion point.
      
      Based on initial patch from Stefano Brivio, including text from the
      original patch description too.
      
      Fixes: 7c84d414 ("netfilter: nft_set_rbtree: Detect partial overlaps on insertion")
      Reviewed-by: default avatarStefano Brivio <sbrivio@redhat.com>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      c9e6978e
    • Gergely Risko's avatar
      ipv6: fix reachability confirmation with proxy_ndp · 9f535c87
      Gergely Risko authored
      When proxying IPv6 NDP requests, the adverts to the initial multicast
      solicits are correct and working.  On the other hand, when later a
      reachability confirmation is requested (on unicast), no reply is sent.
      
      This causes the neighbor entry expiring on the sending node, which is
      mostly a non-issue, as a new multicast request is sent.  There are
      routers, where the multicast requests are intentionally delayed, and in
      these environments the current implementation causes periodic packet
      loss for the proxied endpoints.
      
      The root cause is the erroneous decrease of the hop limit, as this
      is checked in ndisc.c and no answer is generated when it's 254 instead
      of the correct 255.
      
      Cc: stable@vger.kernel.org
      Fixes: 46c7655f ("ipv6: decrease hop limit counter in ip6_forward()")
      Signed-off-by: default avatarGergely Risko <gergely.risko@gmail.com>
      Tested-by: default avatarGergely Risko <gergely.risko@gmail.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9f535c87
    • David S. Miller's avatar
      Merge branch 'ethtool-mac-merge' · 0ad999c1
      David S. Miller authored
      Vladimir Oltean say:
      
      ====================
      ethtool support for IEEE 802.3 MAC Merge layer
      
      Change log
      ----------
      
      v3->v4:
      - add missing opening bracket in ocelot_port_mm_irq()
      - moved cfg.verify_time range checking so that it actually takes place
        for the updated rather than old value
      v3 at:
      https://patchwork.kernel.org/project/netdevbpf/cover/20230117085947.2176464-1-vladimir.oltean@nxp.com/
      
      v2->v3:
      - made get_mm return int instead of void
      - deleted ETHTOOL_A_MM_SUPPORTED
      - renamed ETHTOOL_A_MM_ADD_FRAG_SIZE to ETHTOOL_A_MM_TX_MIN_FRAG_SIZE
      - introduced ETHTOOL_A_MM_RX_MIN_FRAG_SIZE
      - cleaned up documentation
      - rebased on top of PLCA changes
      - renamed ETHTOOL_STATS_SRC_* to ETHTOOL_MAC_STATS_SRC_*
      v2 at:
      https://patchwork.kernel.org/project/netdevbpf/cover/20230111161706.1465242-1-vladimir.oltean@nxp.com/
      
      v1->v2:
      I've decided to focus just on the MAC Merge layer for now, which is why
      I am able to submit this patch set as non-RFC.
      v1 (RFC) at:
      https://patchwork.kernel.org/project/netdevbpf/cover/20220816222920.1952936-1-vladimir.oltean@nxp.com/
      
      What is being introduced
      ------------------------
      
      TL;DR: a MAC Merge layer as defined by IEEE 802.3-2018, clause 99
      (interspersing of express traffic). This is controlled through ethtool
      netlink (ETHTOOL_MSG_MM_GET, ETHTOOL_MSG_MM_SET). The raw ethtool
      commands are posted here:
      https://patchwork.kernel.org/project/netdevbpf/cover/20230111153638.1454687-1-vladimir.oltean@nxp.com/
      
      The MAC Merge layer has its own statistics counters
      (ethtool --include-statistics --show-mm swp0) as well as two member
      MACs, the statistics of which can be queried individually, through a new
      ethtool netlink attribute, corresponding to:
      
      $ ethtool -I --show-pause eno2 --src aggregate
      $ ethtool -S eno2 --groups eth-mac eth-phy eth-ctrl rmon -- --src pmac
      
      The core properties of the MAC Merge layer are described in great detail
      in patches 02/12 and 03/12. They can be viewed in "make htmldocs" format.
      
      Devices for which the API is supported
      --------------------------------------
      
      I decided to start with the Ethernet switch on NXP LS1028A (Felix)
      because of the smaller patch set. I also have support for the ENETC
      controller pending.
      
      I would like to get confirmation that the UAPI being proposed here will
      not restrict any use cases known by other hardware vendors.
      
      Why is support for preemptible traffic classes not here?
      --------------------------------------------------------
      
      There is legitimate concern whether the 802.1Q portion of the standard
      (which traffic classes go to the eMAC and which to the pMAC) should be
      modeled in Linux using tc or using another UAPI. I think that is
      stalling the entire series, but should be discussed separately instead.
      Removing FP adminStatus support makes me confident enough to submit this
      patch set without an RFC tag (meaning: I wouldn't mind if it was merged
      as is).
      
      What is submitted here is sufficient for an LLDP daemon to do its job.
      I've patched openlldp to advertise and configure frame preemption:
      https://github.com/vladimiroltean/openlldp/tree/frame-preemption-v3
      
      In case someone wants to try it out, here are some commands I've used.
      
       # Configure the interfaces to receive and transmit LLDP Data Units
       lldptool -L -i eno0 adminStatus=rxtx
       lldptool -L -i swp0 adminStatus=rxtx
       # Enable the transmission of certain TLVs on switch's interface
       lldptool -T -i eno0 -V addEthCap enableTx=yes
       lldptool -T -i swp0 -V addEthCap enableTx=yes
       # Query LLDP statistics on switch's interface
       lldptool -S -i swp0
       # Query the received neighbor TLVs
       lldptool -i swp0 -t -n -V addEthCap
       Additional Ethernet Capabilities TLV
               Preemption capability supported
               Preemption capability enabled
               Preemption capability active
               Additional fragment size: 60 octets
      
      So using this patch set, lldpad will be able to advertise and configure
      frame preemption, but still, no data packet will be sent as preemptible
      over the link, because there is no UAPI to control which traffic classes
      are sent as preemptible and which as express.
      
      Preemptable or preemptible?
      ---------------------------
      
      IEEE 802.3 uses "preemptable" throughout. IEEE 802.1Q uses "preemptible"
      throughout. Because the definition of "preemptible" falls under 802.1Q's
      jurisdiction and 802.3 just references it, I went with the 802.1Q naming
      even where supporting an 802.3 feature. Also, checkpatch agrees with this.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0ad999c1
    • Vladimir Oltean's avatar
      net: ethtool: netlink: introduce ethnl_update_bool() · 7c494a77
      Vladimir Oltean authored
      Due to the fact that the kernel-side data structures have been carried
      over from the ioctl-based ethtool, we are now in the situation where we
      have an ethnl_update_bool32() function, but the plain function that
      operates on a boolean value kept in an actual u8 netlink attribute
      doesn't exist.
      
      With new ethtool features that are exposed solely over netlink, the
      kernel data structures will use the "bool" type, so we will need this
      kind of helper. Introduce it now; it's needed for things like
      verify-disabled for the MAC merge configuration.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7c494a77