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

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

Pull networking fixes from Jakub Kicinski:
 "Networking fixes, including fixes from netfilter.

  Current release - regressions:

   - r8169: fix incorrect mac address assignment

   - vlan: fix underflow for the real_dev refcnt when vlan creation
     fails

   - smc: avoid warning of possible recursive locking

  Current release - new code bugs:

   - vsock/virtio: suppress used length validation

   - neigh: fix crash in v6 module initialization error path

  Previous releases - regressions:

   - af_unix: fix change in behavior in read after shutdown

   - igb: fix netpoll exit with traffic, avoid warning

   - tls: fix splice_read() when starting mid-record

   - lan743x: fix deadlock in lan743x_phy_link_status_change()

   - marvell: prestera: fix bridge port operation

  Previous releases - always broken:

   - tcp_cubic: fix spurious Hystart ACK train detections for
     not-cwnd-limited flows

   - nexthop: fix refcount issues when replacing IPv6 groups

   - nexthop: fix null pointer dereference when IPv6 is not enabled

   - phylink: force link down and retrigger resolve on interface change

   - mptcp: fix delack timer length calculation and incorrect early
     clearing

   - ieee802154: handle iftypes as u32, prevent shift-out-of-bounds

   - nfc: virtual_ncidev: change default device permissions

   - netfilter: ctnetlink: fix error codes and flags used for kernel
     side filtering of dumps

   - netfilter: flowtable: fix IPv6 tunnel addr match

   - ncsi: align payload to 32-bit to fix dropped packets

   - iavf: fix deadlock and loss of config during VF interface reset

   - ice: avoid bpf_prog refcount underflow

   - ocelot: fix broken PTP over IP and PTP API violations

  Misc:

   - marvell: mvpp2: increase MTU limit when XDP enabled"

* tag 'net-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (94 commits)
  net: dsa: microchip: implement multi-bridge support
  net: mscc: ocelot: correctly report the timestamping RX filters in ethtool
  net: mscc: ocelot: set up traps for PTP packets
  net: ptp: add a definition for the UDP port for IEEE 1588 general messages
  net: mscc: ocelot: create a function that replaces an existing VCAP filter
  net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP
  net: hns3: fix incorrect components info of ethtool --reset command
  net: hns3: fix one incorrect value of page pool info when queried by debugfs
  net: hns3: add check NULL address for page pool
  net: hns3: fix VF RSS failed problem after PF enable multi-TCs
  net: qed: fix the array may be out of bound
  net/smc: Don't call clcsock shutdown twice when smc shutdown
  net: vlan: fix underflow for the real_dev refcnt
  ptp: fix filter names in the documentation
  ethtool: ioctl: fix potential NULL deref in ethtool_set_coalesce()
  nfc: virtual_ncidev: change default device permissions
  net/sched: sch_ets: don't peek at classes beyond 'nbands'
  net: stmmac: Disable Tx queues when reconfiguring the interface
  selftests: tls: test for correct proto_ops
  tls: fix replacing proto_ops
  ...
parents 5367cf1c b3612ccd

Documentation/networking/ipvs-sysctl.rst

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ conn_reuse_mode - INTEGER 


	0: disable any special handling on port reuse. The new

	connection will be delivered to the same real server that was

	servicing the previous connection. This will effectively

	disable expire_nodest_conn.

	servicing the previous connection.



	bit 1: enable rescheduling of new connections when it is safe.

	That is, whenever expire_nodest_conn and for TCP sockets, when

Documentation/networking/timestamping.rst

+2 −2
Original line number Diff line number Diff line
@@ -486,8 +486,8 @@ of packets. 
Drivers are free to use a more permissive configuration than the requested

configuration. It is expected that drivers should only implement directly the

most generic mode that can be supported. For example if the hardware can

support HWTSTAMP_FILTER_V2_EVENT, then it should generally always upscale

HWTSTAMP_FILTER_V2_L2_SYNC_MESSAGE, and so forth, as HWTSTAMP_FILTER_V2_EVENT

support HWTSTAMP_FILTER_PTP_V2_EVENT, then it should generally always upscale

HWTSTAMP_FILTER_PTP_V2_L2_SYNC, and so forth, as HWTSTAMP_FILTER_PTP_V2_EVENT

is more generic (and more useful to applications).



A driver which supports hardware time stamping shall update the struct

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -3580,13 +3580,14 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/broadcom/b44.*









BROADCOM B53 ETHERNET SWITCH DRIVER









BROADCOM B53/SF2 ETHERNET SWITCH DRIVER









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	netdev@vger.kernel.org









L:	openwrt-devel@lists.openwrt.org (subscribers-only)









S:	Supported









F:	Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml









F:	drivers/net/dsa/b53/*









F:	drivers/net/dsa/bcm_sf2*









F:	include/linux/dsa/brcm.h









F:	include/linux/platform_data/b53.h
















@@ -18493,6 +18494,7 @@ F:	include/uapi/linux/pkt_sched.h







F:	include/uapi/linux/tc_act/









F:	include/uapi/linux/tc_ematch/









F:	net/sched/









F:	tools/testing/selftests/tc-testing

















TC90522 MEDIA DRIVER









M:	Akihiro Tsukada <tskd08@gmail.com>

























drivers/net/dsa/microchip/ksz8795.c



+7
−49






























Original line number
Diff line number
Diff line







@@ -1002,57 +1002,32 @@ static void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)







	data &= ~PORT_VLAN_MEMBERSHIP;









	data |= (member & dev->port_mask);









	ksz_pwrite8(dev, port, P_MIRROR_CTRL, data);









	dev->ports[port].member = member;









}



















static void ksz8_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)









{









	struct ksz_device *dev = ds->priv;









	int forward = dev->member;









	struct ksz_port *p;









	int member = -1;









	u8 data;



















	p = &dev->ports[port];



















	ksz_pread8(dev, port, P_STP_CTRL, &data);









	data &= ~(PORT_TX_ENABLE | PORT_RX_ENABLE | PORT_LEARN_DISABLE);



















	switch (state) {









	case BR_STATE_DISABLED:









		data |= PORT_LEARN_DISABLE;









		if (port < dev->phy_port_cnt)









			member = 0;









		break;









	case BR_STATE_LISTENING:









		data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE);









		if (port < dev->phy_port_cnt &&









		    p->stp_state == BR_STATE_DISABLED)









			member = dev->host_mask | p->vid_member;









		break;









	case BR_STATE_LEARNING:









		data |= PORT_RX_ENABLE;









		break;









	case BR_STATE_FORWARDING:









		data |= (PORT_TX_ENABLE | PORT_RX_ENABLE);



















		/* This function is also used internally. */









		if (port == dev->cpu_port)









			break;



















		/* Port is a member of a bridge. */









		if (dev->br_member & BIT(port)) {









			dev->member |= BIT(port);









			member = dev->member;









		} else {









			member = dev->host_mask | p->vid_member;









		}









		break;









	case BR_STATE_BLOCKING:









		data |= PORT_LEARN_DISABLE;









		if (port < dev->phy_port_cnt &&









		    p->stp_state == BR_STATE_DISABLED)









			member = dev->host_mask | p->vid_member;









		break;









	default:









		dev_err(ds->dev, "invalid STP state: %d\n", state);








@@ -1060,21 +1035,10 @@ static void ksz8_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)







	}



















	ksz_pwrite8(dev, port, P_STP_CTRL, data);









	p->stp_state = state;









	/* Port membership may share register with STP state. */









	if (member >= 0 && member != p->member)









		ksz8_cfg_port_member(dev, port, (u8)member);



















	/* Check if forwarding needs to be updated. */









	if (state != BR_STATE_FORWARDING) {









		if (dev->br_member & BIT(port))









			dev->member &= ~BIT(port);









	}









	p = &dev->ports[port];









	p->stp_state = state;



















	/* When topology has changed the function ksz_update_port_member









	 * should be called to modify port forwarding behavior.









	 */









	if (forward != dev->member)









	ksz_update_port_member(dev, port);









}


















@@ -1341,7 +1305,7 @@ static void ksz8795_cpu_interface_select(struct ksz_device *dev, int port)

















static void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port)









{









	struct ksz_port *p = &dev->ports[port];









	struct dsa_switch *ds = dev->ds;









	struct ksz8 *ksz8 = dev->priv;









	const u32 *masks;









	u8 member;








@@ -1368,10 +1332,11 @@ static void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port)







		if (!ksz_is_ksz88x3(dev))









			ksz8795_cpu_interface_select(dev, port);



















		member = dev->port_mask;









		member = dsa_user_ports(ds);









	} else {









		member = dev->host_mask | p->vid_member;









		member = BIT(dsa_upstream_port(ds, port));









	}



















	ksz8_cfg_port_member(dev, port, member);









}


















@@ -1392,20 +1357,13 @@ static void ksz8_config_cpu_port(struct dsa_switch *ds)







	ksz_cfg(dev, regs[S_TAIL_TAG_CTRL], masks[SW_TAIL_TAG_ENABLE], true);



















	p = &dev->ports[dev->cpu_port];









	p->vid_member = dev->port_mask;









	p->on = 1;



















	ksz8_port_setup(dev, dev->cpu_port, true);









	dev->member = dev->host_mask;



















	for (i = 0; i < dev->phy_port_cnt; i++) {









		p = &dev->ports[i];



















		/* Initialize to non-zero so that ksz_cfg_port_member() will









		 * be called.









		 */









		p->vid_member = BIT(i);









		p->member = dev->port_mask;









		ksz8_port_stp_state_set(ds, i, BR_STATE_DISABLED);



















		/* Last port may be disabled. */
































drivers/net/dsa/microchip/ksz9477.c



+8
−58






























Original line number
Diff line number
Diff line







@@ -391,7 +391,6 @@ static void ksz9477_cfg_port_member(struct ksz_device *dev, int port,







				    u8 member)









{









	ksz_pwrite32(dev, port, REG_PORT_VLAN_MEMBERSHIP__4, member);









	dev->ports[port].member = member;









}



















static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,








@@ -400,8 +399,6 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,







	struct ksz_device *dev = ds->priv;









	struct ksz_port *p = &dev->ports[port];









	u8 data;









	int member = -1;









	int forward = dev->member;



















	ksz_pread8(dev, port, P_STP_CTRL, &data);









	data &= ~(PORT_TX_ENABLE | PORT_RX_ENABLE | PORT_LEARN_DISABLE);








@@ -409,40 +406,18 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,







	switch (state) {









	case BR_STATE_DISABLED:









		data |= PORT_LEARN_DISABLE;









		if (port != dev->cpu_port)









			member = 0;









		break;









	case BR_STATE_LISTENING:









		data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE);









		if (port != dev->cpu_port &&









		    p->stp_state == BR_STATE_DISABLED)









			member = dev->host_mask | p->vid_member;









		break;









	case BR_STATE_LEARNING:









		data |= PORT_RX_ENABLE;









		break;









	case BR_STATE_FORWARDING:









		data |= (PORT_TX_ENABLE | PORT_RX_ENABLE);



















		/* This function is also used internally. */









		if (port == dev->cpu_port)









			break;



















		member = dev->host_mask | p->vid_member;









		mutex_lock(&dev->dev_mutex);



















		/* Port is a member of a bridge. */









		if (dev->br_member & (1 << port)) {









			dev->member |= (1 << port);









			member = dev->member;









		}









		mutex_unlock(&dev->dev_mutex);









		break;









	case BR_STATE_BLOCKING:









		data |= PORT_LEARN_DISABLE;









		if (port != dev->cpu_port &&









		    p->stp_state == BR_STATE_DISABLED)









			member = dev->host_mask | p->vid_member;









		break;









	default:









		dev_err(ds->dev, "invalid STP state: %d\n", state);








@@ -451,23 +426,8 @@ static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,

















	ksz_pwrite8(dev, port, P_STP_CTRL, data);









	p->stp_state = state;









	mutex_lock(&dev->dev_mutex);









	/* Port membership may share register with STP state. */









	if (member >= 0 && member != p->member)









		ksz9477_cfg_port_member(dev, port, (u8)member);



















	/* Check if forwarding needs to be updated. */









	if (state != BR_STATE_FORWARDING) {









		if (dev->br_member & (1 << port))









			dev->member &= ~(1 << port);









	}



















	/* When topology has changed the function ksz_update_port_member









	 * should be called to modify port forwarding behavior.









	 */









	if (forward != dev->member)









	ksz_update_port_member(dev, port);









	mutex_unlock(&dev->dev_mutex);









}



















static void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port)








@@ -1168,10 +1128,10 @@ static void ksz9477_phy_errata_setup(struct ksz_device *dev, int port)

















static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)









{









	u8 data8;









	u8 member;









	u16 data16;









	struct ksz_port *p = &dev->ports[port];









	struct dsa_switch *ds = dev->ds;









	u8 data8, member;









	u16 data16;



















	/* enable tag tail for host port */









	if (cpu_port)








@@ -1250,12 +1210,12 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)







		ksz_pwrite8(dev, port, REG_PORT_XMII_CTRL_1, data8);









		p->phydev.duplex = 1;









	}









	mutex_lock(&dev->dev_mutex);



















	if (cpu_port)









		member = dev->port_mask;









		member = dsa_user_ports(ds);









	else









		member = dev->host_mask | p->vid_member;









	mutex_unlock(&dev->dev_mutex);









		member = BIT(dsa_upstream_port(ds, port));



















	ksz9477_cfg_port_member(dev, port, member);



















	/* clear pending interrupts */








@@ -1276,8 +1236,6 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)







			const char *prev_mode;



















			dev->cpu_port = i;









			dev->host_mask = (1 << dev->cpu_port);









			dev->port_mask |= dev->host_mask;









			p = &dev->ports[i];



















			/* Read from XMII register to determine host port








@@ -1312,23 +1270,15 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)

















			/* enable cpu port */









			ksz9477_port_setup(dev, i, true);









			p->vid_member = dev->port_mask;









			p->on = 1;









		}









	}



















	dev->member = dev->host_mask;



















	for (i = 0; i < dev->port_cnt; i++) {









		if (i == dev->cpu_port)









			continue;









		p = &dev->ports[i];



















		/* Initialize to non-zero so that ksz_cfg_port_member() will









		 * be called.









		 */









		p->vid_member = (1 << i);









		p->member = dev->port_mask;









		ksz9477_port_stp_state_set(ds, i, BR_STATE_DISABLED);









		p->on = 1;









		if (i < dev->phy_port_cnt)