Commit 6172a518 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf and wifi.

  Current release - regressions:

   - neighbour: fix __randomize_layout crash in struct neighbour

   - r8169: fix deadlock on RTL8125 in jumbo mtu mode

  Previous releases - regressions:

   - wifi:
       - mac80211: fix warning at station removal time
       - cfg80211: fix CQM for non-range use

   - tools: ynl-gen: fix unexpected response handling

   - octeontx2-af: fix possible buffer overflow

   - dpaa2: recycle the RX buffer only after all processing done

   - rswitch: fix missing dev_kfree_skb_any() in error path

  Previous releases - always broken:

   - ipv4: fix uaf issue when receiving igmp query packet

   - wifi: mac80211: fix debugfs deadlock at device removal time

   - bpf:
       - sockmap: af_unix stream sockets need to hold ref for pair sock
       - netdevsim: don't accept device bound programs

   - selftests: fix a char signedness issue

   - dsa: mv88e6xxx: fix marvell 6350 probe crash

   - octeontx2-pf: restore TC ingress police rules when interface is up

   - wangxun: fix memory leak on msix entry

   - ravb: keep reverse order of operations in ravb_remove()"

* tag 'net-6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (51 commits)
  net: ravb: Keep reverse order of operations in ravb_remove()
  net: ravb: Stop DMA in case of failures on ravb_open()
  net: ravb: Start TX queues after HW initialization succeeded
  net: ravb: Make write access to CXR35 first before accessing other EMAC registers
  net: ravb: Use pm_runtime_resume_and_get()
  net: ravb: Check return value of reset_control_deassert()
  net: libwx: fix memory leak on msix entry
  ice: Fix VF Reset paths when interface in a failed over aggregate
  bpf, sockmap: Add af_unix test with both sockets in map
  bpf, sockmap: af_unix stream sockets need to hold ref for pair sock
  tools: ynl-gen: always construct struct ynl_req_state
  ethtool: don't propagate EOPNOTSUPP from dumps
  ravb: Fix races between ravb_tx_timeout_work() and net related ops
  r8169: prevent potential deadlock in rtl8169_close
  r8169: fix deadlock on RTL8125 in jumbo mtu mode
  neighbour: Fix __randomize_layout crash in struct neighbour
  octeontx2-pf: Restore TC ingress police rules when interface is up
  octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64
  net: stmmac: xgmac: Disable FPE MMC interrupts
  octeontx2-af: Fix possible buffer overflow
  ...
parents e8f60209 777f245e

drivers/net/dsa/mv88e6xxx/chip.c

+20 −6
Original line number Diff line number Diff line
@@ -577,6 +577,18 @@ static void mv88e6250_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, 
	config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100;

}



static void mv88e6351_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,

				       struct phylink_config *config)

{

	unsigned long *supported = config->supported_interfaces;



	/* Translate the default cmode */

	mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported);



	config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |

				   MAC_1000FD;

}



static int mv88e6352_get_port4_serdes_cmode(struct mv88e6xxx_chip *chip)

{

	u16 reg, val;
@@ -3880,7 +3892,8 @@ static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port) 
	struct mv88e6xxx_chip *chip = ds->priv;

	int err;



	if (chip->info->ops->pcs_ops->pcs_init) {

	if (chip->info->ops->pcs_ops &&

	    chip->info->ops->pcs_ops->pcs_init) {

		err = chip->info->ops->pcs_ops->pcs_init(chip, port);

		if (err)

			return err;
@@ -3895,7 +3908,8 @@ static void mv88e6xxx_port_teardown(struct dsa_switch *ds, int port) 


	mv88e6xxx_teardown_devlink_regions_port(ds, port);



	if (chip->info->ops->pcs_ops->pcs_teardown)

	if (chip->info->ops->pcs_ops &&

	    chip->info->ops->pcs_ops->pcs_teardown)

		chip->info->ops->pcs_ops->pcs_teardown(chip, port);

}
@@ -4340,7 +4354,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = { 
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.stu_getnext = mv88e6352_g1_stu_getnext,

	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,

	.phylink_get_caps = mv88e6185_phylink_get_caps,

	.phylink_get_caps = mv88e6351_phylink_get_caps,

};



static const struct mv88e6xxx_ops mv88e6172_ops = {
@@ -4440,7 +4454,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { 
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.stu_getnext = mv88e6352_g1_stu_getnext,

	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,

	.phylink_get_caps = mv88e6185_phylink_get_caps,

	.phylink_get_caps = mv88e6351_phylink_get_caps,

};



static const struct mv88e6xxx_ops mv88e6176_ops = {
@@ -5069,7 +5083,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = { 
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.stu_getnext = mv88e6352_g1_stu_getnext,

	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,

	.phylink_get_caps = mv88e6185_phylink_get_caps,

	.phylink_get_caps = mv88e6351_phylink_get_caps,

};



static const struct mv88e6xxx_ops mv88e6351_ops = {
@@ -5117,7 +5131,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = { 
	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,

	.avb_ops = &mv88e6352_avb_ops,

	.ptp_ops = &mv88e6352_ptp_ops,

	.phylink_get_caps = mv88e6185_phylink_get_caps,

	.phylink_get_caps = mv88e6351_phylink_get_caps,

};



static const struct mv88e6xxx_ops mv88e6352_ops = {

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+10 −6
Original line number Diff line number Diff line
@@ -516,8 +516,6 @@ struct sk_buff *dpaa2_eth_alloc_skb(struct dpaa2_eth_priv *priv, 


	memcpy(skb->data, fd_vaddr + fd_offset, fd_length);



	dpaa2_eth_recycle_buf(priv, ch, dpaa2_fd_get_addr(fd));



	return skb;

}
@@ -589,6 +587,7 @@ void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, 
	struct rtnl_link_stats64 *percpu_stats;

	struct dpaa2_eth_drv_stats *percpu_extras;

	struct device *dev = priv->net_dev->dev.parent;

	bool recycle_rx_buf = false;

	void *buf_data;

	u32 xdp_act;
@@ -618,6 +617,8 @@ void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, 
			dma_unmap_page(dev, addr, priv->rx_buf_size,

				       DMA_BIDIRECTIONAL);

			skb = dpaa2_eth_build_linear_skb(ch, fd, vaddr);

		} else {

			recycle_rx_buf = true;

		}

	} else if (fd_format == dpaa2_fd_sg) {

		WARN_ON(priv->xdp_prog);
@@ -637,6 +638,9 @@ void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, 
		goto err_build_skb;



	dpaa2_eth_receive_skb(priv, ch, fd, vaddr, fq, percpu_stats, skb);



	if (recycle_rx_buf)

		dpaa2_eth_recycle_buf(priv, ch, dpaa2_fd_get_addr(fd));

	return;



err_build_skb:
@@ -1073,14 +1077,12 @@ static int dpaa2_eth_build_single_fd(struct dpaa2_eth_priv *priv, 
	dma_addr_t addr;



	buffer_start = skb->data - dpaa2_eth_needed_headroom(skb);



	/* If there's enough room to align the FD address, do it.

	 * It will help hardware optimize accesses.

	 */

	aligned_start = PTR_ALIGN(buffer_start - DPAA2_ETH_TX_BUF_ALIGN,

				  DPAA2_ETH_TX_BUF_ALIGN);

	if (aligned_start >= skb->head)

		buffer_start = aligned_start;

	else

		return -ENOMEM;



	/* Store a backpointer to the skb at the beginning of the buffer

	 * (in the private data area) such that we can release it
@@ -4967,6 +4969,8 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev) 
	if (err)

		goto err_dl_port_add;



	net_dev->needed_headroom = DPAA2_ETH_SWA_SIZE + DPAA2_ETH_TX_BUF_ALIGN;



	err = register_netdev(net_dev);

	if (err < 0) {

		dev_err(dev, "register_netdev() failed\n");

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static inline bool dpaa2_eth_rx_pause_enabled(u64 link_options) 


static inline unsigned int dpaa2_eth_needed_headroom(struct sk_buff *skb)

{

	unsigned int headroom = DPAA2_ETH_SWA_SIZE;

	unsigned int headroom = DPAA2_ETH_SWA_SIZE + DPAA2_ETH_TX_BUF_ALIGN;



	/* If we don't have an skb (e.g. XDP buffer), we only need space for

	 * the software annotation area

drivers/net/ethernet/intel/ice/ice_lag.c

+72 −50
Original line number Diff line number Diff line
@@ -569,6 +569,50 @@ ice_lag_move_vf_node_tc(struct ice_lag *lag, u8 oldport, u8 newport, 
		dev_dbg(dev, "Problem restarting traffic for LAG node move\n");

}



/**

 * ice_lag_build_netdev_list - populate the lag struct's netdev list

 * @lag: local lag struct

 * @ndlist: pointer to netdev list to populate

 */

static void ice_lag_build_netdev_list(struct ice_lag *lag,

				      struct ice_lag_netdev_list *ndlist)

{

	struct ice_lag_netdev_list *nl;

	struct net_device *tmp_nd;



	INIT_LIST_HEAD(&ndlist->node);

	rcu_read_lock();

	for_each_netdev_in_bond_rcu(lag->upper_netdev, tmp_nd) {

		nl = kzalloc(sizeof(*nl), GFP_ATOMIC);

		if (!nl)

			break;



		nl->netdev = tmp_nd;

		list_add(&nl->node, &ndlist->node);

	}

	rcu_read_unlock();

	lag->netdev_head = &ndlist->node;

}



/**

 * ice_lag_destroy_netdev_list - free lag struct's netdev list

 * @lag: pointer to local lag struct

 * @ndlist: pointer to lag struct netdev list

 */

static void ice_lag_destroy_netdev_list(struct ice_lag *lag,

					struct ice_lag_netdev_list *ndlist)

{

	struct ice_lag_netdev_list *entry, *n;



	rcu_read_lock();

	list_for_each_entry_safe(entry, n, &ndlist->node, node) {

		list_del(&entry->node);

		kfree(entry);

	}

	rcu_read_unlock();

	lag->netdev_head = NULL;

}



/**

 * ice_lag_move_single_vf_nodes - Move Tx scheduling nodes for single VF

 * @lag: primary interface LAG struct
@@ -597,7 +641,6 @@ ice_lag_move_single_vf_nodes(struct ice_lag *lag, u8 oldport, u8 newport, 
void ice_lag_move_new_vf_nodes(struct ice_vf *vf)

{

	struct ice_lag_netdev_list ndlist;

	struct list_head *tmp, *n;

	u8 pri_port, act_port;

	struct ice_lag *lag;

	struct ice_vsi *vsi;
@@ -621,38 +664,15 @@ void ice_lag_move_new_vf_nodes(struct ice_vf *vf) 
	pri_port = pf->hw.port_info->lport;

	act_port = lag->active_port;



	if (lag->upper_netdev) {

		struct ice_lag_netdev_list *nl;

		struct net_device *tmp_nd;



		INIT_LIST_HEAD(&ndlist.node);

		rcu_read_lock();

		for_each_netdev_in_bond_rcu(lag->upper_netdev, tmp_nd) {

			nl = kzalloc(sizeof(*nl), GFP_ATOMIC);

			if (!nl)

				break;



			nl->netdev = tmp_nd;

			list_add(&nl->node, &ndlist.node);

		}

		rcu_read_unlock();

	}



	lag->netdev_head = &ndlist.node;

	if (lag->upper_netdev)

		ice_lag_build_netdev_list(lag, &ndlist);



	if (ice_is_feature_supported(pf, ICE_F_SRIOV_LAG) &&

	    lag->bonded && lag->primary && pri_port != act_port &&

	    !list_empty(lag->netdev_head))

		ice_lag_move_single_vf_nodes(lag, pri_port, act_port, vsi->idx);



	list_for_each_safe(tmp, n, &ndlist.node) {

		struct ice_lag_netdev_list *entry;



		entry = list_entry(tmp, struct ice_lag_netdev_list, node);

		list_del(&entry->node);

		kfree(entry);

	}

	lag->netdev_head = NULL;

	ice_lag_destroy_netdev_list(lag, &ndlist);



new_vf_unlock:

	mutex_unlock(&pf->lag_mutex);
@@ -679,6 +699,29 @@ static void ice_lag_move_vf_nodes(struct ice_lag *lag, u8 oldport, u8 newport) 
			ice_lag_move_single_vf_nodes(lag, oldport, newport, i);

}



/**

 * ice_lag_move_vf_nodes_cfg - move vf nodes outside LAG netdev event context

 * @lag: local lag struct

 * @src_prt: lport value for source port

 * @dst_prt: lport value for destination port

 *

 * This function is used to move nodes during an out-of-netdev-event situation,

 * primarily when the driver needs to reconfigure or recreate resources.

 *

 * Must be called while holding the lag_mutex to avoid lag events from

 * processing while out-of-sync moves are happening.  Also, paired moves,

 * such as used in a reset flow, should both be called under the same mutex

 * lock to avoid changes between start of reset and end of reset.

 */

void ice_lag_move_vf_nodes_cfg(struct ice_lag *lag, u8 src_prt, u8 dst_prt)

{

	struct ice_lag_netdev_list ndlist;



	ice_lag_build_netdev_list(lag, &ndlist);

	ice_lag_move_vf_nodes(lag, src_prt, dst_prt);

	ice_lag_destroy_netdev_list(lag, &ndlist);

}



#define ICE_LAG_SRIOV_CP_RECIPE		10

#define ICE_LAG_SRIOV_TRAIN_PKT_LEN	16
@@ -2051,7 +2094,6 @@ void ice_lag_rebuild(struct ice_pf *pf) 
{

	struct ice_lag_netdev_list ndlist;

	struct ice_lag *lag, *prim_lag;

	struct list_head *tmp, *n;

	u8 act_port, loc_port;



	if (!pf->lag || !pf->lag->bonded)
@@ -2063,21 +2105,7 @@ void ice_lag_rebuild(struct ice_pf *pf) 
	if (lag->primary) {

		prim_lag = lag;

	} else {

		struct ice_lag_netdev_list *nl;

		struct net_device *tmp_nd;



		INIT_LIST_HEAD(&ndlist.node);

		rcu_read_lock();

		for_each_netdev_in_bond_rcu(lag->upper_netdev, tmp_nd) {

			nl = kzalloc(sizeof(*nl), GFP_ATOMIC);

			if (!nl)

				break;



			nl->netdev = tmp_nd;

			list_add(&nl->node, &ndlist.node);

		}

		rcu_read_unlock();

		lag->netdev_head = &ndlist.node;

		ice_lag_build_netdev_list(lag, &ndlist);

		prim_lag = ice_lag_find_primary(lag);

	}
@@ -2107,13 +2135,7 @@ void ice_lag_rebuild(struct ice_pf *pf) 


	ice_clear_rdma_cap(pf);

lag_rebuild_out:

	list_for_each_safe(tmp, n, &ndlist.node) {

		struct ice_lag_netdev_list *entry;



		entry = list_entry(tmp, struct ice_lag_netdev_list, node);

		list_del(&entry->node);

		kfree(entry);

	}

	ice_lag_destroy_netdev_list(lag, &ndlist);

	mutex_unlock(&pf->lag_mutex);

}

drivers/net/ethernet/intel/ice/ice_lag.h

+1 −0
Original line number Diff line number Diff line
@@ -65,4 +65,5 @@ int ice_init_lag(struct ice_pf *pf); 
void ice_deinit_lag(struct ice_pf *pf);

void ice_lag_rebuild(struct ice_pf *pf);

bool ice_lag_is_switchdev_running(struct ice_pf *pf);

void ice_lag_move_vf_nodes_cfg(struct ice_lag *lag, u8 src_prt, u8 dst_prt);

#endif /* _ICE_LAG_H_ */