From: Roi Dayan <roid@nvidia.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
<saeedm@nvidia.com>, <leon@kernel.org>, <davem@davemloft.net>,
<kuba@kernel.org>, <vladbu@nvidia.com>, <paulb@nvidia.com>,
<lariel@nvidia.com>
Cc: <netdev@vger.kernel.org>, <linux-rdma@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH] net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'
Date: Sun, 7 Nov 2021 09:49:47 +0200 [thread overview]
Message-ID: <c76779a3-aa4a-98af-f04d-3a8b41a58cb6@nvidia.com> (raw)
In-Reply-To: <3055988affc39dff4d2a5c00a8d18474b0d63e26.1636218396.git.christophe.jaillet@wanadoo.fr>
On 2021-11-06 7:08 PM, Christophe JAILLET wrote:
> All the error handling paths of 'mlx5e_tc_add_fdb_flow()' end to 'err_out'
> where 'flow_flag_set(flow, FAILED);' is called.
>
> All but the new error handling paths added by the commits given in the
> Fixes tag below.
>
> Fix these error handling paths and branch to 'err_out'.
>
> Fixes: 166f431ec6be ("net/mlx5e: Add indirect tc offload of ovs internal port")
> Fixes: b16eb3c81fe2 ("net/mlx5: Support internal port as decap route device")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> This patch is speculative, review with care.
> ---
> drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> index 835caa1c7b74..ff881307c744 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> @@ -1445,7 +1445,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
> MLX5_FLOW_NAMESPACE_FDB, VPORT_TO_REG,
> metadata);
> if (err)
> - return err;
> + goto err_out;
> }
> }
>
> @@ -1461,13 +1461,15 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
> if (attr->chain) {
> NL_SET_ERR_MSG_MOD(extack,
> "Internal port rule is only supported on chain 0");
> - return -EOPNOTSUPP;
> + err = -EOPNOTSUPP;
> + goto err_out;
> }
>
> if (attr->dest_chain) {
> NL_SET_ERR_MSG_MOD(extack,
> "Internal port rule offload doesn't support goto action");
> - return -EOPNOTSUPP;
> + err = -EOPNOTSUPP;
> + goto err_out;
> }
>
> int_port = mlx5e_tc_int_port_get(mlx5e_get_int_port_priv(priv),
> @@ -1475,8 +1477,10 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
> flow_flag_test(flow, EGRESS) ?
> MLX5E_TC_INT_PORT_EGRESS :
> MLX5E_TC_INT_PORT_INGRESS);
> - if (IS_ERR(int_port))
> - return PTR_ERR(int_port);
> + if (IS_ERR(int_port)) {
> + err = PTR_ERR(int_port);
> + goto err_out;
> + }
>
> esw_attr->int_port = int_port;
> }
>
thanks for catching this.
Reviewed-by: Roi Dayan <roid@nvidia.com>
next prev parent reply other threads:[~2021-11-07 7:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-06 17:08 [PATCH] net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()' Christophe JAILLET
2021-11-07 7:49 ` Roi Dayan [this message]
2021-11-16 20:44 ` Saeed Mahameed
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=c76779a3-aa4a-98af-f04d-3a8b41a58cb6@nvidia.com \
--to=roid@nvidia.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=lariel@nvidia.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paulb@nvidia.com \
--cc=saeedm@nvidia.com \
--cc=vladbu@nvidia.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).