Commit 609d3bc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf, netfilter and can.

  Current release - regressions:

   - bpf: synchronize dispatcher update with bpf_dispatcher_xdp_func

   - rxrpc:
      - fix security setting propagation
      - fix null-deref in rxrpc_unuse_local()
      - fix switched parameters in peer tracing

  Current release - new code bugs:

   - rxrpc:
      - fix I/O thread startup getting skipped
      - fix locking issues in rxrpc_put_peer_locked()
      - fix I/O thread stop
      - fix uninitialised variable in rxperf server
      - fix the return value of rxrpc_new_incoming_call()

   - microchip: vcap: fix initialization of value and mask

   - nfp: fix unaligned io read of capabilities word

  Previous releases - regressions:

   - stop in-kernel socket users from corrupting socket's task_frag

   - stream: purge sk_error_queue in sk_stream_kill_queues()

   - openvswitch: fix flow lookup to use unmasked key

   - dsa: mv88e6xxx: avoid reg_lock deadlock in mv88e6xxx_setup_port()

   - devlink:
      - hold region lock when flushing snapshots
      - protect devlink dump by the instance lock

  Previous releases - always broken:

   - bpf:
      - prevent leak of lsm program after failed attach
      - resolve fext program type when checking map compatibility

   - skbuff: account for tail adjustment during pull operations

   - macsec: fix net device access prior to holding a lock

   - bonding: switch back when high prio link up

   - netfilter: flowtable: really fix NAT IPv6 offload

   - enetc: avoid buffer leaks on xdp_do_redirect() failure

   - unix: fix race in SOCK_SEQPACKET's unix_dgram_sendmsg()

   - dsa: microchip: remove IRQF_TRIGGER_FALLING in
     request_threaded_irq"

* tag 'net-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (64 commits)
  net: fec: check the return value of build_skb()
  net: simplify sk_page_frag
  Treewide: Stop corrupting socket's task_frag
  net: Introduce sk_use_task_frag in struct sock.
  mctp: Remove device type check at unregister
  net: dsa: microchip: remove IRQF_TRIGGER_FALLING in request_threaded_irq
  can: kvaser_usb: hydra: help gcc-13 to figure out cmd_len
  can: flexcan: avoid unbalanced pm_runtime_enable warning
  Documentation: devlink: add missing toc entry for etas_es58x devlink doc
  mctp: serial: Fix starting value for frame check sequence
  nfp: fix unaligned io read of capabilities word
  net: stream: purge sk_error_queue in sk_stream_kill_queues()
  myri10ge: Fix an error handling path in myri10ge_probe()
  net: microchip: vcap: Fix initialization of value and mask
  rxrpc: Fix the return value of rxrpc_new_incoming_call()
  rxrpc: rxperf: Fix uninitialised variable
  rxrpc: Fix I/O thread stop
  rxrpc: Fix switched parameters in peer tracing
  rxrpc: Fix locking issues in rxrpc_put_peer_locked()
  rxrpc: Fix I/O thread startup getting skipped
  ...
parents 878cf96f 19e72b06

Documentation/bpf/map_sk_storage.rst

+30 −26
Original line number Diff line number Diff line
@@ -34,13 +34,12 @@ bpf_sk_storage_get() 


   void *bpf_sk_storage_get(struct bpf_map *map, void *sk, void *value, u64 flags)



Socket-local storage can be retrieved using the ``bpf_sk_storage_get()``

helper. The helper gets the storage from ``sk`` that is associated with ``map``.

If the ``BPF_LOCAL_STORAGE_GET_F_CREATE`` flag is used then

``bpf_sk_storage_get()`` will create the storage for ``sk`` if it does not

already exist. ``value`` can be used together with

``BPF_LOCAL_STORAGE_GET_F_CREATE`` to initialize the storage value, otherwise it

will be zero initialized. Returns a pointer to the storage on success, or

Socket-local storage for ``map`` can be retrieved from socket ``sk`` using the

``bpf_sk_storage_get()`` helper. If the ``BPF_LOCAL_STORAGE_GET_F_CREATE``

flag is used then ``bpf_sk_storage_get()`` will create the storage for ``sk``

if it does not already exist. ``value`` can be used together with

``BPF_LOCAL_STORAGE_GET_F_CREATE`` to initialize the storage value, otherwise

it will be zero initialized. Returns a pointer to the storage on success, or

``NULL`` in case of failure.



.. note::
@@ -54,9 +53,9 @@ bpf_sk_storage_delete() 


   long bpf_sk_storage_delete(struct bpf_map *map, void *sk)



Socket-local storage can be deleted using the ``bpf_sk_storage_delete()``

helper. The helper deletes the storage from ``sk`` that is identified by

``map``. Returns ``0`` on success, or negative error in case of failure.

Socket-local storage for ``map`` can be deleted from socket ``sk`` using the

``bpf_sk_storage_delete()`` helper. Returns ``0`` on success, or negative

error in case of failure.



User space

----------
@@ -68,16 +67,20 @@ bpf_map_update_elem() 


   int bpf_map_update_elem(int map_fd, const void *key, const void *value, __u64 flags)



Socket-local storage for the socket identified by ``key`` belonging to

``map_fd`` can be added or updated using the ``bpf_map_update_elem()`` libbpf

function. ``key`` must be a pointer to a valid ``fd`` in the user space

program. The ``flags`` parameter can be used to control the update behaviour:

Socket-local storage for map ``map_fd`` can be added or updated locally to a

socket using the ``bpf_map_update_elem()`` libbpf function. The socket is

identified by a `socket` ``fd`` stored in the pointer ``key``. The pointer

``value`` has the data to be added or updated to the socket ``fd``. The type

and size of ``value`` should be the same as the value type of the map

definition.



- ``BPF_ANY`` will create storage for ``fd`` or update existing storage.

- ``BPF_NOEXIST`` will create storage for ``fd`` only if it did not already

  exist, otherwise the call will fail with ``-EEXIST``.

- ``BPF_EXIST`` will update existing storage for ``fd`` if it already exists,

  otherwise the call will fail with ``-ENOENT``.

The ``flags`` parameter can be used to control the update behaviour:



- ``BPF_ANY`` will create storage for `socket` ``fd`` or update existing storage.

- ``BPF_NOEXIST`` will create storage for `socket` ``fd`` only if it did not

  already exist, otherwise the call will fail with ``-EEXIST``.

- ``BPF_EXIST`` will update existing storage for `socket` ``fd`` if it already

  exists, otherwise the call will fail with ``-ENOENT``.



Returns ``0`` on success, or negative error in case of failure.
@@ -88,10 +91,10 @@ bpf_map_lookup_elem() 


   int bpf_map_lookup_elem(int map_fd, const void *key, void *value)



Socket-local storage for the socket identified by ``key`` belonging to

``map_fd`` can be retrieved using the ``bpf_map_lookup_elem()`` libbpf

function. ``key`` must be a pointer to a valid ``fd`` in the user space

program. Returns ``0`` on success, or negative error in case of failure.

Socket-local storage for map ``map_fd`` can be retrieved from a socket using

the ``bpf_map_lookup_elem()`` libbpf function. The storage is retrieved from

the socket identified by a `socket` ``fd`` stored in the pointer

``key``. Returns ``0`` on success, or negative error in case of failure.



bpf_map_delete_elem()

~~~~~~~~~~~~~~~~~~~~~
@@ -100,9 +103,10 @@ bpf_map_delete_elem() 


   int bpf_map_delete_elem(int map_fd, const void *key)



Socket-local storage for the socket identified by ``key`` belonging to

``map_fd`` can be deleted using the ``bpf_map_delete_elem()`` libbpf

function. Returns ``0`` on success, or negative error in case of failure.

Socket-local storage for map ``map_fd`` can be deleted from a socket using the

``bpf_map_delete_elem()`` libbpf function. The storage is deleted from the

socket identified by a `socket` ``fd`` stored in the pointer ``key``. Returns

``0`` on success, or negative error in case of failure.



Examples

========

Documentation/networking/devlink/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ parameters, info versions, and other features it supports. 
   :maxdepth: 1



   bnxt

   etas_es58x

   hns3

   ionic

   ice

Documentation/networking/nf_conntrack-sysctl.rst

+33 −0
Original line number Diff line number Diff line
@@ -163,6 +163,39 @@ nf_conntrack_timestamp - BOOLEAN 


	Enable connection tracking flow timestamping.



nf_conntrack_sctp_timeout_closed - INTEGER (seconds)

	default 10



nf_conntrack_sctp_timeout_cookie_wait - INTEGER (seconds)

	default 3



nf_conntrack_sctp_timeout_cookie_echoed - INTEGER (seconds)

	default 3



nf_conntrack_sctp_timeout_established - INTEGER (seconds)

	default 432000 (5 days)



nf_conntrack_sctp_timeout_shutdown_sent - INTEGER (seconds)

	default 0.3



nf_conntrack_sctp_timeout_shutdown_recd - INTEGER (seconds)

	default 0.3



nf_conntrack_sctp_timeout_shutdown_ack_sent - INTEGER (seconds)

	default 3



nf_conntrack_sctp_timeout_heartbeat_sent - INTEGER (seconds)

	default 30



	This timeout is used to setup conntrack entry on secondary paths.

	Default is set to hb_interval.



nf_conntrack_sctp_timeout_heartbeat_acked - INTEGER (seconds)

	default 210



	This timeout is used to setup conntrack entry on secondary paths.

	Default is set to (hb_interval * path_max_retrans + rto_max)



nf_conntrack_udp_timeout - INTEGER (seconds)

	default 30

drivers/block/drbd/drbd_receiver.c

+3 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,9 @@ static int conn_connect(struct drbd_connection *connection) 
	sock.socket->sk->sk_allocation = GFP_NOIO;

	msock.socket->sk->sk_allocation = GFP_NOIO;



	sock.socket->sk->sk_use_task_frag = false;

	msock.socket->sk->sk_use_task_frag = false;



	sock.socket->sk->sk_priority = TC_PRIO_INTERACTIVE_BULK;

	msock.socket->sk->sk_priority = TC_PRIO_INTERACTIVE;

drivers/block/nbd.c

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, 
	noreclaim_flag = memalloc_noreclaim_save();

	do {

		sock->sk->sk_allocation = GFP_NOIO | __GFP_MEMALLOC;

		sock->sk->sk_use_task_frag = false;

		msg.msg_name = NULL;

		msg.msg_namelen = 0;

		msg.msg_control = NULL;