Commit 5ca26d60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from wireless and netfilter.

  The notable fixes here are the EEE fix which restores boot for many
  embedded platforms (real and QEMU); WiFi warning suppression and the
  ICE Kconfig cleanup.

  Current release - regressions:

   - phy: multiple fixes for EEE rework

   - wifi: wext: warn about usage only once

   - wifi: ath11k: allow system suspend to survive ath11k

  Current release - new code bugs:

   - mlx5: Fix memory leak in IPsec RoCE creation

   - ibmvnic: assign XPS map to correct queue index

  Previous releases - regressions:

   - netfilter: ip6t_rpfilter: Fix regression with VRF interfaces

   - netfilter: ctnetlink: make event listener tracking global

   - nf_tables: allow to fetch set elements when table has an owner

   - mlx5:
      - fix skb leak while fifo resync and push
      - fix possible ptp queue fifo use-after-free

  Previous releases - always broken:

   - sched: fix action bind logic

   - ptp: vclock: use mutex to fix "sleep on atomic" bug if driver also
     uses a mutex

   - netfilter: conntrack: fix rmmod double-free race

   - netfilter: xt_length: use skb len to match in length_mt6, avoid
     issues with BIG TCP

  Misc:

   - ice: remove unnecessary CONFIG_ICE_GNSS

   - mlx5e: remove hairpin write debugfs files

   - sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"

* tag 'net-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (53 commits)
  tcp: tcp_check_req() can be called from process context
  net: phy: c45: fix network interface initialization failures on xtensa, arm:cubieboard
  xen-netback: remove unused variables pending_idx and index
  net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy
  net: dsa: ocelot_ext: remove unnecessary phylink.h include
  net: mscc: ocelot: fix duplicate driver name error
  net: dsa: felix: fix internal MDIO controller resource length
  net: dsa: seville: ignore mscc-miim read errors from Lynx PCS
  net/sched: act_sample: fix action bind logic
  net/sched: act_mpls: fix action bind logic
  net/sched: act_pedit: fix action bind logic
  wifi: wext: warn about usage only once
  wifi: mt76: usb: fix use-after-free in mt76u_free_rx_queue
  qede: avoid uninitialized entries in coal_entry array
  nfc: fix memory leak of se_io context in nfc_genl_se_io
  ice: remove unnecessary CONFIG_ICE_GNSS
  net/sched: cls_api: Move call to tcf_exts_miss_cookie_base_destroy()
  ibmvnic: Assign XPS map to correct queue index
  docs: net: fix inaccuracies in msg_zerocopy.rst
  tools: net: add __pycache__ to gitignore
  ...
parents 98281842 580f98cc

Documentation/netlink/specs/netdev.yaml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ definitions: 
      -

        name: hw-offload

        doc:

         This feature informs if netdev supports XDP hw oflloading.

         This feature informs if netdev supports XDP hw offloading.

      -

        name: rx-sg

        doc:

Documentation/networking/msg_zerocopy.rst

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Opportunity and Caveats 


Copying large buffers between user process and kernel can be

expensive. Linux supports various interfaces that eschew copying,

such as sendpage and splice. The MSG_ZEROCOPY flag extends the

such as sendfile and splice. The MSG_ZEROCOPY flag extends the

underlying copy avoidance mechanism to common socket send calls.



Copy avoidance is not a free lunch. As implemented, with page pinning,
@@ -83,8 +83,8 @@ Pass the new flag. 
	ret = send(fd, buf, sizeof(buf), MSG_ZEROCOPY);



A zerocopy failure will return -1 with errno ENOBUFS. This happens if

the socket option was not set, the socket exceeds its optmem limit or

the user exceeds its ulimit on locked pages.

the socket exceeds its optmem limit or the user exceeds their ulimit on

locked pages.





Mixing copy avoidance and copying

drivers/mfd/ocelot-core.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static const struct mfd_cell vsc7512_devs[] = { 
		.num_resources = ARRAY_SIZE(vsc7512_miim1_resources),

		.resources = vsc7512_miim1_resources,

	}, {

		.name = "ocelot-switch",

		.name = "ocelot-ext-switch",

		.of_compatible = "mscc,vsc7512-switch",

		.num_resources = ARRAY_SIZE(vsc7512_switch_resources),

		.resources = vsc7512_switch_resources,

drivers/net/dsa/ocelot/felix_vsc9959.c

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static const char * const vsc9959_resource_names[TARGET_MAX] = { 
 * SGMII/QSGMII MAC PCS can be found.

 */

static const struct resource vsc9959_imdio_res =

	DEFINE_RES_MEM_NAMED(0x8030, 0x8040, "imdio");

	DEFINE_RES_MEM_NAMED(0x8030, 0x10, "imdio");



static const struct reg_field vsc9959_regfields[REGFIELD_MAX] = {

	[ANA_ADVLEARN_VLAN_CHK] = REG_FIELD(ANA_ADVLEARN, 6, 6),

drivers/net/dsa/ocelot/ocelot_ext.c

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */



#include <linux/mfd/ocelot.h>

#include <linux/phylink.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <soc/mscc/ocelot.h>
@@ -149,7 +148,7 @@ MODULE_DEVICE_TABLE(of, ocelot_ext_switch_of_match); 


static struct platform_driver ocelot_ext_switch_driver = {

	.driver = {

		.name = "ocelot-switch",

		.name = "ocelot-ext-switch",

		.of_match_table = of_match_ptr(ocelot_ext_switch_of_match),

	},

	.probe = ocelot_ext_probe,