From patchwork Thu Nov 23 16:13:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 31599 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4BE9258CB; Thu, 23 Nov 2017 17:13:37 +0100 (CET) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 1D5C62BEF for ; Thu, 23 Nov 2017 17:13:31 +0100 (CET) Received: by mail-wm0-f65.google.com with SMTP id y80so17570405wmd.0 for ; Thu, 23 Nov 2017 08:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=tK1rY7egJiCBx/MfCd9VivLOeM8JFO2XswgoZyxICOQ=; b=jXTkxx0sdnc8CA3S6A1eUfyiTZo+3VEo3R8koaGFGqAV7CehUJlPxuDr3URWWC1tAp Y7bBsdHN7Ogqf2+fsKpaeR4gYmR+M+9EsIJa2zaepHMA1K29geJb1r14XBbCA3hftR7A kgXQVJB15hjru4gq3u5DdFvN3/6oyH1rf8jmDtHdGGQcGyl0vIkApDocArHo903Eejya 4AfyzR0+CQksMpFDrqwsVYANAmisBBCNiRCajYNbIKJddTUjoz+yrBmxBMCU5l4cIc28 hdqfTkHHjf54mPZmFCIAZHxPj1NUEltctedZwU9LtUUHpLRcJZMj+thQMiwGOBl8qMcl yXrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=tK1rY7egJiCBx/MfCd9VivLOeM8JFO2XswgoZyxICOQ=; b=HJDFgBo+37XZQHNPETeF5IGS7QtiJ81GYxICmlp/2WBIxdUxsBnV+BiVop7JmB2MeA 70a5l6c9+ov6XvUezcvkW6dnluUySAmiNp0P1gXekfzoY6cZQBIQOXW/bM5M7cxTKg9h VQwhwKyqpbTR6IFYjSdcmpbwpSMGRdzy8SJqQ5PIwKuupYo1thjiql84GSUOPkzhDlVm 1XYBsoSJremCFp4ES3df5/ZfJARuHxLedXvKR8Exhdu8bU0LugPipD85ke/tE52QiQUe f33vIvpQLt1jL88a6OMpTwbAmM3KSzfWypL59GD+qB2jwhJoENutOCO8BLQXcCfvctt1 u98Q== X-Gm-Message-State: AJaThX7ZPPcks0jQjPfwrdfxfATBH7TVmZGagK38LjrxDcmBZbym6QY5 8ejUBSGa0TPVEWI+Ww2XX1wg9/OQng== X-Google-Smtp-Source: AGs4zMbo9XqyFPSSp2wpYSfkaAVK6hN42siwPyHnOoQx7N8yu3Usy5MYYKMofh//nOMJPreABQtRbg== X-Received: by 10.80.130.39 with SMTP id 36mr34575519edf.297.1511453610602; Thu, 23 Nov 2017 08:13:30 -0800 (PST) Received: from laranjeiro-vm.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id u10sm14663036edm.56.2017.11.23.08.13.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 08:13:30 -0800 (PST) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Yongseok Koh , Adrien Mazarguil Date: Thu, 23 Nov 2017 17:13:07 +0100 Message-Id: <02add8f014227b001f497fcfe69ad1dae14d7683.1511453340.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 5/7] net/mlx5: simplify error handling in flow action parsing X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_flow.c | 88 +++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 47 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 1eda83671..ff50470b5 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -654,6 +654,9 @@ priv_flow_convert_actions(struct priv *priv, struct rte_flow_error *error, struct mlx5_flow_parse *parser) { + int ret = 0; + const char *msg = NULL; + const struct rte_flow_action *action = NULL; /* * Add default RSS configuration necessary for Verbs to create QP even * if no RSS is necessary. @@ -674,7 +677,7 @@ priv_flow_convert_actions(struct priv *priv, uint16_t found = 0; if (!queue || (queue->index > (priv->rxqs_n - 1))) - goto exit_action_not_supported; + goto error; for (n = 0; n < parser->queues_n; ++n) { if (parser->queues[n] == queue->index) { found = 1; @@ -682,11 +685,10 @@ priv_flow_convert_actions(struct priv *priv, } } if (parser->queues_n > 1 && !found) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "queue action not in RSS queues"); - return -rte_errno; + ret = ENOTSUP; + action = actions; + msg = "queue action not in RSS queues"; + goto error; } if (!found) { parser->queues_n = 1; @@ -699,11 +701,10 @@ priv_flow_convert_actions(struct priv *priv, uint16_t n; if (!rss || !rss->num) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "no valid queues"); - return -rte_errno; + ret = EINVAL; + action = actions; + msg = "no valid queues"; + goto error; } if (parser->queues_n == 1) { uint16_t found = 0; @@ -717,22 +718,18 @@ priv_flow_convert_actions(struct priv *priv, } } if (!found) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "queue action not in RSS" - " queues"); - return -rte_errno; + ret = ENOTSUP; + action = actions; + msg = "queue action not in RSS queues"; + goto error; } } for (n = 0; n < rss->num; ++n) { if (rss->queue[n] >= priv->rxqs_n) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "queue id > number of" - " queues"); - return -rte_errno; + ret = EINVAL; + action = actions; + msg = "queue id > number of queues"; + goto error; } } for (n = 0; n < rss->num; ++n) @@ -740,11 +737,10 @@ priv_flow_convert_actions(struct priv *priv, parser->queues_n = rss->num; if (priv_flow_convert_rss_conf(priv, parser, rss->rss_conf)) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "wrong RSS configuration"); - return -rte_errno; + ret = EINVAL; + action = actions; + msg = "wrong RSS configuration"; + goto error; } } else if (actions->type == RTE_FLOW_ACTION_TYPE_MARK) { const struct rte_flow_action_mark *mark = @@ -752,18 +748,15 @@ priv_flow_convert_actions(struct priv *priv, actions->conf; if (!mark) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "mark must be defined"); - return -rte_errno; + ret = EINVAL; + action = actions; + msg = "mark must be defined"; + goto error; } else if (mark->id >= MLX5_FLOW_MARK_MAX) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, - actions, - "mark must be between 0" - " and 16777199"); - return -rte_errno; + ret = ENOTSUP; + action = actions; + msg = "mark must be between 0 and 16777199"; + goto error; } parser->mark = 1; parser->mark_id = mark->id; @@ -773,21 +766,22 @@ priv_flow_convert_actions(struct priv *priv, priv->counter_set_supported) { parser->count = 1; } else { - goto exit_action_not_supported; + goto error; } } if (parser->drop && parser->mark) parser->mark = 0; if (!parser->queues_n && !parser->drop) { - rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE, - NULL, "no valid action"); - return -rte_errno; + ret = ENOTSUP; + msg = "no valid action"; + goto error; } return 0; -exit_action_not_supported: - rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, - actions, "action not supported"); - return -rte_errno; +error: + return rte_flow_error_set(error, ret, + action ? RTE_FLOW_ERROR_TYPE_ACTION : + RTE_FLOW_ERROR_TYPE_HANDLE, + action, msg); } /**