[dpdk-dev] [PATCH] net/mlx5: fix crash when releasing the meter table
Raslan Darawsheh
rasland at mellanox.com
Tue Apr 21 17:02:50 CEST 2020
Hi,
> -----Original Message-----
> From: dev <dev-bounces at dpdk.org> On Behalf Of
> xiangxia.m.yue at gmail.com
> Sent: Wednesday, April 15, 2020 11:52 AM
> To: Suanming Mou <suanmingm at mellanox.com>;
> david.marchand at redhat.com
> Cc: dev at dpdk.org; Tonghao Zhang <xiangxia.m.yue at gmail.com>;
> stable at dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix crash when releasing the meter
> table
>
> From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
>
> The meters of ports share the same meter table on
> the port. When releasing meters, don't check value returned
> using assert. Because other meters may reference to it.
>
> Fixes: 46a5e6bc6a85 ("net/mlx5: prepare meter flow tables")
> Fixes: 708aa5608f98 ("net/mlx5: fix meter suffix table leak")
>
> Cc: stable at dpdk.org
>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
> ---
> drivers/net/mlx5/mlx5_flow_dv.c | 18 ++++++------------
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index ae00ca431eec..2174b9aa37dc 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -8552,11 +8552,9 @@ struct field_modify_info modify_tcp[] = {
> claim_zero(mlx5_glue->dv_destroy_flow_matcher
> (mtd->egress.any_matcher));
> if (mtd->egress.tbl)
> - claim_zero(flow_dv_tbl_resource_release(dev,
> - mtd->egress.tbl));
> + flow_dv_tbl_resource_release(dev, mtd->egress.tbl);
> if (mtd->egress.sfx_tbl)
> - claim_zero(flow_dv_tbl_resource_release(dev,
> - mtd-
> >egress.sfx_tbl));
> + flow_dv_tbl_resource_release(dev, mtd->egress.sfx_tbl);
> if (mtd->ingress.color_matcher)
> claim_zero(mlx5_glue->dv_destroy_flow_matcher
> (mtd->ingress.color_matcher));
> @@ -8564,11 +8562,9 @@ struct field_modify_info modify_tcp[] = {
> claim_zero(mlx5_glue->dv_destroy_flow_matcher
> (mtd->ingress.any_matcher));
> if (mtd->ingress.tbl)
> - claim_zero(flow_dv_tbl_resource_release(dev,
> - mtd->ingress.tbl));
> + flow_dv_tbl_resource_release(dev, mtd->ingress.tbl);
> if (mtd->ingress.sfx_tbl)
> - claim_zero(flow_dv_tbl_resource_release(dev,
> - mtd-
> >ingress.sfx_tbl));
> + flow_dv_tbl_resource_release(dev, mtd->ingress.sfx_tbl);
> if (mtd->transfer.color_matcher)
> claim_zero(mlx5_glue->dv_destroy_flow_matcher
> (mtd->transfer.color_matcher));
> @@ -8576,11 +8572,9 @@ struct field_modify_info modify_tcp[] = {
> claim_zero(mlx5_glue->dv_destroy_flow_matcher
> (mtd->transfer.any_matcher));
> if (mtd->transfer.tbl)
> - claim_zero(flow_dv_tbl_resource_release(dev,
> - mtd->transfer.tbl));
> + flow_dv_tbl_resource_release(dev, mtd->transfer.tbl);
> if (mtd->transfer.sfx_tbl)
> - claim_zero(flow_dv_tbl_resource_release(dev,
> - mtd-
> >transfer.sfx_tbl));
> + flow_dv_tbl_resource_release(dev, mtd->transfer.sfx_tbl);
> if (mtd->drop_actn)
> claim_zero(mlx5_glue->destroy_flow_action(mtd-
> >drop_actn));
> rte_free(mtd);
> --
> 1.8.3.1
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
More information about the dev
mailing list