Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.34; helo=mail.nvidia.com;
Message-ID: <c76779a3-aa4a-98af-f04d-3a8b41a58cb6@nvidia.com>
Date:   Sun, 7 Nov 2021 09:49:47 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:95.0) Gecko/20100101
 Thunderbird/95.0
Subject: Re: [PATCH] net/mlx5: Fix some error handling paths in
 'mlx5e_tc_add_fdb_flow()'
Content-Language: en-US
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>
References: <3055988affc39dff4d2a5c00a8d18474b0d63e26.1636218396.git.christophe.jaillet@wanadoo.fr>
From:   Roi Dayan <roid@nvidia.com>
In-Reply-To: <3055988affc39dff4d2a5c00a8d18474b0d63e26.1636218396.git.christophe.jaillet@wanadoo.fr>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2021 07:49:53.9301
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 3be8c76b-3f6b-4d5f-1a63-08d9a1c32fb9
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT010.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB5542
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


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>