From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 01CC4A04E7; Sun, 1 Nov 2020 18:48:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 638341D9E; Sun, 1 Nov 2020 18:48:53 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 8A2FFF64 for ; Sun, 1 Nov 2020 18:48:51 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from matan@nvidia.com) with SMTP; 1 Nov 2020 19:48:49 +0200 Received: from nvidia.com (pegasus25.mtr.labs.mlnx [10.210.16.10]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 0A1Hmnto005776; Sun, 1 Nov 2020 19:48:49 +0200 From: Matan Azrad To: Wenzhuo Lu , Beilei Xing , Bernard Iremonger , Ori Kam Cc: dev@dpdk.org Date: Sun, 1 Nov 2020 17:48:47 +0000 Message-Id: <1604252927-213452-1-git-send-email-matan@nvidia.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] app/testpmd: support age shared action context 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" When an age action becomes aged-out the rte_flow_get_aged_flows should return the action context supplied by the configuration structure. In case the age action created by the shared action API, the shared action context of the Testpmd application was not set. In addition, the application handler of the contexts returned by the rte_flow_get_aged_flows API didn't consider the fact that the action could be set by the shared action API and considered it as regular flow context. This caused a crash in Testpmd when the context is parsed. This patch set context type in the flow and shared action context and uses it to parse the aged-out contexts correctly. Signed-off-by: Matan Azrad Acked-by: Dekel Peled --- app/test-pmd/config.c | 57 ++++++++++++++++++++++++++++++++++++-------------- app/test-pmd/testpmd.h | 7 +++++++ 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index e0203f0..3581f3d 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1665,8 +1665,10 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops) return NULL; } if (rte_flow_conv(RTE_FLOW_CONV_OP_RULE, &pf->rule, ret, &rule, - error) >= 0) + error) >= 0) { + pf->ctype = CONTEXT_TYPE_FLOW; return pf; + } free(pf); return NULL; } @@ -1831,6 +1833,7 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops) } psa->next = *ppsa; psa->id = id; + psa->ctype = CONTEXT_TYPE_SHARED_ACTION; *ppsa = psa; *action = psa; return 0; @@ -1849,6 +1852,12 @@ void port_flow_tunnel_create(portid_t port_id, const struct tunnel_ops *ops) ret = action_alloc(port_id, id, &psa); if (ret) return ret; + if (action->type == RTE_FLOW_ACTION_TYPE_AGE) { + struct rte_flow_action_age *age = + (void *)(uintptr_t)(action->conf); + + age->context = psa; + } /* Poisoning to make sure PMDs update it in case of error. */ memset(&error, 0x22, sizeof(error)); psa->action = rte_flow_shared_action_create(port_id, conf, action, @@ -2379,7 +2388,10 @@ struct rte_flow_shared_action * void **contexts; int nb_context, total = 0, idx; struct rte_flow_error error; - struct port_flow *pf; + union { + struct port_flow *pf; + struct port_shared_action *psa; + } ctx; if (port_id_is_invalid(port_id, ENABLED_WARN) || port_id == (portid_t)RTE_PORT_ALL) @@ -2397,7 +2409,7 @@ struct rte_flow_shared_action * printf("Cannot allocate contexts for aged flow\n"); return; } - printf("ID\tGroup\tPrio\tAttr\n"); + printf("%-20s\tID\tGroup\tPrio\tAttr\n", "Type"); nb_context = rte_flow_get_aged_flows(port_id, contexts, total, &error); if (nb_context != total) { printf("Port:%d get aged flows count(%d) != total(%d)\n", @@ -2406,18 +2418,31 @@ struct rte_flow_shared_action * return; } for (idx = 0; idx < nb_context; idx++) { - pf = (struct port_flow *)contexts[idx]; - if (!pf) { + ctx.pf = (struct port_flow *)contexts[idx]; + if (!ctx.pf) { printf("Error: get Null context in port %u\n", port_id); continue; } - printf("%" PRIu32 "\t%" PRIu32 "\t%" PRIu32 "\t%c%c%c\t\n", - pf->id, - pf->rule.attr->group, - pf->rule.attr->priority, - pf->rule.attr->ingress ? 'i' : '-', - pf->rule.attr->egress ? 'e' : '-', - pf->rule.attr->transfer ? 't' : '-'); + switch (ctx.pf->ctype) { + case CONTEXT_TYPE_FLOW: + printf("%-20s\t%" PRIu32 "\t%" PRIu32 "\t%" PRIu32 + "\t%c%c%c\t\n", + "Flow", + ctx.pf->id, + ctx.pf->rule.attr->group, + ctx.pf->rule.attr->priority, + ctx.pf->rule.attr->ingress ? 'i' : '-', + ctx.pf->rule.attr->egress ? 'e' : '-', + ctx.pf->rule.attr->transfer ? 't' : '-'); + break; + case CONTEXT_TYPE_SHARED_ACTION: + printf("%-20s\t%" PRIu32 "\n", "Shared action", + ctx.psa->id); + break; + default: + printf("Error: invalid context type %u\n", port_id); + break; + } } if (destroy) { int ret; @@ -2426,15 +2451,15 @@ struct rte_flow_shared_action * total = 0; printf("\n"); for (idx = 0; idx < nb_context; idx++) { - pf = (struct port_flow *)contexts[idx]; - if (!pf) + ctx.pf = (struct port_flow *)contexts[idx]; + if (!ctx.pf || ctx.pf->ctype != CONTEXT_TYPE_FLOW) continue; - flow_id = pf->id; + flow_id = ctx.pf->id; ret = port_flow_destroy(port_id, 1, &flow_id); if (!ret) total++; } - printf("%d flows be destroyed\n", total); + printf("%d flows destroyed\n", total); } free(contexts); } diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 519d551..92aaa19 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -143,8 +143,14 @@ struct fwd_stream { struct pkt_burst_stats tx_burst_stats; }; +enum testpmd_context_type { + CONTEXT_TYPE_FLOW, + CONTEXT_TYPE_SHARED_ACTION, +}; + /** Descriptor for a single flow. */ struct port_flow { + enum testpmd_context_type ctype; /**< Context type. */ struct port_flow *next; /**< Next flow in list. */ struct port_flow *tmp; /**< Temporary linking. */ uint32_t id; /**< Flow rule ID. */ @@ -155,6 +161,7 @@ struct port_flow { /* Descriptor for shared action */ struct port_shared_action { + enum testpmd_context_type ctype; /**< Context type. */ struct port_shared_action *next; /**< Next flow in list. */ uint32_t id; /**< Shared action ID. */ enum rte_flow_action_type type; /**< Action type. */ -- 1.8.3.1