From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A85F4A0C4A; Fri, 16 Jul 2021 04:21:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF928412B6; Fri, 16 Jul 2021 04:20:55 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 383EE40151 for ; Fri, 16 Jul 2021 04:20:52 +0200 (CEST) Received: from localhost.localdomain (unknown [5.144.121.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id D5CBF7F5F1; Fri, 16 Jul 2021 05:20:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru D5CBF7F5F1 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1626402051; bh=UnycRNLV3C/7Nm3WT9JWgH1XVTi1tZANzD1zHw9Mptw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y4fUp/aJWjRndg7VkuT/kngLl3Pvj29DdPavHC9gtmkIHg6TPxK4e+RCKtGXMjReG VMtxcGV6NQAur3vwjzlvWwU1jObFTcZj6y8ZxOCVYkgV4NK3f8f/uD3VCzTgwVPUoO 7oojB8n7dHf32mU8EWoUYA9cWpEayCNF3NozA7dg= From: Ivan Malov To: dev@dpdk.org Cc: David Marchand , Thomas Monjalon , Andrew Rybchenko , Andy Moreton Date: Fri, 16 Jul 2021 05:20:43 +0300 Message-Id: <20210716022043.3161-3-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210716022043.3161-1-ivan.malov@oktetlabs.ru> References: <20210707105628.16705-1-ivan.malov@oktetlabs.ru> <20210716022043.3161-1-ivan.malov@oktetlabs.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 2/2] net/sfc: improve logging in MAE backend of RTE flow support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Errors detected during parsing of pattern items and actions are reflected by setting RTE error, but the name of the bad element is not disclosed, thus leaving the user to join the dots themselves. Adjust the code to log missing information. Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_flow.c | 34 +++++++++++++---------- drivers/net/sfc/sfc_flow.h | 12 ++++++-- drivers/net/sfc/sfc_mae.c | 57 ++++++++++++++++++++++++++++---------- 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c index 0bfd284c9e..88a78a1e10 100644 --- a/drivers/net/sfc/sfc_flow.c +++ b/drivers/net/sfc/sfc_flow.c @@ -1123,84 +1123,84 @@ sfc_flow_parse_pppoex(const struct rte_flow_item *item, static const struct sfc_flow_item sfc_flow_items[] = { { - .type = RTE_FLOW_ITEM_TYPE_VOID, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_VOID), .prev_layer = SFC_FLOW_ITEM_ANY_LAYER, .layer = SFC_FLOW_ITEM_ANY_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_void, }, { - .type = RTE_FLOW_ITEM_TYPE_ETH, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_ETH), .prev_layer = SFC_FLOW_ITEM_START_LAYER, .layer = SFC_FLOW_ITEM_L2, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_eth, }, { - .type = RTE_FLOW_ITEM_TYPE_VLAN, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_VLAN), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L2, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_vlan, }, { - .type = RTE_FLOW_ITEM_TYPE_PPPOED, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_PPPOED), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L2, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_pppoex, }, { - .type = RTE_FLOW_ITEM_TYPE_PPPOES, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_PPPOES), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L2, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_pppoex, }, { - .type = RTE_FLOW_ITEM_TYPE_IPV4, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_IPV4), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L3, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_ipv4, }, { - .type = RTE_FLOW_ITEM_TYPE_IPV6, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_IPV6), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L3, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_ipv6, }, { - .type = RTE_FLOW_ITEM_TYPE_TCP, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_TCP), .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_L4, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_tcp, }, { - .type = RTE_FLOW_ITEM_TYPE_UDP, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_UDP), .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_L4, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_udp, }, { - .type = RTE_FLOW_ITEM_TYPE_VXLAN, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_VXLAN), .prev_layer = SFC_FLOW_ITEM_L4, .layer = SFC_FLOW_ITEM_START_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_vxlan, }, { - .type = RTE_FLOW_ITEM_TYPE_GENEVE, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_GENEVE), .prev_layer = SFC_FLOW_ITEM_L4, .layer = SFC_FLOW_ITEM_START_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, .parse = sfc_flow_parse_geneve, }, { - .type = RTE_FLOW_ITEM_TYPE_NVGRE, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_NVGRE), .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_START_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_FILTER, @@ -1296,7 +1296,8 @@ sfc_flow_get_item(const struct sfc_flow_item *items, } int -sfc_flow_parse_pattern(const struct sfc_flow_item *flow_items, +sfc_flow_parse_pattern(struct sfc_adapter *sa, + const struct sfc_flow_item *flow_items, unsigned int nb_flow_items, const struct rte_flow_item pattern[], struct sfc_flow_parse_ctx *parse_ctx, @@ -1380,8 +1381,11 @@ sfc_flow_parse_pattern(const struct sfc_flow_item *flow_items, } rc = item->parse(pattern, parse_ctx, error); - if (rc != 0) + if (rc != 0) { + sfc_err(sa, "failed to parse item %s: %s", + item->name, strerror(-rc)); return rc; + } if (item->layer != SFC_FLOW_ITEM_ANY_LAYER) prev_layer = item->layer; @@ -2477,7 +2481,7 @@ sfc_flow_parse_rte_to_filter(struct rte_eth_dev *dev, ctx.type = SFC_FLOW_PARSE_CTX_FILTER; ctx.filter = &spec_filter->template; - rc = sfc_flow_parse_pattern(sfc_flow_items, RTE_DIM(sfc_flow_items), + rc = sfc_flow_parse_pattern(sa, sfc_flow_items, RTE_DIM(sfc_flow_items), pattern, &ctx, error); if (rc != 0) goto fail_bad_value; diff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h index bd3b374d68..5240c8006a 100644 --- a/drivers/net/sfc/sfc_flow.h +++ b/drivers/net/sfc/sfc_flow.h @@ -136,13 +136,21 @@ typedef int (sfc_flow_item_parse)(const struct rte_flow_item *item, struct sfc_flow_item { enum rte_flow_item_type type; /* Type of item */ + const char *name; /* Item name */ enum sfc_flow_item_layers layer; /* Layer of item */ enum sfc_flow_item_layers prev_layer; /* Previous layer of item */ enum sfc_flow_parse_ctx_type ctx_type; /* Parse context type */ sfc_flow_item_parse *parse; /* Parsing function */ }; -int sfc_flow_parse_pattern(const struct sfc_flow_item *flow_items, +#define SFC_FLOW_ITEM(_type) \ + .type = _type, \ + .name = #_type + +struct sfc_adapter; + +int sfc_flow_parse_pattern(struct sfc_adapter *sa, + const struct sfc_flow_item *flow_items, unsigned int nb_flow_items, const struct rte_flow_item pattern[], struct sfc_flow_parse_ctx *parse_ctx, @@ -156,8 +164,6 @@ int sfc_flow_parse_init(const struct rte_flow_item *item, unsigned int size, struct rte_flow_error *error); -struct sfc_adapter; - void sfc_flow_init(struct sfc_adapter *sa); void sfc_flow_fini(struct sfc_adapter *sa); int sfc_flow_start(struct sfc_adapter *sa); diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 56b949ddf7..ba52761335 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -1828,7 +1828,7 @@ sfc_mae_rule_parse_item_tunnel(const struct rte_flow_item *item, static const struct sfc_flow_item sfc_flow_items[] = { { - .type = RTE_FLOW_ITEM_TYPE_PORT_ID, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_PORT_ID), /* * In terms of RTE flow, this item is a META one, * and its position in the pattern is don't care. @@ -1839,7 +1839,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { .parse = sfc_mae_rule_parse_item_port_id, }, { - .type = RTE_FLOW_ITEM_TYPE_PHY_PORT, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_PHY_PORT), /* * In terms of RTE flow, this item is a META one, * and its position in the pattern is don't care. @@ -1850,7 +1850,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { .parse = sfc_mae_rule_parse_item_phy_port, }, { - .type = RTE_FLOW_ITEM_TYPE_PF, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_PF), /* * In terms of RTE flow, this item is a META one, * and its position in the pattern is don't care. @@ -1861,7 +1861,7 @@ static const struct sfc_flow_item sfc_flow_items[] = { .parse = sfc_mae_rule_parse_item_pf, }, { - .type = RTE_FLOW_ITEM_TYPE_VF, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_VF), /* * In terms of RTE flow, this item is a META one, * and its position in the pattern is don't care. @@ -1872,63 +1872,63 @@ static const struct sfc_flow_item sfc_flow_items[] = { .parse = sfc_mae_rule_parse_item_vf, }, { - .type = RTE_FLOW_ITEM_TYPE_ETH, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_ETH), .prev_layer = SFC_FLOW_ITEM_START_LAYER, .layer = SFC_FLOW_ITEM_L2, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_eth, }, { - .type = RTE_FLOW_ITEM_TYPE_VLAN, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_VLAN), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L2, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_vlan, }, { - .type = RTE_FLOW_ITEM_TYPE_IPV4, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_IPV4), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L3, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_ipv4, }, { - .type = RTE_FLOW_ITEM_TYPE_IPV6, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_IPV6), .prev_layer = SFC_FLOW_ITEM_L2, .layer = SFC_FLOW_ITEM_L3, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_ipv6, }, { - .type = RTE_FLOW_ITEM_TYPE_TCP, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_TCP), .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_L4, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_tcp, }, { - .type = RTE_FLOW_ITEM_TYPE_UDP, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_UDP), .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_L4, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_udp, }, { - .type = RTE_FLOW_ITEM_TYPE_VXLAN, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_VXLAN), .prev_layer = SFC_FLOW_ITEM_L4, .layer = SFC_FLOW_ITEM_START_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_tunnel, }, { - .type = RTE_FLOW_ITEM_TYPE_GENEVE, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_GENEVE), .prev_layer = SFC_FLOW_ITEM_L4, .layer = SFC_FLOW_ITEM_START_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, .parse = sfc_mae_rule_parse_item_tunnel, }, { - .type = RTE_FLOW_ITEM_TYPE_NVGRE, + SFC_FLOW_ITEM(RTE_FLOW_ITEM_TYPE_NVGRE), .prev_layer = SFC_FLOW_ITEM_L3, .layer = SFC_FLOW_ITEM_START_LAYER, .ctx_type = SFC_FLOW_PARSE_CTX_MAE, @@ -2137,7 +2137,7 @@ sfc_mae_rule_parse_pattern(struct sfc_adapter *sa, if (rc != 0) goto fail_encap_parse_init; - rc = sfc_flow_parse_pattern(sfc_flow_items, RTE_DIM(sfc_flow_items), + rc = sfc_flow_parse_pattern(sa, sfc_flow_items, RTE_DIM(sfc_flow_items), pattern, &ctx, error); if (rc != 0) goto fail_parse_pattern; @@ -2728,6 +2728,27 @@ sfc_mae_rule_parse_action_port_id(struct sfc_adapter *sa, return rc; } +static const char * const action_names[] = { +#define SFC_FLOW_ACTION(_type) \ + [_type] = #_type + + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_VXLAN_DECAP), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_OF_POP_VLAN), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_FLAG), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_MARK), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_PHY_PORT), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_PF), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_VF), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_PORT_ID), + SFC_FLOW_ACTION(RTE_FLOW_ACTION_TYPE_DROP), + +#undef SFC_FLOW_ACTION +}; + static int sfc_mae_rule_parse_action(struct sfc_adapter *sa, const struct rte_flow_action *action, @@ -2821,6 +2842,14 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa, if (rc == 0) { bundle->actions_mask |= (1ULL << action->type); } else if (!custom_error) { + if (action->type < RTE_DIM(action_names)) { + const char *action_name = action_names[action->type]; + + if (action_name != NULL) { + sfc_err(sa, "action %s was rejected: %s", + action_name, strerror(rc)); + } + } rc = rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "Failed to request the action"); } -- 2.20.1