From patchwork Wed Oct 11 14:35:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 30130 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 B5A4A1B213; Wed, 11 Oct 2017 16:36:33 +0200 (CEST) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 14D151B1BC for ; Wed, 11 Oct 2017 16:36:27 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id m72so5391756wmc.1 for ; Wed, 11 Oct 2017 07:36:27 -0700 (PDT) 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; bh=qjldaOUHSXAuJSSlTt4tja6TiFH4Tj7CKr6axkAXPyE=; b=XvHDyUjb+MJzs8d3vuIUWkpjxpB35cuROtd9FUYWs+Bsx3wITZDkNkzHkxbNMYRIfg w4iBaHCjpd97M4d9ERUOkCEonayqEOO0Xil6gjHrVJGLDEMU9aKUz+gxXOPVX0ANLlmL 4RPe2Qp+DAf2wpY0/nVRR5hiVo3Mic5bQmafhXJanpgyzfxO4tsykNS7wYrgdgdD3dVa ywX7UfrSEfe0HWhJ44fhnfNlWnYUH1pGave5g0i2lnfhbu7CxNUqyfoAdnc5eLw9ZZSv uzASX2dvyFwoVsPQ30Eny8P+H1riBibffz+g/o58J0uxphFuYYOH+Pdi+uJqbjiV136v Aufw== 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; bh=qjldaOUHSXAuJSSlTt4tja6TiFH4Tj7CKr6axkAXPyE=; b=M8SOM/MdmfnIN6hUSHtVU0JN9CbIqrfmWURXqOahQJ65y0P2d47Piai1wwLOMFVy5d toYohhBRDI5AhprS9QrGVTVAx6ZEcGrIPAzY2zn5Nh7R0VQhcueOVpMsZrLM4JdvoITc P4WTJaU4ODoWijJdhWRt9uv9SSzJ45HB+vvV8/7ag2DFbxK1AlDScPoNft0/5NDU1Y8f OACpjKpU5rkpxkZLSh8T8akcUgAFXmj4VnawWP4xGn52XvB6JonToVSfBLKB70fWhB23 3SkBVfeJSsJVeqE2bTXhg6QYIJaJRBsvQjsTuse2MZiRbvztfI1lIFQ2lblWtsat5pSG rQ+A== X-Gm-Message-State: AMCzsaUMHN8HdWzGIj/KdULNHw+lskaewF4SpZi3Cdyeczzf3YgsgPXa hWBGzTzJP2FOFdKzape1zYOe/32t X-Google-Smtp-Source: AOwi7QAwYlD1hsSstI4jKANS2J8hV+VLR7tCBeToiPtwm6fCOPV9yTwdKB8/wQG0yv8DRGkqVluI0A== X-Received: by 10.28.5.148 with SMTP id 142mr13965422wmf.142.1507732586839; Wed, 11 Oct 2017 07:36:26 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 89sm180272wri.79.2017.10.11.07.36.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Oct 2017 07:36:25 -0700 (PDT) From: Adrien Mazarguil To: Ferruh Yigit Cc: dev@dpdk.org Date: Wed, 11 Oct 2017 16:35:10 +0200 Message-Id: <1210c176f2239a317c0dfcea324d075fdf7a05fe.1507730496.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 08/29] net/mlx4: compact flow rule error reporting 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" Relying on rte_errno is not necessary where the return value of rte_flow_error_set() can be used directly. A related minor change is switching from RTE_FLOW_ERROR_TYPE_HANDLE to RTE_FLOW_ERROR_TYPE_UNSPECIFIED when no rte_flow handle is involved in the error, specifically when none is allocated yet. This commit does not cause any functional change. Signed-off-by: Adrien Mazarguil Acked-by: Nelio Laranjeiro --- drivers/net/mlx4/mlx4_flow.c | 102 ++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index fa56419..000f17f 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -579,45 +579,30 @@ mlx4_flow_prepare(struct priv *priv, }; uint32_t priority_override = 0; - if (attr->group) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_GROUP, - NULL, - "groups are not supported"); - return -rte_errno; - } - if (priv->isolated) { + if (attr->group) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_GROUP, + NULL, "groups are not supported"); + if (priv->isolated) priority_override = attr->priority; - } else if (attr->priority) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, - NULL, - "priorities are not supported outside" - " isolated mode"); - return -rte_errno; - } - if (attr->priority > MLX4_FLOW_PRIORITY_LAST) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, - NULL, - "maximum priority level is " - MLX4_STR_EXPAND(MLX4_FLOW_PRIORITY_LAST)); - return -rte_errno; - } - if (attr->egress) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, - NULL, - "egress is not supported"); - return -rte_errno; - } - if (!attr->ingress) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, - NULL, - "only ingress is supported"); - return -rte_errno; - } + else if (attr->priority) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, + NULL, + "priorities are not supported outside isolated mode"); + if (attr->priority > MLX4_FLOW_PRIORITY_LAST) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, + NULL, "maximum priority level is " + MLX4_STR_EXPAND(MLX4_FLOW_PRIORITY_LAST)); + if (attr->egress) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, + NULL, "egress is not supported"); + if (!attr->ingress) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, + NULL, "only ingress is supported"); /* Go over pattern. */ for (item = pattern; item->type; ++item) { const struct mlx4_flow_proc_item *next = NULL; @@ -633,14 +618,11 @@ mlx4_flow_prepare(struct priv *priv, if (!item->spec && item->type == RTE_FLOW_ITEM_TYPE_ETH) { const struct rte_flow_item *next = item + 1; - if (next->type) { - rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "the rule requires" - " an Ethernet spec"); - return -rte_errno; - } + if (next->type) + return rte_flow_error_set + (error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "the rule requires an Ethernet spec"); } for (i = 0; proc->next_item && proc->next_item[i]; ++i) { if (proc->next_item[i] == item->type) { @@ -688,20 +670,17 @@ mlx4_flow_prepare(struct priv *priv, goto exit_action_not_supported; } } - if (!target.queue && !target.drop) { - rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE, - NULL, "no valid action"); - return -rte_errno; - } + if (!target.queue && !target.drop) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "no valid action"); return 0; exit_item_not_supported: - rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, - item, "item not supported"); - return -rte_errno; + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, + item, "item not supported"); exit_action_not_supported: - rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, - action, "action not supported"); - return -rte_errno; + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + action, "action not supported"); } /** @@ -824,7 +803,8 @@ mlx4_flow_create_target_queue(struct priv *priv, assert(priv->ctx); rte_flow = rte_calloc(__func__, 1, sizeof(*rte_flow), 0); if (!rte_flow) { - rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "cannot allocate flow memory"); return NULL; } @@ -841,7 +821,8 @@ mlx4_flow_create_target_queue(struct priv *priv, return rte_flow; rte_flow->ibv_flow = ibv_create_flow(qp, rte_flow->ibv_attr); if (!rte_flow->ibv_flow) { - rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "flow rule creation failure"); goto error; } @@ -876,7 +857,8 @@ mlx4_flow_create(struct rte_eth_dev *dev, return NULL; flow.ibv_attr = rte_malloc(__func__, flow.offset, 0); if (!flow.ibv_attr) { - rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, + rte_flow_error_set(error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "cannot allocate ibv_attr memory"); return NULL; }