From: Viacheslav Ovsiienko <viacheslavo@nvidia.com> To: dev@dpdk.org Cc: rasland@nvidia.com, matan@nvidia.com, orika@nvidia.com, thomas@monjalon.net, xiangxia.m.yue@gmail.com, stable@dpdk.org Subject: [dpdk-stable] [PATCH v3] net/mlx5: check the reg available for metadata action Date: Fri, 20 Nov 2020 14:48:03 +0000 Message-ID: <1605883683-11576-1-git-send-email-viacheslavo@nvidia.com> (raw) In-Reply-To: <20200524110641.72147-1-xiangxia.m.yue@gmail.com> From: Tonghao Zhang <xiangxia.m.yue@gmail.com> 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 <xiangxia.m.yue@gmail.com> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com> --- drivers/net/mlx5/mlx5_flow_dv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index fa2e8f2..bee22f5 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1217,6 +1217,7 @@ struct field_modify_info modify_tcp[] = { 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 @@ struct field_modify_info modify_tcp[] = { 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 @@ struct field_modify_info modify_tcp[] = { 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 @@ struct mlx5_hlist_entry * 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 -- 1.8.3.1
next prev parent reply other threads:[~2020-11-20 14:48 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20200520013328.98838-1-xiangxia.m.yue@gmail.com> 2020-05-24 11:06 ` [dpdk-stable] [PATCH dpdk-dev v2] " xiangxia.m.yue 2020-08-05 17:09 ` Slava Ovsiienko 2020-11-20 14:48 ` Viacheslav Ovsiienko [this message] 2020-11-22 13:00 ` [dpdk-stable] [PATCH v3] " Raslan Darawsheh
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1605883683-11576-1-git-send-email-viacheslavo@nvidia.com \ --to=viacheslavo@nvidia.com \ --cc=dev@dpdk.org \ --cc=matan@nvidia.com \ --cc=orika@nvidia.com \ --cc=rasland@nvidia.com \ --cc=stable@dpdk.org \ --cc=thomas@monjalon.net \ --cc=xiangxia.m.yue@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git