Commit cba9ffdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from CAN, netfilter, wireguard and IPsec.

  I'd like to highlight [ lowlight? - Linus ] Florian W stepping down as
  a netfilter maintainer due to constant stream of bug reports. Not sure
  what we can do but IIUC this is not the first such case.

  Current release - regressions:

   - rxrpc: fix use of page_frag_alloc_align(), it changed semantics and
     we added a new caller in a different subtree

   - xfrm: allow UDP encapsulation only in offload modes

  Current release - new code bugs:

   - tcp: fix refcnt handling in __inet_hash_connect()

   - Revert "net: Re-use and set mono_delivery_time bit for userspace
     tstamp packets", conflicted with some expectations in BPF uAPI

  Previous releases - regressions:

   - ipv4: raw: fix sending packets from raw sockets via IPsec tunnels

   - devlink: fix devlink's parallel command processing

   - veth: do not manipulate GRO when using XDP

   - esp: fix bad handling of pages from page_pool

  Previous releases - always broken:

   - report RCU QS for busy network kthreads (with Paul McK's blessing)

   - tcp/rds: fix use-after-free on netns with kernel TCP reqsk

   - virt: vmxnet3: fix missing reserved tailroom with XDP

  Misc:

   - couple of build fixes for Documentation"

* tag 'net-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (59 commits)
  selftests: forwarding: Fix ping failure due to short timeout
  MAINTAINERS: step down as netfilter maintainer
  netfilter: nf_tables: Fix a memory leak in nf_tables_updchain
  net: dsa: mt7530: fix handling of all link-local frames
  net: dsa: mt7530: fix link-local frames that ingress vlan filtering ports
  bpf: report RCU QS in cpumap kthread
  net: report RCU QS on threaded NAPI repolling
  rcu: add a helper to report consolidated flavor QS
  ionic: update documentation for XDP support
  lib/bitmap: Fix bitmap_scatter() and bitmap_gather() kernel doc
  netfilter: nf_tables: do not compare internal table flags on updates
  netfilter: nft_set_pipapo: release elements in clone only from destroy path
  octeontx2-af: Use separate handlers for interrupts
  octeontx2-pf: Send UP messages to VF only when VF is up.
  octeontx2-pf: Use default max_active works instead of one
  octeontx2-pf: Wait till detach_resources msg is complete
  octeontx2: Detect the mbox up or down message via register
  devlink: fix port new reply cmd type
  tcp: Clear req->syncookie in reqsk_alloc().
  net/bnx2x: Prevent access to a freed page in page_pool
  ...
parents 1d35aae7 f99c5f56

Documentation/networking/device_drivers/ethernet/pensando/ionic.rst

+22 −0
Original line number Diff line number Diff line
@@ -99,6 +99,12 @@ Minimal SR-IOV support is currently offered and can be enabled by setting 
the sysfs 'sriov_numvfs' value, if supported by your particular firmware

configuration.



XDP

---



Support for XDP includes the basics, plus Jumbo frames, Redirect and

ndo_xmit.  There is no current support for zero-copy sockets or HW offload.



Statistics

==========
@@ -138,6 +144,12 @@ Driver port specific:: 
     rx_csum_none: 0

     rx_csum_complete: 3

     rx_csum_error: 0

     xdp_drop: 0

     xdp_aborted: 0

     xdp_pass: 0

     xdp_tx: 0

     xdp_redirect: 0

     xdp_frames: 0



Driver queue specific::
@@ -149,9 +161,12 @@ Driver queue specific:: 
     tx_0_frags: 0

     tx_0_tso: 0

     tx_0_tso_bytes: 0

     tx_0_hwstamp_valid: 0

     tx_0_hwstamp_invalid: 0

     tx_0_csum_none: 3

     tx_0_csum: 0

     tx_0_vlan_inserted: 0

     tx_0_xdp_frames: 0

     rx_0_pkts: 2

     rx_0_bytes: 120

     rx_0_dma_map_err: 0
@@ -159,8 +174,15 @@ Driver queue specific:: 
     rx_0_csum_none: 0

     rx_0_csum_complete: 0

     rx_0_csum_error: 0

     rx_0_hwstamp_valid: 0

     rx_0_hwstamp_invalid: 0

     rx_0_dropped: 0

     rx_0_vlan_stripped: 0

     rx_0_xdp_drop: 0

     rx_0_xdp_aborted: 0

     rx_0_xdp_pass: 0

     rx_0_xdp_tx: 0

     rx_0_xdp_redirect: 0



Firmware port specific::

Documentation/networking/multi-pf-netdev.rst

+29 −29
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ all using the same instance under "priv->mdev". 


Observability

=============

The relation between PF, irq, napi, and queue can be observed via netlink spec:

The relation between PF, irq, napi, and queue can be observed via netlink spec::



  $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump queue-get --json='{"ifindex": 13}'

  [{'id': 0, 'ifindex': 13, 'napi-id': 539, 'type': 'rx'},
@@ -108,7 +108,7 @@ $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml --dump n 
   {'id': 540, 'ifindex': 13, 'irq': 39},

   {'id': 539, 'ifindex': 13, 'irq': 36}]



Here you can clearly observe our channels distribution policy:

Here you can clearly observe our channels distribution policy::



  $ ls /proc/irq/{36,39,40,41,42}/mlx5* -d -1

  /proc/irq/36/mlx5_comp1@pci:0000:08:00.0

Documentation/networking/net_cachelines/net_device.rst

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ struct_dev_ifalias* ifalias 
unsigned_long                       mem_end                                                         

unsigned_long                       mem_start                                                       

unsigned_long                       base_addr                                                       

unsigned_long                       state                                                           

unsigned_long                       state                   read_mostly         read_mostly         netif_running(dev)

struct_list_head                    dev_list                                                        

struct_list_head                    napi_list                                                       

struct_list_head                    unreg_list

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -15237,7 +15237,6 @@ F: drivers/net/ethernet/neterion/ 
NETFILTER

M:	Pablo Neira Ayuso <pablo@netfilter.org>

M:	Jozsef Kadlecsik <kadlec@netfilter.org>

M:	Florian Westphal <fw@strlen.de>

L:	netfilter-devel@vger.kernel.org

L:	coreteam@netfilter.org

S:	Maintained

drivers/net/can/kvaser_pciefd.c

+2 −2
Original line number Diff line number Diff line
@@ -370,8 +370,8 @@ static const struct kvaser_pciefd_irq_mask kvaser_pciefd_sf2_irq_mask = { 


static const struct kvaser_pciefd_irq_mask kvaser_pciefd_xilinx_irq_mask = {

	.kcan_rx0 = BIT(4),

	.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19) },

	.all = GENMASK(19, 16) | BIT(4),

	.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19), BIT(20), BIT(21), BIT(22), BIT(23) },

	.all = GENMASK(23, 16) | BIT(4),

};



static const struct kvaser_pciefd_dev_ops kvaser_pciefd_altera_dev_ops = {