From 8c8c3b01c3b583ec2f485ef279254f5a9e3c419c Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Tue, 21 Jul 2020 16:13:40 +0800 Subject: [PATCH] vdpa/mlx5: fix compatibility with MISC4 When dynamic flex parser feature is introduced, the support for misc parameters 4 of flow table entry (FTE) match set is needed. The structure of "mlx5_ifc_fte_match_param_bits" is extended with "mlx5_ifc_fte_match_set_misc4_bits" at the end of it. The total size of the FTE match set will be changed into 384 bytes from 320 bytes. Low level user space driver (rdma-core) will have the validation of the length of FTE match set. In the old release that no MISC4 supported in the rdma-core, and this will break the backward compatibility, even if the MISC4 is not used in most cases, like in vDPA driver. In order not to break the compatibility old rdma-core, the length adjustment needs to be done. In mlx5 vDPA driver, the lengths of the matcher and value are both set to 320 without MISC4. There is no need to change the structure definition, all bytes of the MISC4 will be discarded if it is not needed. Since the MISC4 parameter is aligned with a 64B boundary and so does the whole FTE match set parameter, there is no need to take any padding and alignment into consideration when calculating the size. Fixes: daa38a8924a0 ("net/mlx5: add flow translation of eCPRI header") Signed-off-by: Bing Zhao Acked-by: Matan Azrad Reviewed-by: Maxime Coquelin --- drivers/vdpa/mlx5/mlx5_vdpa_steer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c index 406c7be17f..1fcd24c002 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c @@ -139,10 +139,12 @@ mlx5_vdpa_rss_flows_create(struct mlx5_vdpa_priv *priv) uint32_t buf[MLX5_ST_SZ_DW(fte_match_param)]; /**< Matcher value. This value is used as the mask or a key. */ } matcher_mask = { - .size = sizeof(matcher_mask.buf), + .size = sizeof(matcher_mask.buf) - + MLX5_ST_SZ_BYTES(fte_match_set_misc4), }, matcher_value = { - .size = sizeof(matcher_value.buf), + .size = sizeof(matcher_value.buf) - + MLX5_ST_SZ_BYTES(fte_match_set_misc4), }; struct mlx5dv_flow_matcher_attr dv_attr = { .type = IBV_FLOW_ATTR_NORMAL, -- 2.20.1