Commit 88a5af94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.12-rc8, including fixes from netfilter, and
  bpf. BPF verifier changes stand out, otherwise things have slowed
  down.

  Current release - regressions:

   - gro: ensure frag0 meets IP header alignment

   - Revert "net: stmmac: re-init rx buffers when mac resume back"

   - ethernet: macb: fix the restore of cmp registers

  Previous releases - regressions:

   - ixgbe: Fix NULL pointer dereference in ethtool loopback test

   - ixgbe: fix unbalanced device enable/disable in suspend/resume

   - phy: marvell: fix detection of PHY on Topaz switches

   - make tcp_allowed_congestion_control readonly in non-init netns

   - xen-netback: Check for hotplug-status existence before watching

  Previous releases - always broken:

   - bpf: mitigate a speculative oob read of up to map value size by
     tightening the masking window

   - sctp: fix race condition in sctp_destroy_sock

   - sit, ip6_tunnel: Unregister catch-all devices

   - netfilter: nftables: clone set element expression template

   - netfilter: flowtable: fix NAT IPv6 offload mangling

   - net: geneve: check skb is large enough for IPv4/IPv6 header

   - netlink: don't call ->netlink_bind with table lock held"

* tag 'net-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (52 commits)
  netlink: don't call ->netlink_bind with table lock held
  MAINTAINERS: update my email
  bpf: Update selftests to reflect new error states
  bpf: Tighten speculative pointer arithmetic mask
  bpf: Move sanitize_val_alu out of op switch
  bpf: Refactor and streamline bounds check into helper
  bpf: Improve verifier error messages for users
  bpf: Rework ptr_limit into alu_limit and add common error path
  bpf: Ensure off_reg has no mixed signed bounds for all types
  bpf: Move off_reg into sanitize_ptr_alu
  bpf: Use correct permission flag for mixed signed bounds arithmetic
  ch_ktls: do not send snd_una update to TCB in middle
  ch_ktls: tcb close causes tls connection failure
  ch_ktls: fix device connection close
  ch_ktls: Fix kernel panic
  i40e: fix the panic when running bpf in xdpdrv mode
  net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta
  net/mlx5e: Fix setting of RS FEC mode
  net/mlx5: Fix setting of devlink traps in switchdev mode
  Revert "net: stmmac: re-init rx buffers when mac resume back"
  ...
parents bdfd99e6 f2764bd4

Documentation/networking/ip-sysctl.rst

+0 −15
Original line number Diff line number Diff line
@@ -1849,21 +1849,6 @@ ip6frag_low_thresh - INTEGER 
ip6frag_time - INTEGER

	Time in seconds to keep an IPv6 fragment in memory.



IPv6 Segment Routing:



seg6_flowlabel - INTEGER

	Controls the behaviour of computing the flowlabel of outer

	IPv6 header in case of SR T.encaps



	 == =======================================================

	 -1  set flowlabel to zero.

	  0  copy flowlabel from Inner packet in case of Inner IPv6

	     (Set flowlabel to 0 in case IPv4/L2)

	  1  Compute the flowlabel using seg6_make_flowlabel()

	 == =======================================================



	Default is 0.



``conf/default/*``:

	Change the interface-specific default settings.

Documentation/networking/seg6-sysctl.rst

+13 −0
Original line number Diff line number Diff line
@@ -24,3 +24,16 @@ seg6_require_hmac - INTEGER 
	* 1 - Drop SR packets without HMAC, validate SR packets with HMAC



	Default is 0.



seg6_flowlabel - INTEGER

	Controls the behaviour of computing the flowlabel of outer

	IPv6 header in case of SR T.encaps



	 == =======================================================

	 -1  set flowlabel to zero.

	  0  copy flowlabel from Inner packet in case of Inner IPv6

	     (Set flowlabel to 0 in case IPv4/L2)

	  1  Compute the flowlabel using seg6_make_flowlabel()

	 == =======================================================



	Default is 0.

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7096,7 +7096,7 @@ S: Maintained 
F:	drivers/i2c/busses/i2c-cpm.c









FREESCALE IMX / MXC FEC DRIVER









M:	Fugang Duan <fugang.duan@nxp.com>









M:	Joakim Zhang <qiangqing.zhang@nxp.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/fsl-fec.txt








@@ -8524,9 +8524,9 @@ F:	drivers/pci/hotplug/rpaphp*















IBM Power SRIOV Virtual NIC Device Driver









M:	Dany Madden <drt@linux.ibm.com>









M:	Lijun Pan <ljp@linux.ibm.com>









M:	Sukadev Bhattiprolu <sukadev@linux.ibm.com>









R:	Thomas Falcon <tlfalcon@linux.ibm.com>









R:	Lijun Pan <lijunp213@gmail.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	drivers/net/ethernet/ibm/ibmvnic.*
































drivers/net/dsa/mv88e6xxx/chip.c



+13
−17






























Original line number
Diff line number
Diff line







@@ -3026,10 +3026,17 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)







	return err;









}



















/* prod_id for switch families which do not have a PHY model number */









static const u16 family_prod_id_table[] = {









	[MV88E6XXX_FAMILY_6341] = MV88E6XXX_PORT_SWITCH_ID_PROD_6341,









	[MV88E6XXX_FAMILY_6390] = MV88E6XXX_PORT_SWITCH_ID_PROD_6390,









};



















static int mv88e6xxx_mdio_read(struct mii_bus *bus, int phy, int reg)









{









	struct mv88e6xxx_mdio_bus *mdio_bus = bus->priv;









	struct mv88e6xxx_chip *chip = mdio_bus->chip;









	u16 prod_id;









	u16 val;









	int err;


















@@ -3040,23 +3047,12 @@ static int mv88e6xxx_mdio_read(struct mii_bus *bus, int phy, int reg)







	err = chip->info->ops->phy_read(chip, bus, phy, reg, &val);









	mv88e6xxx_reg_unlock(chip);



















	if (reg == MII_PHYSID2) {









	/* Some internal PHYs don't have a model number. */









		if (chip->info->family != MV88E6XXX_FAMILY_6165)









			/* Then there is the 6165 family. It gets is









			 * PHYs correct. But it can also have two









			 * SERDES interfaces in the PHY address









			 * space. And these don't have a model









			 * number. But they are not PHYs, so we don't









			 * want to give them something a PHY driver









			 * will recognise.









			 *









			 * Use the mv88e6390 family model number









			 * instead, for anything which really could be









			 * a PHY,









			 */









			if (!(val & 0x3f0))









				val |= MV88E6XXX_PORT_SWITCH_ID_PROD_6390 >> 4;









	if (reg == MII_PHYSID2 && !(val & 0x3f0) &&









	    chip->info->family < ARRAY_SIZE(family_prod_id_table)) {









		prod_id = family_prod_id_table[chip->info->family];









		if (prod_id)









			val |= prod_id >> 4;









	}



















	return err ? err : val;
































drivers/net/ethernet/cadence/macb_main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -3918,6 +3918,7 @@ static int macb_init(struct platform_device *pdev)







	reg = gem_readl(bp, DCFG8);









	bp->max_tuples = min((GEM_BFEXT(SCR2CMP, reg) / 3),









			GEM_BFEXT(T2SCR, reg));









	INIT_LIST_HEAD(&bp->rx_fs_list.list);









	if (bp->max_tuples > 0) {









		/* also needs one ethtype match to check IPv4 */









		if (GEM_BFEXT(SCR2ETH, reg) > 0) {








@@ -3928,7 +3929,6 @@ static int macb_init(struct platform_device *pdev)







			/* Filtering is supported in hw but don't enable it in kernel now */









			dev->hw_features |= NETIF_F_NTUPLE;









			/* init Rx flow definitions */









			INIT_LIST_HEAD(&bp->rx_fs_list.list);









			bp->rx_fs_list.count = 0;









			spin_lock_init(&bp->rx_fs_lock);









		} else