d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix eCPRI matching

Browse Source 
When an ETH or VLAN flow item directly preceding ECPRI (i. e. a pattern
for eCPRI over Ethernet) did not specify the eCPRI protocol, matches
were not restricted to eCPRI traffic. For example, "eth / ecpri / end"
pattern behaved as "eth / end". Implicitly add Ethernet type condition,
so that "eth / ecpri / end" behaves as "eth type is 0xAEFE / end".

Fixes: daa38a8924 ("net/mlx5: add flow translation of eCPRI header")
Cc: stable@dpdk.org

Signed-off-by: Dmitry Kozlyuk <dkozlyuk@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
This commit is contained in:
Dmitry Kozlyuk 2021-08-09 17:26:46 +03:00 committed by Raslan Darawsheh
parent 828274b70a
commit 12d42b248c
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/mlx5/mlx5_flow_dv.c
View File

@ -9976,12 +9976,13 @@ flow_dv_translate_item_gtp_psc(void *matcher, void *key,
* Flow matcher value.
* @param[in] item
* Flow pattern to translate.
* @param[in] samples
* Sample IDs to be used in the matching.
* @param[in] last_item
* Last item flags.
*/
static void
flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
void *key, const struct rte_flow_item *item)
void *key, const struct rte_flow_item *item,
uint64_t last_item)
{
struct mlx5_priv *priv = dev->data->dev_private;
const struct rte_flow_item_ecpri *ecpri_m = item->mask;
@ -9994,6 +9995,22 @@ flow_dv_translate_item_ecpri(struct rte_eth_dev *dev, void *matcher,
void *dw_m;
void *dw_v;
/*
* In case of eCPRI over Ethernet, if EtherType is not specified,
* match on eCPRI EtherType implicitly.
*/
if (last_item & MLX5_FLOW_LAYER_OUTER_L2) {
void *hdrs_m, *hdrs_v, *l2m, *l2v;
hdrs_m = MLX5_ADDR_OF(fte_match_param, matcher, outer_headers);
hdrs_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers);
l2m = MLX5_ADDR_OF(fte_match_set_lyr_2_4, hdrs_m, ethertype);
l2v = MLX5_ADDR_OF(fte_match_set_lyr_2_4, hdrs_v, ethertype);
if (*(uint16_t *)l2m == 0 && *(uint16_t *)l2v == 0) {
*(uint16_t *)l2m = UINT16_MAX;
*(uint16_t *)l2v = RTE_BE16(RTE_ETHER_TYPE_ECPRI);
}
}
if (!ecpri_v)
return;
if (!ecpri_m)
@ -13474,7 +13491,8 @@ flow_dv_translate(struct rte_eth_dev *dev,
"cannot create eCPRI parser");
}
flow_dv_translate_item_ecpri(dev, match_mask,
match_value, items);
match_value, items,
last_item);
/* No other protocol should follow eCPRI layer. */
last_item = MLX5_FLOW_LAYER_ECPRI;
break;