1. 13 May, 2023 12 commits
  2. 12 May, 2023 24 commits
  3. 11 May, 2023 4 commits
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · bc88ba0c
      Jakub Kicinski authored
      Cross-merge networking fixes. No conflicts.
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      bc88ba0c
    • Linus Torvalds's avatar
      Merge tag 'net-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 6e27831b
      Linus Torvalds authored
      Pull networking fixes from Paolo Abeni:
       "Including fixes from netfilter.
      
        Current release - regressions:
      
         - mtk_eth_soc: fix NULL pointer dereference
      
        Previous releases - regressions:
      
         - core:
            - skb_partial_csum_set() fix against transport header magic value
            - fix load-tearing on sk->sk_stamp in sock_recv_cmsgs().
            - annotate sk->sk_err write from do_recvmmsg()
            - add vlan_get_protocol_and_depth() helper
      
         - netlink: annotate accesses to nlk->cb_running
      
         - netfilter: always release netdev hooks from notifier
      
        Previous releases - always broken:
      
         - core: deal with most data-races in sk_wait_event()
      
         - netfilter: fix possible bug_on with enable_hooks=1
      
         - eth: bonding: fix send_peer_notif overflow
      
         - eth: xpcs: fix incorrect number of interfaces
      
         - eth: ipvlan: fix out-of-bounds caused by unclear skb->cb
      
         - eth: stmmac: Initialize MAC_ONEUS_TIC_COUNTER register"
      
      * tag 'net-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (31 commits)
        af_unix: Fix data races around sk->sk_shutdown.
        af_unix: Fix a data race of sk->sk_receive_queue->qlen.
        net: datagram: fix data-races in datagram_poll()
        net: mscc: ocelot: fix stat counter register values
        ipvlan:Fix out-of-bounds caused by unclear skb->cb
        docs: networking: fix x25-iface.rst heading & index order
        gve: Remove the code of clearing PBA bit
        tcp: add annotations around sk->sk_shutdown accesses
        net: add vlan_get_protocol_and_depth() helper
        net: pcs: xpcs: fix incorrect number of interfaces
        net: deal with most data-races in sk_wait_event()
        net: annotate sk->sk_err write from do_recvmmsg()
        netlink: annotate accesses to nlk->cb_running
        kselftest: bonding: add num_grat_arp test
        selftests: forwarding: lib: add netns support for tc rule handle stats get
        Documentation: bonding: fix the doc of peer_notif_delay
        bonding: fix send_peer_notif overflow
        net: ethernet: mtk_eth_soc: fix NULL pointer dereference
        selftests: nft_flowtable.sh: check ingress/egress chain too
        selftests: nft_flowtable.sh: monitor result file sizes
        ...
      6e27831b
    • Linus Torvalds's avatar
      Merge tag 'media/v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 691e1eee
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
      
       - fix some unused-variable warning in mtk-mdp3
      
       - ignore unused suspend operations in nxp
      
       - some driver fixes in rcar-vin
      
      * tag 'media/v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        media: platform: mtk-mdp3: work around unused-variable warning
        media: nxp: ignore unused suspend operations
        media: rcar-vin: Select correct interrupt mode for V4L2_FIELD_ALTERNATE
        media: rcar-vin: Fix NV12 size alignment
        media: rcar-vin: Gen3 can not scale NV12
      691e1eee
    • Paolo Abeni's avatar
      Merge branch 'net-mvneta-reduce-size-of-tso-header-allocation' · 285b2a46
      Paolo Abeni authored
      Russell King says:
      
      ====================
      net: mvneta: reduce size of TSO header allocation
      
      With reference to
      https://forum.turris.cz/t/random-kernel-exceptions-on-hbl-tos-7-0/18865/
      https://github.com/openwrt/openwrt/pull/12375#issuecomment-1528842334
      
      It appears that mvneta attempts an order-6 allocation for the TSO
      header memory. While this succeeds early on in the system's life time,
      trying order-6 allocations later can result in failure due to memory
      fragmentation.
      
      Firstly, the reason it's so large is that we take the number of
      transmit descriptors, and allocate a TSO header buffer for each, and
      each TSO header is 256 bytes. The driver uses a simple mechanism to
      determine the address - it uses the transmit descriptor index as an
      index into the TSO header memory.
      
      	(The first obvious question is: do there need to be this
      	many? Won't each TSO header always have at least one bit
      	of data to go with it? In other words, wouldn't the maximum
      	number of TSO headers that a ring could accept be the number
      	of ring entries divided by 2?)
      
      There is no real need for this memory to be an order-6 allocation,
      since nothing in hardware requires this buffer to be contiguous.
      
      Therefore, this series splits this order-6 allocation up into 32
      order-1 allocations (8k pages on 4k page platforms), each giving
      32 TSO headers per page.
      
      In order to do this, these patches:
      
      1) fix a horrible transmit path error-cleanup bug - the existing
         code unmaps from the first descriptor that was allocated at
         interface bringup, not the first descriptor that the packet
         is using, resulting in the wrong descriptors being unmapped.
      
      2) since xdp support was added, we now have buf->type which indicates
         what this transmit buffer contains. Use this to mark TSO header
         buffers.
      
      3) get rid of IS_TSO_HEADER(), instead using buf->type to determine
         whether this transmit buffer needs to be DMA-unmapped.
      
      4) move tso_build_hdr() into mvneta_tso_put_hdr() to keep all the
         TSO header building code together.
      
      5) split the TSO header allocation into chunks of order-1 pages.
      
      This has now been tested by the Turris folk and has been found to fix
      the allocation error.
      ====================
      
      Link: https://lore.kernel.org/r/ZFtuhJOC03qpASt2@shell.armlinux.org.ukSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      285b2a46