Add new RDMA TX flow steering namespace. Flow steering rules in this namespace are used to filter transmitted RDMA traffic.
Unified · Split
| @@ -904,6 +904,7 @@ const struct mlx5_flow_cmds *mlx5_fs_cmd_get_default(enum fs_flow_table_type typ · 903 unmodified lines | |||
| 904 | case FS_FT_SNIFFER_TX: | 904 | case FS_FT_SNIFFER_TX: |
| 905 | case FS_FT_NIC_TX: | 905 | case FS_FT_NIC_TX: |
| 906 | case FS_FT_RDMA_RX: | 906 | case FS_FT_RDMA_RX: |
| 907 | case FS_FT_RDMA_TX: | ||
| 907 | return mlx5_fs_cmd_get_fw_cmds(); | 908 | return mlx5_fs_cmd_get_fw_cmds(); |
| 908 | default: | 909 | default: |
| 909 | return mlx5_fs_cmd_get_stub_cmds(); | 910 | return mlx5_fs_cmd_get_stub_cmds(); |
| @@ -87,6 +87,15 @@ · 86 unmodified lines | |||
| 87 | .identified_miss_table_mode), \ | 87 | .identified_miss_table_mode), \ |
| 88 | FS_CAP(flow_table_properties_nic_transmit.flow_table_modify)) | 88 | FS_CAP(flow_table_properties_nic_transmit.flow_table_modify)) |
| 89 | 89 | ||
| 90 | #define FS_CHAINING_CAPS_RDMA_TX \ | ||
| 91 | FS_REQUIRED_CAPS( \ | ||
| 92 | FS_CAP(flow_table_properties_nic_transmit_rdma.flow_modify_en), \ | ||
| 93 | FS_CAP(flow_table_properties_nic_transmit_rdma.modify_root), \ | ||
| 94 | FS_CAP(flow_table_properties_nic_transmit_rdma \ | ||
| 95 | .identified_miss_table_mode), \ | ||
| 96 | FS_CAP(flow_table_properties_nic_transmit_rdma \ | ||
| 97 | .flow_table_modify)) | ||
| 98 | |||
| 90 | #define LEFTOVERS_NUM_LEVELS 1 | 99 | #define LEFTOVERS_NUM_LEVELS 1 |
| 91 | #define LEFTOVERS_NUM_PRIOS 1 | 100 | #define LEFTOVERS_NUM_PRIOS 1 |
| 92 | 101 | ||
| @@ -202,6 +211,18 @@ static struct init_tree_node rdma_rx_root_fs = { · 109 unmodified lines | |||
| 202 | } | 211 | } |
| 203 | }; | 212 | }; |
| 204 | 213 | ||
| 214 | static struct init_tree_node rdma_tx_root_fs = { | ||
| 215 | .type = FS_TYPE_NAMESPACE, | ||
| 216 | .ar_size = 1, | ||
| 217 | .children = (struct init_tree_node[]) { | ||
| 218 | ADD_PRIO(0, MLX5_BY_PASS_NUM_PRIOS, 0, | ||
| 219 | FS_CHAINING_CAPS_RDMA_TX, | ||
| 220 | ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF, | ||
| 221 | ADD_MULTIPLE_PRIO(MLX5_BY_PASS_NUM_PRIOS, | ||
| 222 | BY_PASS_PRIO_NUM_LEVELS))), | ||
| 223 | } | ||
| 224 | }; | ||
| 225 | |||
| 205 | enum fs_i_lock_class { | 226 | enum fs_i_lock_class { |
| 206 | FS_LOCK_GRANDPARENT, | 227 | FS_LOCK_GRANDPARENT, |
| 207 | FS_LOCK_PARENT, | 228 | FS_LOCK_PARENT, |
| @@ -2132,6 +2153,8 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev, · 1924 unmodified lines | |||
| 2132 | } else if (type == MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL) { | 2153 | } else if (type == MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL) { |
| 2133 | root_ns = steering->rdma_rx_root_ns; | 2154 | root_ns = steering->rdma_rx_root_ns; |
| 2134 | prio = RDMA_RX_KERNEL_PRIO; | 2155 | prio = RDMA_RX_KERNEL_PRIO; |
| 2156 | } else if (type == MLX5_FLOW_NAMESPACE_RDMA_TX) { | ||
| 2157 | root_ns = steering->rdma_tx_root_ns; | ||
| 2135 | } else { /* Must be NIC RX */ | 2158 | } else { /* Must be NIC RX */ |
| 2136 | root_ns = steering->root_ns; | 2159 | root_ns = steering->root_ns; |
| 2137 | prio = type; | 2160 | prio = type; |
| @@ -2535,6 +2558,7 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev) · 397 unmodified lines | |||
| 2535 | cleanup_root_ns(steering->sniffer_rx_root_ns); | 2558 | cleanup_root_ns(steering->sniffer_rx_root_ns); |
| 2536 | cleanup_root_ns(steering->sniffer_tx_root_ns); | 2559 | cleanup_root_ns(steering->sniffer_tx_root_ns); |
| 2537 | cleanup_root_ns(steering->rdma_rx_root_ns); | 2560 | cleanup_root_ns(steering->rdma_rx_root_ns); |
| 2561 | cleanup_root_ns(steering->rdma_tx_root_ns); | ||
| 2538 | cleanup_root_ns(steering->egress_root_ns); | 2562 | cleanup_root_ns(steering->egress_root_ns); |
| 2539 | mlx5_cleanup_fc_stats(dev); | 2563 | mlx5_cleanup_fc_stats(dev); |
| 2540 | kmem_cache_destroy(steering->ftes_cache); | 2564 | kmem_cache_destroy(steering->ftes_cache); |
| @@ -2591,6 +2615,29 @@ out_err: · 50 unmodified lines | |||
| 2591 | return err; | 2615 | return err; |
| 2592 | } | 2616 | } |
| 2593 | 2617 | ||
| 2618 | static int init_rdma_tx_root_ns(struct mlx5_flow_steering *steering) | ||
| 2619 | { | ||
| 2620 | int err; | ||
| 2621 | |||
| 2622 | steering->rdma_tx_root_ns = create_root_ns(steering, FS_FT_RDMA_TX); | ||
| 2623 | if (!steering->rdma_tx_root_ns) | ||
| 2624 | return -ENOMEM; | ||
| 2625 | |||
| 2626 | err = init_root_tree(steering, &rdma_tx_root_fs, | ||
| 2627 | &steering->rdma_tx_root_ns->ns.node); | ||
| 2628 | if (err) | ||
| 2629 | goto out_err; | ||
| 2630 | |||
| 2631 | set_prio_attrs(steering->rdma_tx_root_ns); | ||
| 2632 | |||
| 2633 | return 0; | ||
| 2634 | |||
| 2635 | out_err: | ||
| 2636 | cleanup_root_ns(steering->rdma_tx_root_ns); | ||
| 2637 | steering->rdma_tx_root_ns = NULL; | ||
| 2638 | return err; | ||
| 2639 | } | ||
| 2640 | |||
| 2594 | /* FT and tc chains are stored in the same array so we can re-use the | 2641 | /* FT and tc chains are stored in the same array so we can re-use the |
| 2595 | * mlx5_get_fdb_sub_ns() and tc api for FT chains. | 2642 | * mlx5_get_fdb_sub_ns() and tc api for FT chains. |
| 2596 | * When creating a new ns for each chain store it in the first available slot. | 2643 | * When creating a new ns for each chain store it in the first available slot. |
| @@ -2890,6 +2937,12 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) · 293 unmodified lines | |||
| 2890 | goto err; | 2937 | goto err; |
| 2891 | } | 2938 | } |
| 2892 | 2939 | ||
| 2940 | if (MLX5_CAP_FLOWTABLE_RDMA_TX(dev, ft_support)) { | ||
| 2941 | err = init_rdma_tx_root_ns(steering); | ||
| 2942 | if (err) | ||
| 2943 | goto err; | ||
| 2944 | } | ||
| 2945 | |||
| 2893 | if (MLX5_IPSEC_DEV(dev) || MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) { | 2946 | if (MLX5_IPSEC_DEV(dev) || MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) { |
| 2894 | err = init_egress_root_ns(steering); | 2947 | err = init_egress_root_ns(steering); |
| 2895 | if (err) | 2948 | if (err) |
| @@ -86,7 +86,8 @@ enum fs_flow_table_type { · 85 unmodified lines | |||
| 86 | FS_FT_SNIFFER_RX = 0X5, | 86 | FS_FT_SNIFFER_RX = 0X5, |
| 87 | FS_FT_SNIFFER_TX = 0X6, | 87 | FS_FT_SNIFFER_TX = 0X6, |
| 88 | FS_FT_RDMA_RX = 0X7, | 88 | FS_FT_RDMA_RX = 0X7, |
| 89 | FS_FT_MAX_TYPE = FS_FT_RDMA_RX, | 89 | FS_FT_RDMA_TX = 0X8, |
| 90 | FS_FT_MAX_TYPE = FS_FT_RDMA_TX, | ||
| 90 | }; | 91 | }; |
| 91 | 92 | ||
| 92 | enum fs_flow_table_op_mod { | 93 | enum fs_flow_table_op_mod { |
| @@ -116,6 +117,7 @@ struct mlx5_flow_steering { · 23 unmodified lines | |||
| 116 | struct mlx5_flow_root_namespace *sniffer_tx_root_ns; | 117 | struct mlx5_flow_root_namespace *sniffer_tx_root_ns; |
| 117 | struct mlx5_flow_root_namespace *sniffer_rx_root_ns; | 118 | struct mlx5_flow_root_namespace *sniffer_rx_root_ns; |
| 118 | struct mlx5_flow_root_namespace *rdma_rx_root_ns; | 119 | struct mlx5_flow_root_namespace *rdma_rx_root_ns; |
| 120 | struct mlx5_flow_root_namespace *rdma_tx_root_ns; | ||
| 119 | struct mlx5_flow_root_namespace *egress_root_ns; | 121 | struct mlx5_flow_root_namespace *egress_root_ns; |
| 120 | }; | 122 | }; |
| 121 | 123 | ||
| @@ -316,7 +318,8 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev); · 194 unmodified lines | |||
| 316 | (type == FS_FT_SNIFFER_RX) ? MLX5_CAP_FLOWTABLE_SNIFFER_RX(mdev, cap) : \ | 318 | (type == FS_FT_SNIFFER_RX) ? MLX5_CAP_FLOWTABLE_SNIFFER_RX(mdev, cap) : \ |
| 317 | (type == FS_FT_SNIFFER_TX) ? MLX5_CAP_FLOWTABLE_SNIFFER_TX(mdev, cap) : \ | 319 | (type == FS_FT_SNIFFER_TX) ? MLX5_CAP_FLOWTABLE_SNIFFER_TX(mdev, cap) : \ |
| 318 | (type == FS_FT_RDMA_RX) ? MLX5_CAP_FLOWTABLE_RDMA_RX(mdev, cap) : \ | 320 | (type == FS_FT_RDMA_RX) ? MLX5_CAP_FLOWTABLE_RDMA_RX(mdev, cap) : \ |
| 319 | (BUILD_BUG_ON_ZERO(FS_FT_RDMA_RX != FS_FT_MAX_TYPE))\ | 321 | (type == FS_FT_RDMA_TX) ? MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) : \ |
| 322 | (BUILD_BUG_ON_ZERO(FS_FT_RDMA_TX != FS_FT_MAX_TYPE))\ | ||
| 320 | ) | 323 | ) |
| 321 | 324 | ||
| 322 | #endif | 325 | #endif |
| @@ -1211,6 +1211,12 @@ enum mlx5_qcam_feature_groups { · 1210 unmodified lines | |||
| 1211 | #define MLX5_CAP_FLOWTABLE_RDMA_RX_MAX(mdev, cap) \ | 1211 | #define MLX5_CAP_FLOWTABLE_RDMA_RX_MAX(mdev, cap) \ |
| 1212 | MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive_rdma.cap) | 1212 | MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive_rdma.cap) |
| 1213 | 1213 | ||
| 1214 | #define MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) \ | ||
| 1215 | MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_transmit_rdma.cap) | ||
| 1216 | |||
| 1217 | #define MLX5_CAP_FLOWTABLE_RDMA_TX_MAX(mdev, cap) \ | ||
| 1218 | MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_transmit_rdma.cap) | ||
| 1219 | |||
| 1214 | #define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \ | 1220 | #define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \ |
| 1215 | MLX5_GET(flow_table_eswitch_cap, \ | 1221 | MLX5_GET(flow_table_eswitch_cap, \ |
| 1216 | mdev->caps.hca_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap) | 1222 | mdev->caps.hca_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap) |
| @@ -77,6 +77,7 @@ enum mlx5_flow_namespace_type { · 76 unmodified lines | |||
| 77 | MLX5_FLOW_NAMESPACE_EGRESS, | 77 | MLX5_FLOW_NAMESPACE_EGRESS, |
| 78 | MLX5_FLOW_NAMESPACE_RDMA_RX, | 78 | MLX5_FLOW_NAMESPACE_RDMA_RX, |
| 79 | MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL, | 79 | MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL, |
| 80 | MLX5_FLOW_NAMESPACE_RDMA_TX, | ||
| 80 | }; | 81 | }; |
| 81 | 82 | ||
| 82 | enum { | 83 | enum { |
| @@ -705,7 +705,7 @@ struct mlx5_ifc_flow_table_nic_cap_bits { · 704 unmodified lines | |||
| 705 | 705 | ||
| 706 | struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit; | 706 | struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit; |
| 707 | 707 | ||
| 708 | u8 reserved_at_a00[0x200]; | 708 | struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_rdma; |
| 709 | 709 | ||
| 710 | struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_sniffer; | 710 | struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_sniffer; |
| 711 | 711 | ||