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

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

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

  Current release - regressions:

   - sched: act_pedit: free pedit keys on bail from offset check

  Current release - new code bugs:

   - pds_core:
      - Kconfig fixes (DEBUGFS and AUXILIARY_BUS)
      - fix mutex double unlock in error path

  Previous releases - regressions:

   - sched: cls_api: remove block_cb from driver_list before freeing

   - nf_tables: fix ct untracked match breakage

   - eth: mtk_eth_soc: drop generic vlan rx offload

   - sched: flower: fix error handler on replace

  Previous releases - always broken:

   - tcp: fix skb_copy_ubufs() vs BIG TCP

   - ipv6: fix skb hash for some RST packets

   - af_packet: don't send zero-byte data in packet_sendmsg_spkt()

   - rxrpc: timeout handling fixes after moving client call connection
     to the I/O thread

   - ixgbe: fix panic during XDP_TX with > 64 CPUs

   - igc: RMW the SRRCTL register to prevent losing timestamp config

   - dsa: mt7530: fix corrupt frames using TRGMII on 40 MHz XTAL MT7621

   - r8152:
      - fix flow control issue of RTL8156A
      - fix the poor throughput for 2.5G devices
      - move setting r8153b_rx_agg_chg_indicate() to fix coalescing
      - enable autosuspend

   - ncsi: clear Tx enable mode when handling a Config required AEN

   - octeontx2-pf: macsec: fixes for CN10KB ASIC rev

  Misc:

   - 9p: remove INET dependency"

* tag 'net-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (69 commits)
  net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
  pds_core: fix mutex double unlock in error path
  net/sched: flower: fix error handler on replace
  Revert "net/sched: flower: Fix wrong handle assignment during filter change"
  net/sched: flower: fix filter idr initialization
  net: fec: correct the counting of XDP sent frames
  bonding: add xdp_features support
  net: enetc: check the index of the SFI rather than the handle
  sfc: Add back mailing list
  virtio_net: suppress cpu stall when free_unused_bufs
  ice: block LAN in case of VF to VF offload
  net: dsa: mt7530: fix network connectivity with multiple CPU ports
  net: dsa: mt7530: fix corrupt frames using trgmii on 40 MHz XTAL MT7621
  9p: Remove INET dependency
  netfilter: nf_tables: fix ct untracked match breakage
  af_packet: Don't send zero-byte data in packet_sendmsg_spkt().
  igc: read before write to SRRCTL register
  pds_core: add AUXILIARY_BUS and NET_DEVLINK to Kconfig
  pds_core: remove CONFIG_DEBUG_FS from makefile
  ionic: catch failure from devlink_alloc
  ...
parents a5e21900 644bca1d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -19059,6 +19059,7 @@ SFC NETWORK DRIVER 
M:	Edward Cree <ecree.xilinx@gmail.com>

M:	Martin Habets <habetsm.xilinx@gmail.com>

L:	netdev@vger.kernel.org

L:	linux-net-drivers@amd.com

S:	Supported

F:	Documentation/networking/devlink/sfc.rst

F:	drivers/net/ethernet/sfc/

drivers/isdn/mISDN/dsp_cmx.c

+2 −13
Original line number Diff line number Diff line
@@ -141,17 +141,6 @@ 
/*#define CMX_DELAY_DEBUG * gives rx-buffer delay overview */

/*#define CMX_TX_DEBUG * massive read/write on tx-buffer with content */



static inline int

count_list_member(struct list_head *head)

{

	int			cnt = 0;

	struct list_head	*m;



	list_for_each(m, head)

		cnt++;

	return cnt;

}



/*

 * debug cmx memory structure

 */
@@ -1672,7 +1661,7 @@ dsp_cmx_send(void *arg) 
		mustmix = 0;

		members = 0;

		if (conf) {

			members = count_list_member(&conf->mlist);

			members = list_count_nodes(&conf->mlist);

#ifdef CMX_CONF_DEBUG

			if (conf->software && members > 1)

#else
@@ -1695,7 +1684,7 @@ dsp_cmx_send(void *arg) 
	/* loop all members that require conference mixing */

	list_for_each_entry(conf, &conf_ilist, list) {

		/* count members and check hardware */

		members = count_list_member(&conf->mlist);

		members = list_count_nodes(&conf->mlist);

#ifdef CMX_CONF_DEBUG

		if (conf->software && members > 1) {

#else

drivers/net/bonding/bond_main.c

+29 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,26 @@ static void bond_ether_setup(struct net_device *bond_dev) 
	bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;

}



void bond_xdp_set_features(struct net_device *bond_dev)

{

	struct bonding *bond = netdev_priv(bond_dev);

	xdp_features_t val = NETDEV_XDP_ACT_MASK;

	struct list_head *iter;

	struct slave *slave;



	ASSERT_RTNL();



	if (!bond_xdp_check(bond)) {

		xdp_clear_features_flag(bond_dev);

		return;

	}



	bond_for_each_slave(bond, slave, iter)

		val &= slave->dev->xdp_features;



	xdp_set_features_flag(bond_dev, val);

}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,

		 struct netlink_ext_ack *extack)
@@ -2236,6 +2256,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, 
			bpf_prog_inc(bond->xdp_prog);

	}



	bond_xdp_set_features(bond_dev);



	slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n",

		   bond_is_active_slave(new_slave) ? "an active" : "a backup",

		   new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
@@ -2483,6 +2505,7 @@ static int __bond_release_one(struct net_device *bond_dev, 
	if (!netif_is_bond_master(slave_dev))

		slave_dev->priv_flags &= ~IFF_BONDING;



	bond_xdp_set_features(bond_dev);

	kobject_put(&slave->kobj);



	return 0;
@@ -3930,6 +3953,9 @@ static int bond_slave_netdev_event(unsigned long event, 
		/* Propagate to master device */

		call_netdevice_notifiers(event, slave->bond->dev);

		break;

	case NETDEV_XDP_FEAT_CHANGE:

		bond_xdp_set_features(bond_dev);

		break;

	default:

		break;

	}
@@ -5874,6 +5900,9 @@ void bond_setup(struct net_device *bond_dev) 
	if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP)

		bond_dev->features |= BOND_XFRM_FEATURES;

#endif /* CONFIG_XFRM_OFFLOAD */



	if (bond_xdp_check(bond))

		bond_dev->xdp_features = NETDEV_XDP_ACT_MASK;

}



/* Destroy a bonding device.

drivers/net/bonding/bond_options.c

+2 −0
Original line number Diff line number Diff line
@@ -877,6 +877,8 @@ static int bond_option_mode_set(struct bonding *bond, 
			netdev_update_features(bond->dev);

	}



	bond_xdp_set_features(bond->dev);



	return 0;

}

drivers/net/dsa/mt7530.c

+9 −5
Original line number Diff line number Diff line
@@ -426,9 +426,9 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface) 
		else

			ssc_delta = 0x87;

		if (priv->id == ID_MT7621) {

			/* PLL frequency: 150MHz: 1.2GBit */

			/* PLL frequency: 125MHz: 1.0GBit */

			if (xtal == HWTRAP_XTAL_40MHZ)

				ncpo1 = 0x0780;

				ncpo1 = 0x0640;

			if (xtal == HWTRAP_XTAL_25MHZ)

				ncpo1 = 0x0a00;

		} else { /* PLL frequency: 250MHz: 2.0Gbit */
@@ -1002,9 +1002,9 @@ mt753x_cpu_port_enable(struct dsa_switch *ds, int port) 
	mt7530_write(priv, MT7530_PVC_P(port),

		     PORT_SPEC_TAG);



	/* Disable flooding by default */

	mt7530_rmw(priv, MT7530_MFC, BC_FFP_MASK | UNM_FFP_MASK | UNU_FFP_MASK,

		   BC_FFP(BIT(port)) | UNM_FFP(BIT(port)) | UNU_FFP(BIT(port)));

	/* Enable flooding on the CPU port */

	mt7530_set(priv, MT7530_MFC, BC_FFP(BIT(port)) | UNM_FFP(BIT(port)) |

		   UNU_FFP(BIT(port)));



	/* Set CPU port number */

	if (priv->id == ID_MT7621)
@@ -2367,6 +2367,10 @@ mt7531_setup_common(struct dsa_switch *ds) 
	/* Enable and reset MIB counters */

	mt7530_mib_reset(ds);



	/* Disable flooding on all ports */

	mt7530_clear(priv, MT7530_MFC, BC_FFP_MASK | UNM_FFP_MASK |

		     UNU_FFP_MASK);



	for (i = 0; i < MT7530_NUM_PORTS; i++) {

		/* Disable forwarding by default on all ports */

		mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,