Commit 8a28a0b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from ipsec, bpf, mptcp and netfilter.

  Current release - regressions:

   - netfilter: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain

   - eth: mlx5e:
      - fix scheduling of IPsec ASO query while in atomic
      - free IRQ rmap and notifier on kernel shutdown

  Current release - new code bugs:

   - phy: manual remove LEDs to ensure correct ordering

  Previous releases - regressions:

   - mptcp: fix possible divide by zero in recvmsg()

   - dsa: revert "net: phy: dp83867: perform soft reset and retain
     established link"

  Previous releases - always broken:

   - sched: netem: acquire qdisc lock in netem_change()

   - bpf:
      - fix verifier id tracking of scalars on spill
      - fix NULL dereference on exceptions
      - accept function names that contain dots

   - netfilter: disallow element updates of bound anonymous sets

   - mptcp: ensure listener is unhashed before updating the sk status

   - xfrm:
      - add missed call to delete offloaded policies
      - fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets

   - selftests: fixes for FIPS mode

   - dsa: mt7530: fix multiple CPU ports, BPDU and LLDP handling

   - eth: sfc: use budget for TX completions

  Misc:

   - wifi: iwlwifi: add support for SO-F device with PCI id 0x7AF0"

* tag 'net-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (74 commits)
  revert "net: align SO_RCVMARK required privileges with SO_MARK"
  net: wwan: iosm: Convert single instance struct member to flexible array
  sch_netem: acquire qdisc lock in netem_change()
  selftests: forwarding: Fix race condition in mirror installation
  wifi: mac80211: report all unusable beacon frames
  mptcp: ensure listener is unhashed before updating the sk status
  mptcp: drop legacy code around RX EOF
  mptcp: consolidate fallback and non fallback state machine
  mptcp: fix possible list corruption on passive MPJ
  mptcp: fix possible divide by zero in recvmsg()
  mptcp: handle correctly disconnect() failures
  bpf: Force kprobe multi expected_attach_type for kprobe_multi link
  bpf/btf: Accept function names that contain dots
  Revert "net: phy: dp83867: perform soft reset and retain established link"
  net: mdio: fix the wrong parameters
  netfilter: nf_tables: Fix for deleting base chains with payload
  netfilter: nfnetlink_osf: fix module autoload
  netfilter: nf_tables: drop module reference after updating chain
  netfilter: nf_tables: disallow timeout for anonymous sets
  netfilter: nf_tables: disallow updates of anonymous sets
  ...
parents 412d070b 2ba7e7eb

MAINTAINERS

+6 −4
Original line number Diff line number Diff line
@@ -9972,8 +9972,9 @@ M: Miquel Raynal <miquel.raynal@bootlin.com> 
L:	linux-wpan@vger.kernel.org

S:	Maintained

W:	https://linux-wpan.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git

Q:	https://patchwork.kernel.org/project/linux-wpan/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git

F:	Documentation/networking/ieee802154.rst

F:	drivers/net/ieee802154/

F:	include/linux/ieee802154.h
@@ -13269,10 +13270,11 @@ F: drivers/memory/mtk-smi.c 
F:	include/soc/mediatek/smi.h









MEDIATEK SWITCH DRIVER









M:	Sean Wang <sean.wang@mediatek.com>









M:	Arınç ÜNAL <arinc.unal@arinc9.com>









M:	Daniel Golle <daniel@makrotopia.org>









M:	Landen Chao <Landen.Chao@mediatek.com>









M:	DENG Qingfang <dqfext@gmail.com>









M:	Daniel Golle <daniel@makrotopia.org>









M:	Sean Wang <sean.wang@mediatek.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/dsa/mt7530-mdio.c
































arch/x86/net/bpf_jit_comp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2570,7 +2570,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)







	}



















	if (bpf_jit_enable > 1)









		bpf_jit_dump(prog->len, proglen, pass + 1, image);









		bpf_jit_dump(prog->len, proglen, pass + 1, rw_image);



















	if (image) {









		if (!prog->is_func || extra_pass) {
































drivers/net/dsa/mt7530.c



+38
−10






























Original line number
Diff line number
Diff line







@@ -399,6 +399,20 @@ static void mt7530_pll_setup(struct mt7530_priv *priv)







	core_set(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);









}



















/* If port 6 is available as a CPU port, always prefer that as the default,









 * otherwise don't care.









 */









static struct dsa_port *









mt753x_preferred_default_local_cpu_port(struct dsa_switch *ds)









{









	struct dsa_port *cpu_dp = dsa_to_port(ds, 6);



















	if (dsa_port_is_cpu(cpu_dp))









		return cpu_dp;



















	return NULL;









}



















/* Setup port 6 interface mode and TRGMII TX circuit */









static int









mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)








@@ -985,6 +999,18 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)







	mutex_unlock(&priv->reg_mutex);









}



















static void









mt753x_trap_frames(struct mt7530_priv *priv)









{









	/* Trap BPDUs to the CPU port(s) */









	mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,









		   MT753X_BPDU_CPU_ONLY);



















	/* Trap LLDP frames with :0E MAC DA to the CPU port(s) */









	mt7530_rmw(priv, MT753X_RGAC2, MT753X_R0E_PORT_FW_MASK,









		   MT753X_R0E_PORT_FW(MT753X_BPDU_CPU_ONLY));









}



















static int









mt753x_cpu_port_enable(struct dsa_switch *ds, int port)









{








@@ -1007,9 +1033,16 @@ mt753x_cpu_port_enable(struct dsa_switch *ds, int port)







		   UNU_FFP(BIT(port)));



















	/* Set CPU port number */









	if (priv->id == ID_MT7621)









	if (priv->id == ID_MT7530 || priv->id == ID_MT7621)









		mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));



















	/* Add the CPU port to the CPU port bitmap for MT7531 and the switch on









	 * the MT7988 SoC. Trapped frames will be forwarded to the CPU port that









	 * is affine to the inbound user port.









	 */









	if (priv->id == ID_MT7531 || priv->id == ID_MT7988)









		mt7530_set(priv, MT7531_CFC, MT7531_CPU_PMAP(BIT(port)));



















	/* CPU port gets connected to all user ports of









	 * the switch.









	 */








@@ -2255,6 +2288,8 @@ mt7530_setup(struct dsa_switch *ds)

















	priv->p6_interface = PHY_INTERFACE_MODE_NA;



















	mt753x_trap_frames(priv);



















	/* Enable and reset MIB counters */









	mt7530_mib_reset(ds);


















@@ -2352,17 +2387,9 @@ static int







mt7531_setup_common(struct dsa_switch *ds)









{









	struct mt7530_priv *priv = ds->priv;









	struct dsa_port *cpu_dp;









	int ret, i;



















	/* BPDU to CPU port */









	dsa_switch_for_each_cpu_port(cpu_dp, ds) {









		mt7530_rmw(priv, MT7531_CFC, MT7531_CPU_PMAP_MASK,









			   BIT(cpu_dp->index));









		break;









	}









	mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,









		   MT753X_BPDU_CPU_ONLY);









	mt753x_trap_frames(priv);



















	/* Enable and reset MIB counters */









	mt7530_mib_reset(ds);








@@ -3085,6 +3112,7 @@ static int mt7988_setup(struct dsa_switch *ds)







const struct dsa_switch_ops mt7530_switch_ops = {









	.get_tag_protocol	= mtk_get_tag_protocol,









	.setup			= mt753x_setup,









	.preferred_default_local_cpu_port = mt753x_preferred_default_local_cpu_port,









	.get_strings		= mt7530_get_strings,









	.get_ethtool_stats	= mt7530_get_ethtool_stats,









	.get_sset_count		= mt7530_get_sset_count,
































drivers/net/dsa/mt7530.h



+6
−0






























Original line number
Diff line number
Diff line







@@ -54,6 +54,7 @@ enum mt753x_id {







#define  MT7531_MIRROR_PORT_GET(x)	(((x) >> 16) & MIRROR_MASK)









#define  MT7531_MIRROR_PORT_SET(x)	(((x) & MIRROR_MASK) << 16)









#define  MT7531_CPU_PMAP_MASK		GENMASK(7, 0)









#define  MT7531_CPU_PMAP(x)		FIELD_PREP(MT7531_CPU_PMAP_MASK, x)



















#define MT753X_MIRROR_REG(id)		((((id) == ID_MT7531) || ((id) == ID_MT7988)) ?	\









					 MT7531_CFC : MT7530_MFC)








@@ -66,6 +67,11 @@ enum mt753x_id {







#define MT753X_BPC			0x24









#define  MT753X_BPDU_PORT_FW_MASK	GENMASK(2, 0)



















/* Register for :03 and :0E MAC DA frame control */









#define MT753X_RGAC2			0x2c









#define  MT753X_R0E_PORT_FW_MASK	GENMASK(18, 16)









#define  MT753X_R0E_PORT_FW(x)		FIELD_PREP(MT753X_R0E_PORT_FW_MASK, x)



















enum mt753x_bpdu_port_fw {









	MT753X_BPDU_FOLLOW_MFC,









	MT753X_BPDU_CPU_EXCLUDE = 4,
































drivers/net/ethernet/emulex/benet/be_main.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -1135,8 +1135,8 @@ static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter,







	eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ?









						VLAN_ETH_HLEN : ETH_HLEN;









	if (skb->len <= 60 &&









	    (lancer_chip(adapter) || skb_vlan_tag_present(skb)) &&









	    is_ipv4_pkt(skb)) {









	    (lancer_chip(adapter) || BE3_chip(adapter) ||









	     skb_vlan_tag_present(skb)) && is_ipv4_pkt(skb)) {









		ip = (struct iphdr *)ip_hdr(skb);









		pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len));









	}