Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

tools/testing/selftests/net/mptcp/mptcp_join.sh
  34aa6e3bccd8 ("selftests: mptcp: add ip mptcp wrappers")

  857898eb4b28 ("selftests: mptcp: add missing join check")
  6ef84b1517e0 ("selftests: mptcp: more robust signal race test")
https://lore.kernel.org/all/20220221131842.468893-1-broonie@kernel.org/

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
  fb7e76ea3f3b6 ("net/mlx5e: TC, Skip redundant ct clear actions")
  c63741b426e11 ("net/mlx5e: Fix MPLSoUDP encap to use MPLS action information")

  09bf97923224f ("net/mlx5e: TC, Move pedit_headers_action to parse_attr")
  84ba8062e383 ("net/mlx5e: Test CT and SAMPLE on flow attr")
  efe6f961cd2e ("net/mlx5e: CT, Don't set flow flag CT for ct clear flow")
  3b49a7edec1d ("net/mlx5e: TC, Reject rules with multiple CT actions")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
index 65f5043ae48d6fdae82503093b0cfdb420f0dd1a,2524b75763cd47438a46e2a66cd3b0fda5166fe3..d0fa3fabbf405abb026964308e3e2bde88f5e865
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16372,9 -16366,11 +16368,10 @@@ F: drivers/watchdog/realtek_otto_wdt.
  
  REALTEK RTL83xx SMI DSA ROUTER CHIPS
  M:    Linus Walleij <linus.walleij@linaro.org>
+ M:    Alvin Šipraga <alsi@bang-olufsen.dk>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 -F:    drivers/net/dsa/realtek-smi*
 -F:    drivers/net/dsa/rtl83*
 +F:    drivers/net/dsa/realtek/*
  
  REALTEK WIRELESS DRIVER (rtlwifi family)
  M:    Ping-Ke Shih <pkshih@realtek.com>

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_common.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_eswitch.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_switch.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
index 519fa1056d9fbc88c7029cd3a829c19ed29ff19a,9cc844bd00f59cea9f47f4876e2985ec10249e22..94a7cf38d6b1b3b33889b16d22973088a05a795e
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
@@@ -16,13 -16,14 +16,15 @@@ struct mlx5e_tc_act_parse_state 
        unsigned int num_actions;
        struct mlx5e_tc_flow *flow;
        struct netlink_ext_ack *extack;
 +      u32 actions;
 +      bool ct;
+       bool ct_clear;
        bool encap;
        bool decap;
        bool mpls_push;
        bool ptype_host;
        const struct ip_tunnel_info *tun_info;
 -      struct pedit_headers_action hdrs[__PEDIT_CMD_MAX];
+       struct mlx5e_mpls_info mpls_info;
        int ifindexes[MLX5_MAX_FLOW_FWD_VPORTS];
        int if_count;
        struct mlx5_tc_ct_priv *ct_priv;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
index 7368f95f23100c3ebda1ef21e95d547ad763d007,58cc33f1363d23ff576d91c9e16e9a9ad7bce00f..b9d38fe807df51ff63b6aa86506c236e6dc60f94
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
@@@ -41,11 -45,7 +45,12 @@@ tc_act_parse_ct(struct mlx5e_tc_act_par
        if (mlx5e_is_eswitch_flow(parse_state->flow))
                attr->esw_attr->split_count = attr->esw_attr->out_count;
  
 +      if (!clear_action) {
 +              attr->flags |= MLX5_ATTR_FLAG_CT;
 +              flow_flag_set(parse_state->flow, CT);
 +              parse_state->ct = true;
 +      }
+       parse_state->ct_clear = clear_action;
  
        return 0;
  }

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mpls.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
index f76624699a8d1d3d6469a80ef5a278d0c8ebf949,70b40ae384e42b8fb9c5679faf1a9a9099537a06..03c953dacb09d20f8d5916cc6279d5cac4d6cba6
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
@@@ -35,9 -35,9 +35,10 @@@ enum 
  
  struct mlx5e_tc_flow_parse_attr {
        const struct ip_tunnel_info *tun_info[MLX5_MAX_FLOW_FWD_VPORTS];
+       struct mlx5e_mpls_info mpls_info[MLX5_MAX_FLOW_FWD_VPORTS];
        struct net_device *filter_dev;
        struct mlx5_flow_spec spec;
 +      struct pedit_headers_action hdrs[__PEDIT_CMD_MAX];
        struct mlx5e_tc_mod_hdr_acts mod_hdr_acts;
        int mirred_ifindex[MLX5_MAX_FLOW_FWD_VPORTS];
        struct ethhdr eth;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
index 171bc6b36aa4005c4f27bdd24727c72c1ce1b6b5,d39d0dae22fcee1a7013129915b6be73eaee3f2a..5105c8018d37fceca8406da33ba2b0fc74709417
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
@@@ -767,7 -748,9 +767,8 @@@ int mlx5e_attach_encap(struct mlx5e_pri
  {
        struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
        struct mlx5e_tc_flow_parse_attr *parse_attr;
 -      struct mlx5_flow_attr *attr = flow->attr;
        const struct ip_tunnel_info *tun_info;
+       const struct mlx5e_mpls_info *mpls_info;
        unsigned long tbl_time_before = 0;
        struct mlx5e_encap_entry *e;
        struct mlx5e_encap_key key;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
Simple merge

diff --cc drivers/net/ethernet/xilinx/ll_temac_main.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/dsa/master.c
Simple merge

diff --cc net/dsa/port.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ip6_offload.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/mptcp/pm.c
Simple merge

diff --cc net/mptcp/pm_netlink.c
Simple merge

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/smc/smc_pnet.c
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
index 725924012b412286d98b15da62a57f24d56dff77,0c8a2a20b96cf04eee3bcca6b2a3ac8465753d1c..77b359a49a470b48a68147781f3d427abff0fff7
--- 1/tools/testing/selftests/net/mptcp/mptcp_join.sh
--- 2/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@@ -1287,17 -1163,20 +1302,20 @@@ signal_address_tests(
  
        # signal addresses race test
        reset
 -      ip netns exec $ns1 ./pm_nl_ctl limits 4 4
 -      ip netns exec $ns2 ./pm_nl_ctl limits 4 4
 -      ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags signal
 -      ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 -      ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal
 -      ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal
 -      ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags signal
 -      ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags signal
 -      ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal
 -      ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal
 +      pm_nl_set_limits $ns1 4 4
 +      pm_nl_set_limits $ns2 4 4
 +      pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
 +      pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
 +      pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
 +      pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
 +      pm_nl_add_endpoint $ns2 10.0.1.2 flags signal
 +      pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
 +      pm_nl_add_endpoint $ns2 10.0.3.2 flags signal
 +      pm_nl_add_endpoint $ns2 10.0.4.2 flags signal
-       run_tests $ns1 $ns2 10.0.1.1
+ 
+       # the peer could possibly miss some addr notification, allow retransmission
+       ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
+       run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
        chk_join_nr "signal addresses race test" 3 3 3
  
        # the server will not signal the address terminating