diff mbox series

[v2] net/mlx5: fix NULL err msg in mlx5_flow_tunnel_validate

Message ID 1632285618-7830-1-git-send-email-wenxu@ucloud.cn (mailing list archive)
State New
Delegated to: Raslan Darawsheh
Headers show
Series [v2] net/mlx5: fix NULL err msg in mlx5_flow_tunnel_validate | expand

Checks

Context Check Description
ci/github-robot: build success github build: passed
ci/intel-Testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-broadcom-Functional fail Functional Testing issues
ci/iol-mellanox-Functional fail Functional Testing issues
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/checkpatch warning coding style issues

Commit Message

wenxu@ucloud.cn Sept. 22, 2021, 4:40 a.m. UTC
From: wenxu <wenxu@ucloud.cn>

If the mlx5_flow_tunnel_validate validating the flow tunnel
rule failed, the err_msg will be NULL in the rte_flow_error.

Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")

Signed-off-by: wenxu <wenxu@ucloud.cn>
---
 drivers/net/mlx5/mlx5_flow.c | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index e63a297..3c5aca0 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -9081,30 +9081,31 @@  int mlx5_alloc_tunnel_hub(struct mlx5_dev_ctx_shared *sh)
 	return err;
 }
 
-static inline bool
+static inline int
 mlx5_flow_tunnel_validate(struct rte_eth_dev *dev,
 			  struct rte_flow_tunnel *tunnel,
-			  const char *err_msg)
+			  struct rte_flow_error *error)
 {
-	err_msg = NULL;
 	if (!is_tunnel_offload_active(dev)) {
-		err_msg = "tunnel offload was not activated";
-		goto out;
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+					  "tunnel offload was not activated");
 	} else if (!tunnel) {
-		err_msg = "no application tunnel";
-		goto out;
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+					  "no application tunnel");
 	}
 
 	switch (tunnel->type) {
 	default:
-		err_msg = "unsupported tunnel type";
-		goto out;
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+					  "unsupported tunnel type");
 	case RTE_FLOW_ITEM_TYPE_VXLAN:
 		break;
 	}
 
-out:
-	return !err_msg;
+	return 0;
 }
 
 static int
@@ -9116,13 +9117,11 @@  int mlx5_alloc_tunnel_hub(struct mlx5_dev_ctx_shared *sh)
 {
 	int ret;
 	struct mlx5_flow_tunnel *tunnel;
-	const char *err_msg = NULL;
-	bool verdict = mlx5_flow_tunnel_validate(dev, app_tunnel, err_msg);
 
-	if (!verdict)
-		return rte_flow_error_set(error, EINVAL,
-					  RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
-					  err_msg);
+	ret = mlx5_flow_tunnel_validate(dev, app_tunnel, error);
+	if (ret < 0)
+		return ret;
+
 	ret = mlx5_get_flow_tunnel(dev, app_tunnel, &tunnel);
 	if (ret < 0) {
 		return rte_flow_error_set(error, ret,
@@ -9143,13 +9142,11 @@  int mlx5_alloc_tunnel_hub(struct mlx5_dev_ctx_shared *sh)
 {
 	int ret;
 	struct mlx5_flow_tunnel *tunnel;
-	const char *err_msg = NULL;
-	bool verdict = mlx5_flow_tunnel_validate(dev, app_tunnel, err_msg);
 
-	if (!verdict)
-		return rte_flow_error_set(error, EINVAL,
-					  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-					  err_msg);
+	ret = mlx5_flow_tunnel_validate(dev, app_tunnel, error);
+	if (ret < 0)
+		return ret;
+
 	ret = mlx5_get_flow_tunnel(dev, app_tunnel, &tunnel);
 	if (ret < 0) {
 		return rte_flow_error_set(error, ret,