Commit eb2eb516 authored Feb 03, 2022 by Linus Torvalds

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

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

  Current release - regressions:

   - Partially revert "net/smc: Add netlink net namespace support", fix
     uABI breakage

   - netfilter:
      - nft_ct: fix use after free when attaching zone template
      - nft_byteorder: track register operations

  Previous releases - regressions:

   - ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback

   - phy: qca8081: fix speeds lower than 2.5Gb/s

   - sched: fix use-after-free in tc_new_tfilter()

  Previous releases - always broken:

   - tcp: fix mem under-charging with zerocopy sendmsg()

   - tcp: add missing tcp_skb_can_collapse() test in
     tcp_shift_skb_data()

   - neigh: do not trigger immediate probes on NUD_FAILED from
     neigh_managed_work, avoid a deadlock

   - bpf: use VM_MAP instead of VM_ALLOC for ringbuf, avoid KASAN
     false-positives

   - netfilter: nft_reject_bridge: fix for missing reply from prerouting

   - smc: forward wakeup to smc socket waitqueue after fallback

   - ieee802154:
      - return meaningful error codes from the netlink helpers
      - mcr20a: fix lifs/sifs periods
      - at86rf230, ca8210: stop leaking skbs on error paths

   - macsec: add missing un-offload call for NETDEV_UNREGISTER of parent

   - ax25: add refcount in ax25_dev to avoid UAF bugs

   - eth: mlx5e:
      - fix SFP module EEPROM query
      - fix broken SKB allocation in HW-GRO
      - IPsec offload: fix tunnel mode crypto for non-TCP/UDP flows

   - eth: amd-xgbe:
      - fix skb data length underflow
      - ensure reset of the tx_timer_active flag, avoid Tx timeouts

   - eth: stmmac: fix runtime pm use in stmmac_dvr_remove()

   - eth: e1000e: handshake with CSME starts from Alder Lake platforms"

* tag 'net-5.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (69 commits)
  ax25: fix reference count leaks of ax25_dev
  net: stmmac: ensure PTP time register reads are consistent
  net: ipa: request IPA register values be retained
  dt-bindings: net: qcom,ipa: add optional qcom,qmp property
  tools/resolve_btfids: Do not print any commands when building silently
  bpf: Use VM_MAP instead of VM_ALLOC for ringbuf
  net, neigh: Do not trigger immediate probes on NUD_FAILED from neigh_managed_work
  tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data()
  net: sparx5: do not refer to skb after passing it on
  Partially revert "net/smc: Add netlink net namespace support"
  net/mlx5e: Avoid field-overflowing memcpy()
  net/mlx5e: Use struct_group() for memcpy() region
  net/mlx5e: Avoid implicit modify hdr for decap drop rule
  net/mlx5e: IPsec: Fix tunnel mode crypto offload for non TCP/UDP traffic
  net/mlx5e: IPsec: Fix crypto offload for non TCP/UDP encapsulated traffic
  net/mlx5e: Don't treat small ceil values as unlimited in HTB offload
  net/mlx5: E-Switch, Fix uninitialized variable modact
  net/mlx5e: Fix handling of wrong devices during bond netevent
  net/mlx5e: Fix broken SKB allocation in HW-GRO
  net/mlx5e: Fix wrong calculation of header index in HW_GRO
  ...

parents 551007a8 87563a04

Documentation/devicetree/bindings/net/qcom,ipa.yaml

+6 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,10 @@ properties:
		- const: imem
		- const: config

		qcom,qmp:
		$ref: /schemas/types.yaml#/definitions/phandle
		description: phandle to the AOSS side-channel message RAM

		qcom,smem-states:
		$ref: /schemas/types.yaml#/definitions/phandle-array
		description: State bits used in by the AP to signal the modem.
		@@ -222,6 +226,8 @@ examples:
		"imem",
		"config";

		qcom,qmp = <&aoss_qmp>;

		qcom,smem-states = <&ipa_smp2p_out 0>,
		<&ipa_smp2p_out 1>;
		qcom,smem-state-names = "ipa-clock-enabled-valid",

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -4157,9 +4157,8 @@ N: csky
		K: csky

		CA8210 IEEE-802.15.4 RADIO DRIVER
		M: Harry Morris <h.morris@cascoda.com>
		L: linux-wpan@vger.kernel.org
		S: Maintained
		S: Orphan
		W: https://github.com/Cascoda/ca8210-linux.git
		F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
		F: drivers/net/ieee802154/ca8210.c

drivers/net/dsa/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ config NET_DSA_LANTIQ_GSWIP
		config NET_DSA_MT7530
		tristate "MediaTek MT753x and MT7621 Ethernet switch support"
		select NET_DSA_TAG_MTK
		select MEDIATEK_GE_PHY
		help
		This enables support for the MediaTek MT7530, MT7531, and MT7621
		Ethernet switch chips.

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,9 @@ static void xgbe_stop_timers(struct xgbe_prv_data *pdata)
		if (!channel->tx_ring)
		break;

		/* Deactivate the Tx timer */
		del_timer_sync(&channel->tx_timer);
		channel->tx_timer_active = 0;
		}
		}

		@@ -2550,6 +2552,14 @@ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
		buf2_len = xgbe_rx_buf2_len(rdata, packet, len);
		len += buf2_len;

		if (buf2_len > rdata->rx.buf.dma_len) {
		/* Hardware inconsistency within the descriptors
		* that has resulted in a length underflow.
		*/
		error = 1;
		goto skip_data;
		}

		if (!skb) {
		skb = xgbe_create_skb(pdata, napi, rdata,
		buf1_len);
		@@ -2579,8 +2589,10 @@ static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
		if (!last \|\| context_next)
		goto read_again;

		if (!skb)
		if (!skb \|\| error) {
		dev_kfree_skb(skb);
		goto next_packet;
		}

		/* Be sure we don't exceed the configured MTU */
		max_len = netdev->mtu + ETH_HLEN;

drivers/net/ethernet/google/gve/gve_adminq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ static int gve_adminq_parse_err(struct gve_priv *priv, u32 status)
		*/
		static int gve_adminq_kick_and_wait(struct gve_priv *priv)
		{
		u32 tail, head;
		int tail, head;
		int i;

		tail = ioread32be(&priv->reg_bar0->adminq_event_counter);