From: Gregory Etelson Date: Wed, 18 Nov 2020 18:23:59 +0000 (+0200) Subject: net/mlx5: fix restore info in non-tunnel traffic X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=1db3678dbd62f1d13360ecfc4548fe0d1211b5df net/mlx5: fix restore info in non-tunnel traffic Tunnel offload API provides applications with ability to restore packet outer headers after partial offload. Exact feature execution depends on hardware abilities and PMD implementation. Hardware that is supported by MLX5 PMD places a mark on a packet after partial offload. PMD decodes that mark and provides application with required information. Application can call the restore API for packets that are part of offloaded tunnel and not. It's up to a PMD to provide correct information. Current MLX5 tunnel offload implementation does not allow applications to use flow MARK actions. It is restricted to tunnel offload use only. This fault was triggered by application that did not activate tunnel offload and called the restore API with a marked packet. The PMD tried to decode the mark value and crashed. The patch decodes mark value only if tunnel offload is active. Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index ad891d6758..772f1145aa 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -7819,6 +7819,11 @@ mlx5_flow_tunnel_get_restore_info(struct rte_eth_dev *dev, const struct mlx5_flow_tbl_data_entry *tble; const uint64_t mask = PKT_RX_FDIR | PKT_RX_FDIR_ID; + if (!is_tunnel_offload_active(dev)) { + info->flags = 0; + return 0; + } + if ((ol_flags & mask) != mask) goto err; tble = tunnel_mark_decode(dev, m->hash.fdir.hi);