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

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes, including fixes from netfilter, bpf, can and
  ieee802154.

  The size of this is pretty normal, but we got more fixes for 5.14
  changes this week than last week. Nothing major but the trend is the
  opposite of what we like. We'll see how the next week goes..

  Current release - regressions:

   - r8169: fix ASPM-related link-up regressions

   - bridge: fix flags interpretation for extern learn fdb entries

   - phy: micrel: fix link detection on ksz87xx switch

   - Revert "tipc: Return the correct errno code"

   - ptp: fix possible memory leak caused by invalid cast

  Current release - new code bugs:

   - bpf: add missing bpf_read_[un]lock_trace() for syscall program

   - bpf: fix potentially incorrect results with bpf_get_local_storage()

   - page_pool: mask the page->signature before the checking, avoid dma
     mapping leaks

   - netfilter: nfnetlink_hook: 5 fixes to information in netlink dumps

   - bnxt_en: fix firmware interface issues with PTP

   - mlx5: Bridge, fix ageing time

  Previous releases - regressions:

   - linkwatch: fix failure to restore device state across
     suspend/resume

   - bareudp: fix invalid read beyond skb's linear data

  Previous releases - always broken:

   - bpf: fix integer overflow involving bucket_size

   - ppp: fix issues when desired interface name is specified via
     netlink

   - wwan: mhi_wwan_ctrl: fix possible deadlock

   - dsa: microchip: ksz8795: fix number of VLAN related bugs

   - dsa: drivers: fix broken backpressure in .port_fdb_dump

   - dsa: qca: ar9331: make proper initial port defaults

  Misc:

   - bpf: add lockdown check for probe_write_user helper

   - netfilter: conntrack: remove offload_pickup sysctl before 5.14 is
     out

   - netfilter: conntrack: collect all entries in one cycle,
     heuristically slow down garbage collection scans on idle systems to
     prevent frequent wake ups"

* tag 'net-5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (87 commits)
  vsock/virtio: avoid potential deadlock when vsock device remove
  wwan: core: Avoid returning NULL from wwan_create_dev()
  net: dsa: sja1105: unregister the MDIO buses during teardown
  Revert "tipc: Return the correct errno code"
  net: mscc: Fix non-GPL export of regmap APIs
  net: igmp: increase size of mr_ifc_count
  MAINTAINERS: switch to my OMP email for Renesas Ethernet drivers
  tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets
  net: pcs: xpcs: fix error handling on failed to allocate memory
  net: linkwatch: fix failure to restore device state across suspend/resume
  net: bridge: fix memleak in br_add_if()
  net: switchdev: zero-initialize struct switchdev_notifier_fdb_info emitted by drivers towards the bridge
  net: bridge: fix flags interpretation for extern learn fdb entries
  net: dsa: sja1105: fix broken backpressure in .port_fdb_dump
  net: dsa: lantiq: fix broken backpressure in .port_fdb_dump
  net: dsa: lan9303: fix broken backpressure in .port_fdb_dump
  net: dsa: hellcreek: fix broken backpressure in .port_fdb_dump
  bpf, core: Fix kernel-doc notation
  net: igmp: fix data-race in igmp_ifc_timer_expire()
  net: Fix memory leak in ieee802154_raw_deliver
  ...
parents 3a03c67d a9a50701

Documentation/bpf/libbpf/libbpf_naming_convention.rst

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ This bump in ABI version is at most once per kernel development cycle. 


For example, if current state of ``libbpf.map`` is:



.. code-block:: c

.. code-block:: none



        LIBBPF_0.0.1 {

        	global:
@@ -121,7 +121,7 @@ For example, if current state of ``libbpf.map`` is: 
, and a new symbol ``bpf_func_c`` is being introduced, then

``libbpf.map`` should be changed like this:



.. code-block:: c

.. code-block:: none



        LIBBPF_0.0.1 {

        	global:

Documentation/networking/nf_conntrack-sysctl.rst

+0 −10
Original line number Diff line number Diff line
@@ -191,19 +191,9 @@ nf_flowtable_tcp_timeout - INTEGER (seconds) 
        TCP connections may be offloaded from nf conntrack to nf flow table.

        Once aged, the connection is returned to nf conntrack with tcp pickup timeout.



nf_flowtable_tcp_pickup - INTEGER (seconds)

        default 120



        TCP connection timeout after being aged from nf flow table offload.



nf_flowtable_udp_timeout - INTEGER (seconds)

        default 30



        Control offload timeout for udp connections.

        UDP connections may be offloaded from nf conntrack to nf flow table.

        Once aged, the connection is returned to nf conntrack with udp pickup timeout.
 


nf_flowtable_udp_pickup - INTEGER (seconds)

        default 30



        UDP connection timeout after being aged from nf flow table offload.

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -11327,7 +11327,7 @@ W: https://linuxtv.org 
T:	git git://linuxtv.org/media_tree.git

F:	drivers/media/radio/radio-maxiradio*









MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER









MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER









R:	Yasushi SHOJI <yashi@spacecubics.com>









L:	linux-can@vger.kernel.org









S:	Maintained








@@ -15803,7 +15803,7 @@ F:	Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml







F:	drivers/i2c/busses/i2c-emev2.c

















RENESAS ETHERNET DRIVERS









R:	Sergei Shtylyov <sergei.shtylyov@gmail.com>









R:	Sergey Shtylyov <s.shtylyov@omp.ru>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/net/renesas,*.yaml
































drivers/infiniband/hw/mlx5/cq.c



+1
−3






























Original line number
Diff line number
Diff line







@@ -945,7 +945,6 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,







	u32 *cqb = NULL;









	void *cqc;









	int cqe_size;









	unsigned int irqn;









	int eqn;









	int err;


















@@ -984,7 +983,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,







		INIT_WORK(&cq->notify_work, notify_soft_wc_handler);









	}



















	err = mlx5_vector2eqn(dev->mdev, vector, &eqn, &irqn);









	err = mlx5_vector2eqn(dev->mdev, vector, &eqn);









	if (err)









		goto err_cqb;


















@@ -1007,7 +1006,6 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,







		goto err_cqb;



















	mlx5_ib_dbg(dev, "cqn 0x%x\n", cq->mcq.cqn);









	cq->mcq.irqn = irqn;









	if (udata)









		cq->mcq.tasklet_ctx.comp = mlx5_ib_cq_comp;









	else
































drivers/infiniband/hw/mlx5/devx.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -975,7 +975,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)(







	struct mlx5_ib_dev *dev;









	int user_vector;









	int dev_eqn;









	unsigned int irqn;









	int err;



















	if (uverbs_copy_from(&user_vector, attrs,








@@ -987,7 +986,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)(







		return PTR_ERR(c);









	dev = to_mdev(c->ibucontext.device);



















	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn, &irqn);









	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn);









	if (err < 0)









		return err;