]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/mlx5e: Fix nullptr on deleting mirroring rule
authorDima Chumak <dchumak@nvidia.com>
Wed, 24 Nov 2021 07:37:26 +0000 (09:37 +0200)
committerSaeed Mahameed <saeedm@nvidia.com>
Fri, 7 Jan 2022 00:55:39 +0000 (16:55 -0800)
Deleting a Tc rule with multiple outputs, one of which is internal port,
like this one:

  tc filter del dev enp8s0f0_0 ingress protocol ip pref 5 flower \
      dst_mac 0c:42:a1:d1:d0:88 \
      src_mac e4:ea:09:08:00:02 \
      action tunnel_key  set \
          src_ip 0.0.0.0 \
          dst_ip 7.7.7.8 \
          id 8 \
          dst_port 4789 \
      action mirred egress mirror dev vxlan_sys_4789 pipe \
      action mirred egress redirect dev enp8s0f0_1

Triggers a call trace:

  BUG: kernel NULL pointer dereference, address: 0000000000000230
  RIP: 0010:del_sw_hw_rule+0x2b/0x1f0 [mlx5_core]
  Call Trace:
   tree_remove_node+0x16/0x30 [mlx5_core]
   mlx5_del_flow_rules+0x51/0x160 [mlx5_core]
   __mlx5_eswitch_del_rule+0x4b/0x170 [mlx5_core]
   mlx5e_tc_del_fdb_flow+0x295/0x550 [mlx5_core]
   mlx5e_flow_put+0x1f/0x70 [mlx5_core]
   mlx5e_delete_flower+0x286/0x390 [mlx5_core]
   tc_setup_cb_destroy+0xac/0x170
   fl_hw_destroy_filter+0x94/0xc0 [cls_flower]
   __fl_delete+0x15e/0x170 [cls_flower]
   fl_delete+0x36/0x80 [cls_flower]
   tc_del_tfilter+0x3a6/0x6e0
   rtnetlink_rcv_msg+0xe5/0x360
   ? rtnl_calcit.isra.0+0x110/0x110
   netlink_rcv_skb+0x46/0x110
   netlink_unicast+0x16b/0x200
   netlink_sendmsg+0x202/0x3d0
   sock_sendmsg+0x33/0x40
   ____sys_sendmsg+0x1c3/0x200
   ? copy_msghdr_from_user+0xd6/0x150
   ___sys_sendmsg+0x88/0xd0
   ? ___sys_recvmsg+0x88/0xc0
   ? do_futex+0x10c/0x460
   __sys_sendmsg+0x59/0xa0
   do_syscall_64+0x48/0x140
   entry_SYSCALL_64_after_hwframe+0x44/0xa9

Fix by disabling offloading for flows matching
esw_is_chain_src_port_rewrite() which have more than one output.

Fixes: 7e645301d73e ("net/mlx5e: VF tunnel TX traffic offloading")
Signed-off-by: Dima Chumak <dchumak@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

index 32bc08a399256c5ce3bcfed8b9de181ec76045b2..ccb66428aeb5b37d07951e79ec57fd5fe3cbc917 100644 (file)
@@ -295,26 +295,28 @@ esw_setup_chain_src_port_rewrite(struct mlx5_flow_destination *dest,
                                 int *i)
 {
        struct mlx5_esw_flow_attr *esw_attr = attr->esw_attr;
-       int j, err;
+       int err;
 
        if (!(attr->flags & MLX5_ESW_ATTR_FLAG_SRC_REWRITE))
                return -EOPNOTSUPP;
 
-       for (j = esw_attr->split_count; j < esw_attr->out_count; j++, (*i)++) {
-               err = esw_setup_chain_dest(dest, flow_act, chains, attr->dest_chain, 1, 0, *i);
-               if (err)
-                       goto err_setup_chain;
+       /* flow steering cannot handle more than one dest with the same ft
+        * in a single flow
+        */
+       if (esw_attr->out_count - esw_attr->split_count > 1)
+               return -EOPNOTSUPP;
 
-               if (esw_attr->dests[j].pkt_reformat) {
-                       flow_act->action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
-                       flow_act->pkt_reformat = esw_attr->dests[j].pkt_reformat;
-               }
+       err = esw_setup_chain_dest(dest, flow_act, chains, attr->dest_chain, 1, 0, *i);
+       if (err)
+               return err;
+
+       if (esw_attr->dests[esw_attr->split_count].pkt_reformat) {
+               flow_act->action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
+               flow_act->pkt_reformat = esw_attr->dests[esw_attr->split_count].pkt_reformat;
        }
-       return 0;
+       (*i)++;
 
-err_setup_chain:
-       esw_put_dest_tables_loop(esw, attr, esw_attr->split_count, j);
-       return err;
+       return 0;
 }
 
 static void esw_cleanup_chain_src_port_rewrite(struct mlx5_eswitch *esw,