From: Tonghao Zhang Date: Fri, 20 Nov 2020 14:48:03 +0000 (+0000) Subject: net/mlx5: check register available for metadata action X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=5ea8356ec86bd9c4d5bd52588522b9911f18836d net/mlx5: check register available for metadata action If user don't set the dv_xmeta_en to 1 or 2, in the flow_dv_convert_action_set_meta function: - flow_dv_get_metadata_reg may return the REG_NONE, when MLX5_METADATA_FDB enabled for metadata set action. - reg_to_field(REG_NONE) returns MLX5_MODI_OUT_NONE, that is invalid and rdma-core fails. The rdma-core calltrace: dr_action_create_modify_action dr_actions_convert_modify_header dr_action_modify_sw_to_hw dr_action_modify_sw_to_hw_set dr_ste_get_modify_hdr_hw_field Fixes: fcc8d2f716fd ("net/mlx5: extend flow metadata support") Cc: stable@dpdk.org Signed-off-by: Tonghao Zhang Signed-off-by: Viacheslav Ovsiienko --- diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 5c01796362..f546b89b73 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1217,6 +1217,7 @@ flow_dv_convert_action_set_meta if (reg < 0) return reg; + MLX5_ASSERT(reg != REG_NON); /* * In datapath code there is no endianness * coversions for perfromance reasons, all @@ -1438,6 +1439,10 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, reg = flow_dv_get_metadata_reg(dev, attr, error); if (reg < 0) return reg; + if (reg == REG_NON) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "unavalable extended metadata register"); if (reg == REG_B) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, @@ -2446,6 +2451,10 @@ flow_dv_validate_action_set_meta(struct rte_eth_dev *dev, reg = flow_dv_get_metadata_reg(dev, attr, error); if (reg < 0) return reg; + if (reg == REG_NON) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "unavalable extended metadata register"); if (reg != REG_A && reg != REG_B) { struct mlx5_priv *priv = dev->data->dev_private; @@ -7471,6 +7480,7 @@ flow_dv_translate_item_meta(struct rte_eth_dev *dev, reg = flow_dv_get_metadata_reg(dev, attr, NULL); if (reg < 0) return; + MLX5_ASSERT(reg != REG_NON); /* * In datapath code there is no endianness * coversions for perfromance reasons, all