Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/128062/?format=api
{ "id": 128062, "url": "http://patchwork.dpdk.org/api/patches/128062/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230604232523.6746-35-ivan.malov@arknetworks.am/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230604232523.6746-35-ivan.malov@arknetworks.am>", "list_archive_url": "https://inbox.dpdk.org/dev/20230604232523.6746-35-ivan.malov@arknetworks.am", "date": "2023-06-04T23:25:23", "name": "[v3,34/34] net/sfc: use conntrack assistance counters in transfer flows", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1f183cb5f0b1b882ac83954e2d9b196a81665e10", "submitter": { "id": 2962, "url": "http://patchwork.dpdk.org/api/people/2962/?format=api", "name": "Ivan Malov", "email": "ivan.malov@arknetworks.am" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230604232523.6746-35-ivan.malov@arknetworks.am/mbox/", "series": [ { "id": 28336, "url": "http://patchwork.dpdk.org/api/series/28336/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28336", "date": "2023-06-04T23:24:49", "name": "net/sfc: support HW conntrack assistance", "version": 3, "mbox": "http://patchwork.dpdk.org/series/28336/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/128062/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/128062/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id C65E342C2C;\n\tMon, 5 Jun 2023 01:28:58 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5326943019;\n\tMon, 5 Jun 2023 01:26:05 +0200 (CEST)", "from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80])\n by mails.dpdk.org (Postfix) with ESMTP id 46F7042D8D\n for <dev@dpdk.org>; Mon, 5 Jun 2023 01:25:43 +0200 (CEST)", "from localhost.localdomain (unknown [78.109.68.201])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by agw.arknetworks.am (Postfix) with ESMTPSA id CBBDAE126C;\n Mon, 5 Jun 2023 03:25:42 +0400 (+04)" ], "From": "Ivan Malov <ivan.malov@arknetworks.am>", "To": "dev@dpdk.org", "Cc": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Ferruh Yigit <ferruh.yigit@amd.com>, Andy Moreton <amoreton@xilinx.com>", "Subject": "[PATCH v3 34/34] net/sfc: use conntrack assistance counters in\n transfer flows", "Date": "Mon, 5 Jun 2023 03:25:23 +0400", "Message-Id": "<20230604232523.6746-35-ivan.malov@arknetworks.am>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20230604232523.6746-1-ivan.malov@arknetworks.am>", "References": "<20230601195538.8265-1-ivan.malov@arknetworks.am>\n <20230604232523.6746-1-ivan.malov@arknetworks.am>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "These are 1-bit saturating counters which can only be useful\nto tell whether a given flow rule has offloaded some packets\nsince the last query. Byte count is never provided for these.\n\nSigned-off-by: Ivan Malov <ivan.malov@arknetworks.am>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc_flow.h | 2 +\n drivers/net/sfc/sfc_mae.c | 119 ++++++++++++++++++++++--------\n drivers/net/sfc/sfc_mae.h | 2 +\n drivers/net/sfc/sfc_mae_counter.c | 30 ++++++++\n 4 files changed, 124 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h\nindex af94d0654a..601f93e540 100644\n--- a/drivers/net/sfc/sfc_flow.h\n+++ b/drivers/net/sfc/sfc_flow.h\n@@ -86,6 +86,8 @@ struct sfc_flow_spec_mae {\n \t/* Conntrack (CT) assistance table entry key and response */\n \tsfc_mae_conntrack_response_t\tct_resp;\n \tsfc_mae_conntrack_key_t\t\tct_key;\n+\t/* Conntrack (CT) assistance counter */\n+\tstruct sfc_mae_counter\t\t*ct_counter;\n };\n \n /* PMD-specific definition of the opaque type from rte_flow.h */\ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 7353d04af8..ab315853d5 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -65,7 +65,8 @@ sfc_mae_assign_entity_mport(struct sfc_adapter *sa,\n \n static int\n sfc_mae_counter_registry_init(struct sfc_mae_counter_registry *registry,\n-\t\t\t uint32_t nb_action_counters_max)\n+\t\t\t uint32_t nb_action_counters_max,\n+\t\t\t uint32_t nb_conntrack_counters_max)\n {\n \tint ret;\n \n@@ -76,12 +77,20 @@ sfc_mae_counter_registry_init(struct sfc_mae_counter_registry *registry,\n \n \tregistry->action_counters.type = EFX_COUNTER_TYPE_ACTION;\n \n+\tret = sfc_mae_counters_init(®istry->conntrack_counters,\n+\t\t\t\t nb_conntrack_counters_max);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\tregistry->conntrack_counters.type = EFX_COUNTER_TYPE_CONNTRACK;\n+\n \treturn 0;\n }\n \n static void\n sfc_mae_counter_registry_fini(struct sfc_mae_counter_registry *registry)\n {\n+\tsfc_mae_counters_fini(®istry->conntrack_counters);\n \tsfc_mae_counters_fini(®istry->action_counters);\n }\n \n@@ -162,10 +171,13 @@ sfc_mae_attach(struct sfc_adapter *sa)\n \n \t\tsfc_log_init(sa, \"init MAE counter record registry\");\n \t\trc = sfc_mae_counter_registry_init(&mae->counter_registry,\n-\t\t\t\t\tlimits.eml_max_n_action_counters);\n+\t\t\t\t\tlimits.eml_max_n_action_counters,\n+\t\t\t\t\tlimits.eml_max_n_conntrack_counters);\n \t\tif (rc != 0) {\n-\t\t\tsfc_err(sa, \"failed to init record registry for %u AR counters: %s\",\n-\t\t\t\tlimits.eml_max_n_action_counters, rte_strerror(rc));\n+\t\t\tsfc_err(sa, \"failed to init record registry for %u AR and %u CT counters: %s\",\n+\t\t\t\tlimits.eml_max_n_action_counters,\n+\t\t\t\tlimits.eml_max_n_conntrack_counters,\n+\t\t\t\trte_strerror(rc));\n \t\t\tgoto fail_counter_registry_init;\n \t\t}\n \t}\n@@ -1471,6 +1483,8 @@ sfc_mae_flow_cleanup(struct sfc_adapter *sa,\n \t}\n \n \tsfc_mae_action_rule_del(sa, spec_mae->action_rule);\n+\n+\tsfc_mae_counter_del(sa, spec_mae->ct_counter);\n }\n \n static int\n@@ -4223,7 +4237,7 @@ static const char * const action_names[] = {\n static int\n sfc_mae_rule_parse_action(struct sfc_adapter *sa,\n \t\t\t const struct rte_flow_action *action,\n-\t\t\t struct rte_flow *flow,\n+\t\t\t struct rte_flow *flow, bool ct,\n \t\t\t struct sfc_mae_actions_bundle *bundle,\n \t\t\t struct sfc_mae_aset_ctx *ctx,\n \t\t\t struct rte_flow_error *error)\n@@ -4239,6 +4253,12 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,\n \tbool custom_error = B_FALSE;\n \tint rc = 0;\n \n+\tif (ct) {\n+\t\tmae_counter_type = EFX_COUNTER_TYPE_CONNTRACK;\n+\t\tcounterp = &spec_mae->ct_counter;\n+\t\tspec_ptr = NULL;\n+\t}\n+\n \tswitch (action->type) {\n \tcase RTE_FLOW_ACTION_TYPE_VXLAN_DECAP:\n \t\tSFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_VXLAN_DECAP,\n@@ -4526,7 +4546,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,\n \t\tif (rc != 0)\n \t\t\tgoto fail_rule_parse_action;\n \n-\t\trc = sfc_mae_rule_parse_action(sa, action, flow,\n+\t\trc = sfc_mae_rule_parse_action(sa, action, flow, ct,\n \t\t\t\t\t &bundle, &ctx, error);\n \t\tif (rc != 0)\n \t\t\tgoto fail_rule_parse_action;\n@@ -4561,8 +4581,15 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,\n \t\t */\n \t\tefx_mae_action_set_populate_mark_reset(ctx.spec);\n \n-\t\t(ctx.counter)->ft_switch_hit_counter =\n-\t\t\t&spec_mae->ft_ctx->switch_hit_counter;\n+\t\tif (ctx.counter != NULL) {\n+\t\t\t(ctx.counter)->ft_switch_hit_counter =\n+\t\t\t\t&spec_mae->ft_ctx->switch_hit_counter;\n+\t\t} else if (sfc_mae_counter_stream_enabled(sa)) {\n+\t\t\tSFC_ASSERT(ct);\n+\n+\t\t\tspec_mae->ct_counter->ft_switch_hit_counter =\n+\t\t\t\t&spec_mae->ft_ctx->switch_hit_counter;\n+\t\t}\n \t\tbreak;\n \tdefault:\n \t\tSFC_ASSERT(B_FALSE);\n@@ -4843,12 +4870,34 @@ sfc_mae_flow_insert(struct sfc_adapter *sa,\n \t\treturn rc;\n \n \tif (spec_mae->action_rule->ct_mark != 0) {\n+\t\tstruct sfc_mae_counter *counter = spec_mae->ct_counter;\n+\n+\t\trc = sfc_mae_counter_enable(sa, counter, NULL);\n+\t\tif (rc != 0) {\n+\t\t\tsfc_mae_action_rule_disable(sa, action_rule);\n+\t\t\treturn rc;\n+\t\t}\n+\n+\t\tif (counter != NULL) {\n+\t\t\tstruct sfc_mae_fw_rsrc *fw_rsrc = &counter->fw_rsrc;\n+\n+\t\t\tspec_mae->ct_resp.counter_id = fw_rsrc->counter_id.id;\n+\n+\t\t\trc = sfc_mae_counter_start(sa);\n+\t\t\tif (rc != 0) {\n+\t\t\t\tsfc_mae_action_rule_disable(sa, action_rule);\n+\t\t\t\treturn rc;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tspec_mae->ct_resp.counter_id = EFX_MAE_RSRC_ID_INVALID;\n+\t\t}\n+\n \t\tspec_mae->ct_resp.ct_mark = spec_mae->action_rule->ct_mark;\n-\t\tspec_mae->ct_resp.counter_id = EFX_MAE_RSRC_ID_INVALID;\n \n \t\trc = sfc_mae_conntrack_insert(sa, &spec_mae->ct_key,\n \t\t\t\t\t &spec_mae->ct_resp);\n \t\tif (rc != 0) {\n+\t\t\tsfc_mae_counter_disable(sa, counter);\n \t\t\tsfc_mae_action_rule_disable(sa, action_rule);\n \t\t\treturn rc;\n \t\t}\n@@ -4871,6 +4920,8 @@ sfc_mae_flow_remove(struct sfc_adapter *sa,\n \tif (action_rule->ct_mark != 0)\n \t\t(void)sfc_mae_conntrack_delete(sa, &spec_mae->ct_key);\n \n+\tsfc_mae_counter_disable(sa, spec_mae->ct_counter);\n+\n \tsfc_mae_action_rule_disable(sa, action_rule);\n \n \treturn 0;\n@@ -4885,31 +4936,41 @@ sfc_mae_query_counter(struct sfc_adapter *sa,\n {\n \tconst struct sfc_mae_action_rule *action_rule = spec->action_rule;\n \tconst struct rte_flow_action_count *conf = action->conf;\n-\tstruct sfc_mae_action_set *action_set;\n-\tstruct sfc_mae_counter *counter;\n+\tstruct sfc_mae_counter *counters[1 /* action rule counter */ +\n+\t\t\t\t\t 1 /* conntrack counter */];\n+\tunsigned int i;\n \tint rc;\n \n-\tif (action_rule == NULL || action_rule->action_set == NULL ||\n-\t action_rule->action_set->counter == NULL ||\n-\t action_rule->action_set->counter->indirect) {\n-\t\treturn rte_flow_error_set(error, EINVAL,\n-\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n-\t\t\t\"Queried flow rule does not have count actions\");\n-\t}\n+\t/*\n+\t * The check for counter unavailability is done based\n+\t * on counter traversal results. See error set below.\n+\t */\n+\tif (action_rule != NULL && action_rule->action_set != NULL &&\n+\t action_rule->action_set->counter != NULL &&\n+\t !action_rule->action_set->counter->indirect)\n+\t\tcounters[0] = action_rule->action_set->counter;\n+\telse\n+\t\tcounters[0] = NULL;\n \n-\taction_set = action_rule->action_set;\n-\tcounter = action_set->counter;\n+\tcounters[1] = spec->ct_counter;\n \n-\tif (conf == NULL ||\n-\t (counter->rte_id_valid && conf->id == counter->rte_id)) {\n-\t\trc = sfc_mae_counter_get(sa, counter, data);\n-\t\tif (rc != 0) {\n-\t\t\treturn rte_flow_error_set(error, EINVAL,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n-\t\t\t\t\"Queried flow rule counter action is invalid\");\n-\t\t}\n+\tfor (i = 0; i < RTE_DIM(counters); ++i) {\n+\t\tstruct sfc_mae_counter *counter = counters[i];\n \n-\t\treturn 0;\n+\t\tif (counter == NULL)\n+\t\t\tcontinue;\n+\n+\t\tif (conf == NULL ||\n+\t\t (counter->rte_id_valid && conf->id == counter->rte_id)) {\n+\t\t\trc = sfc_mae_counter_get(sa, counter, data);\n+\t\t\tif (rc != 0) {\n+\t\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t\"Queried flow rule counter action is invalid\");\n+\t\t\t}\n+\n+\t\t\treturn 0;\n+\t\t}\n \t}\n \n \treturn rte_flow_error_set(error, ENOENT,\ndiff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h\nindex 3a3a5225fd..80585c0e93 100644\n--- a/drivers/net/sfc/sfc_mae.h\n+++ b/drivers/net/sfc/sfc_mae.h\n@@ -173,6 +173,8 @@ struct sfc_mae_counter_registry {\n \t/* Common counter information */\n \t/** Action rule counter record collection */\n \tstruct sfc_mae_counter_records\taction_counters;\n+\t/** Conntrack counter record collection */\n+\tstruct sfc_mae_counter_records\tconntrack_counters;\n \n \t/* Information used by counter update service */\n \t/** Callback to get packets from RxQ */\ndiff --git a/drivers/net/sfc/sfc_mae_counter.c b/drivers/net/sfc/sfc_mae_counter.c\nindex 47448cba15..79043ff7d7 100644\n--- a/drivers/net/sfc/sfc_mae_counter.c\n+++ b/drivers/net/sfc/sfc_mae_counter.c\n@@ -91,6 +91,9 @@ sfc_mae_counter_fw_rsrc_enable(struct sfc_adapter *sa,\n \tcase EFX_COUNTER_TYPE_ACTION:\n \t\tcounters = ®->action_counters;\n \t\tbreak;\n+\tcase EFX_COUNTER_TYPE_CONNTRACK:\n+\t\tcounters = ®->conntrack_counters;\n+\t\tbreak;\n \tdefault:\n \t\trc = EINVAL;\n \t\tgoto fail_counter_type_check;\n@@ -172,6 +175,9 @@ sfc_mae_counter_fw_rsrc_disable(struct sfc_adapter *sa,\n \tcase EFX_COUNTER_TYPE_ACTION:\n \t\tcounters = ®->action_counters;\n \t\tbreak;\n+\tcase EFX_COUNTER_TYPE_CONNTRACK:\n+\t\tcounters = ®->conntrack_counters;\n+\t\tbreak;\n \tdefault:\n \t\treturn EINVAL;\n \t}\n@@ -319,6 +325,9 @@ sfc_mae_parse_counter_packet(struct sfc_adapter *sa,\n \tcase ERF_SC_PACKETISER_HEADER_IDENTIFIER_AR:\n \t\tcounters = &counter_registry->action_counters;\n \t\tbreak;\n+\tcase ERF_SC_PACKETISER_HEADER_IDENTIFIER_CT:\n+\t\tcounters = &counter_registry->conntrack_counters;\n+\t\tbreak;\n \tdefault:\n \t\tsfc_err(sa, \"unexpected MAE counters source identifier %u\", id);\n \t\treturn;\n@@ -392,6 +401,23 @@ sfc_mae_parse_counter_packet(struct sfc_adapter *sa,\n \t\tbyte_count_hi =\n \t\t\tEFX_OWORD_FIELD32(counters_data[i],\n \t\t\t\tERF_SC_PACKETISER_PAYLOAD_BYTE_COUNT_HI);\n+\n+\t\tif (id == ERF_SC_PACKETISER_HEADER_IDENTIFIER_CT) {\n+\t\t\t/*\n+\t\t\t * FIXME:\n+\t\t\t *\n+\t\t\t * CT counters are 1-bit saturating counters.\n+\t\t\t * There is no way to express this in DPDK\n+\t\t\t * currently, so increment the hit count\n+\t\t\t * by one to let the application know\n+\t\t\t * that the flow is still effective.\n+\t\t\t */\n+\t\t\tpacket_count_lo = 1;\n+\t\t\tpacket_count_hi = 0;\n+\t\t\tbyte_count_lo = 0;\n+\t\t\tbyte_count_hi = 0;\n+\t\t}\n+\n \t\tsfc_mae_counter_increment(sa,\n \t\t\tcounters,\n \t\t\tEFX_OWORD_FIELD32(counters_data[i],\n@@ -983,6 +1009,10 @@ sfc_mae_counter_get(struct sfc_adapter *sa,\n \t\tcounters = &sa->mae.counter_registry.action_counters;\n \t\tneed_byte_count = true;\n \t\tbreak;\n+\tcase EFX_COUNTER_TYPE_CONNTRACK:\n+\t\tcounters = &sa->mae.counter_registry.conntrack_counters;\n+\t\tneed_byte_count = false;\n+\t\tbreak;\n \tdefault:\n \t\treturn EINVAL;\n \t}\n", "prefixes": [ "v3", "34/34" ] }