Commit 7586c850 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "A little calmer than usual, probably just the timing of sub-tree PRs.

  Including fixes from netfilter.

  Current release - regressions:

   - inet: bring NLM_DONE out to a separate recv() again, fix user space
     which assumes multiple recv()s will happen and gets blocked forever

   - drv: mlx5:
       - restore mistakenly dropped parts in register devlink flow
       - use channel mdev reference instead of global mdev instance for
         coalescing
       - acquire RTNL lock before RQs/SQs activation/deactivation

  Previous releases - regressions:

   - net: change maximum number of UDP segments to 128, fix virtio
     compatibility with Windows peers

   - usb: ax88179_178a: avoid writing the mac address before first
     reading

  Previous releases - always broken:

   - sched: fix mirred deadlock on device recursion

   - netfilter:
       - br_netfilter: skip conntrack input hook for promisc packets
       - fixes removal of duplicate elements in the pipapo set backend
       - various fixes for abort paths and error handling

   - af_unix: don't peek OOB data without MSG_OOB

   - drv: flower: fix fragment flags handling in multiple drivers

   - drv: ravb: fix jumbo frames and packet stats accounting

  Misc:

   - kselftest_harness: fix Clang warning about zero-length format

   - tun: limit printing rate when illegal packet received by tun dev"

* tag 'net-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (46 commits)
  net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
  net: usb: ax88179_178a: avoid writing the mac address before first reading
  net: ravb: Fix RX byte accounting for jumbo packets
  net: ravb: Fix GbEth jumbo packet RX checksum handling
  net: ravb: Allow RX loop to move past DMA mapping errors
  net: ravb: Count packets instead of descriptors in R-Car RX path
  net: ethernet: mtk_eth_soc: fix WED + wifi reset
  net:usb:qmi_wwan: support Rolling modules
  selftests: kselftest_harness: fix Clang warning about zero-length format
  net/sched: Fix mirred deadlock on device recursion
  netfilter: nf_tables: fix memleak in map from abort path
  netfilter: nf_tables: restore set elements when delete set fails
  netfilter: nf_tables: missing iterator type in lookup walk
  s390/ism: Properly fix receive message buffer allocation
  net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
  net: dsa: mt7530: fix mirroring frames received on local port
  tun: limit printing rate when illegal packet received by tun dev
  ice: Fix checking for unsupported keys on non-tunnel device
  ice: tc: allow zero flags in parsing tc flower
  ice: tc: check src_vsi in case of traffic from VF
  ...
parents 360a348f c24cd679

drivers/net/dsa/mt7530.c

+12 −4
Original line number Diff line number Diff line
@@ -1883,13 +1883,15 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port, 


static int mt753x_mirror_port_get(unsigned int id, u32 val)

{

	return (id == ID_MT7531) ? MT7531_MIRROR_PORT_GET(val) :

	return (id == ID_MT7531 || id == ID_MT7988) ?

		       MT7531_MIRROR_PORT_GET(val) :

		       MIRROR_PORT(val);

}



static int mt753x_mirror_port_set(unsigned int id, u32 val)

{

	return (id == ID_MT7531) ? MT7531_MIRROR_PORT_SET(val) :

	return (id == ID_MT7531 || id == ID_MT7988) ?

		       MT7531_MIRROR_PORT_SET(val) :

		       MIRROR_PORT(val);

}
@@ -2480,6 +2482,9 @@ mt7530_setup(struct dsa_switch *ds) 
			   PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));

	}



	/* Allow mirroring frames received on the local port (monitor port). */

	mt7530_set(priv, MT753X_AGC, LOCAL_EN);



	/* Setup VLAN ID 0 for VLAN-unaware bridges */

	ret = mt7530_setup_vlan0(priv);

	if (ret)
@@ -2591,6 +2596,9 @@ mt7531_setup_common(struct dsa_switch *ds) 
			   PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));

	}



	/* Allow mirroring frames received on the local port (monitor port). */

	mt7530_set(priv, MT753X_AGC, LOCAL_EN);



	/* Flush the FDB table */

	ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);

	if (ret < 0)

drivers/net/dsa/mt7530.h

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ enum mt753x_id { 
#define SYSC_REG_RSTCTRL		0x34

#define  RESET_MCM			BIT(2)



/* Register for ARL global control */

#define MT753X_AGC			0xc

#define  LOCAL_EN			BIT(7)



/* Registers to mac forward control for unknown frames */

#define MT7530_MFC			0x10

#define  BC_FFP(x)			(((x) & 0xff) << 24)

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

+13 −2
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ ice_tc_count_lkups(u32 flags, struct ice_tc_flower_lyr_2_4_hdrs *headers, 
	 * - ICE_TC_FLWR_FIELD_VLAN_TPID (present if specified)

	 * - Tunnel flag (present if tunnel)

	 */

	if (fltr->direction == ICE_ESWITCH_FLTR_EGRESS)

		lkups_cnt++;



	if (flags & ICE_TC_FLWR_FIELD_TENANT_ID)

		lkups_cnt++;
@@ -363,6 +365,11 @@ ice_tc_fill_rules(struct ice_hw *hw, u32 flags, 
	/* Always add direction metadata */

	ice_rule_add_direction_metadata(&list[ICE_TC_METADATA_LKUP_IDX]);



	if (tc_fltr->direction == ICE_ESWITCH_FLTR_EGRESS) {

		ice_rule_add_src_vsi_metadata(&list[i]);

		i++;

	}



	rule_info->tun_type = ice_sw_type_from_tunnel(tc_fltr->tunnel_type);

	if (tc_fltr->tunnel_type != TNL_LAST) {

		i = ice_tc_fill_tunnel_outer(flags, tc_fltr, list, i);
@@ -772,7 +779,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr) 
	int ret;

	int i;



	if (!flags || (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT)) {

	if (flags & ICE_TC_FLWR_FIELD_ENC_SRC_L4_PORT) {

		NL_SET_ERR_MSG_MOD(fltr->extack, "Unsupported encap field(s)");

		return -EOPNOTSUPP;

	}
@@ -820,6 +827,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr) 


	/* specify the cookie as filter_rule_id */

	rule_info.fltr_rule_id = fltr->cookie;

	rule_info.src_vsi = vsi->idx;



	ret = ice_add_adv_rule(hw, list, lkups_cnt, &rule_info, &rule_added);

	if (ret == -EEXIST) {
@@ -1481,7 +1489,10 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, 
		  (BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_PORTS))) {

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_PORTS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_IP) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_OPTS) |

		   BIT_ULL(FLOW_DISSECTOR_KEY_ENC_CONTROL))) {

		NL_SET_ERR_MSG_MOD(fltr->extack, "Tunnel key used, but device isn't a tunnel");

		return -EOPNOTSUPP;

	} else {

drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

+5 −2
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, 


	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {

		struct flow_match_control match;

		u32 val;



		flow_rule_match_control(rule, &match);

		if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
@@ -697,12 +698,14 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, 
		}



		if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {

			val = match.key->flags & FLOW_DIS_IS_FRAGMENT;

			if (ntohs(flow_spec->etype) == ETH_P_IP) {

				flow_spec->ip_flag = IPV4_FLAG_MORE;

				flow_spec->ip_flag = val ? IPV4_FLAG_MORE : 0;

				flow_mask->ip_flag = IPV4_FLAG_MORE;

				req->features |= BIT_ULL(NPC_IPFRAG_IPV4);

			} else if (ntohs(flow_spec->etype) == ETH_P_IPV6) {

				flow_spec->next_header = IPPROTO_FRAGMENT;

				flow_spec->next_header = val ?

							 IPPROTO_FRAGMENT : 0;

				flow_mask->next_header = 0xff;

				req->features |= BIT_ULL(NPC_IPFRAG_IPV6);

			} else {

drivers/net/ethernet/mediatek/mtk_wed.c

+1 −5
Original line number Diff line number Diff line
@@ -1074,13 +1074,13 @@ mtk_wed_dma_disable(struct mtk_wed_device *dev) 
static void

mtk_wed_stop(struct mtk_wed_device *dev)

{

	mtk_wed_dma_disable(dev);

	mtk_wed_set_ext_int(dev, false);



	wed_w32(dev, MTK_WED_WPDMA_INT_TRIGGER, 0);

	wed_w32(dev, MTK_WED_WDMA_INT_TRIGGER, 0);

	wdma_w32(dev, MTK_WDMA_INT_MASK, 0);

	wdma_w32(dev, MTK_WDMA_INT_GRP2, 0);

	wed_w32(dev, MTK_WED_WPDMA_INT_MASK, 0);



	if (!mtk_wed_get_rx_capa(dev))

		return;
@@ -1093,7 +1093,6 @@ static void 
mtk_wed_deinit(struct mtk_wed_device *dev)

{

	mtk_wed_stop(dev);

	mtk_wed_dma_disable(dev);



	wed_clr(dev, MTK_WED_CTRL,

		MTK_WED_CTRL_WDMA_INT_AGENT_EN |
@@ -2605,9 +2604,6 @@ mtk_wed_irq_get(struct mtk_wed_device *dev, u32 mask) 
static void

mtk_wed_irq_set_mask(struct mtk_wed_device *dev, u32 mask)

{

	if (!dev->running)

		return;



	mtk_wed_set_ext_int(dev, !!mask);

	wed_w32(dev, MTK_WED_INT_MASK, mask);

}