Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/95196/?format=api
{ "id": 95196, "url": "http://patches.dpdk.org/api/patches/95196/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210702083948.546667-14-andrew.rybchenko@oktetlabs.ru/", "project": { "id": 1, "url": "http://patches.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": "<20210702083948.546667-14-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210702083948.546667-14-andrew.rybchenko@oktetlabs.ru", "date": "2021-07-02T08:39:41", "name": "[v4,13/20] common/sfc_efx/base: add counter creation MCDI wrappers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "812df1ae4b3dab3c55d962064dd8f05a5353c924", "submitter": { "id": 2013, "url": "http://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210702083948.546667-14-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 17590, "url": "http://patches.dpdk.org/api/series/17590/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17590", "date": "2021-07-02T08:39:28", "name": "net/sfc: support flow API COUNT action", "version": 4, "mbox": "http://patches.dpdk.org/series/17590/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/95196/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/95196/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 7D14CA0A0C;\n\tFri, 2 Jul 2021 10:41:55 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 68E744139F;\n\tFri, 2 Jul 2021 10:40:56 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id E2D134139F\n for <dev@dpdk.org>; Fri, 2 Jul 2021 10:40:55 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id A3B577F6C0; Fri, 2 Jul 2021 11:40:55 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id CF9967F6CA;\n Fri, 2 Jul 2021 11:40:18 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru CF9967F6CA", "Authentication-Results": "shelob.oktetlabs.ru/CF9967F6CA; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "David Marchand <david.marchand@redhat.com>,\n Igor Romanov <igor.romanov@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>, Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Fri, 2 Jul 2021 11:39:41 +0300", "Message-Id": "<20210702083948.546667-14-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210702083948.546667-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210527152510.1551026-1-andrew.rybchenko@oktetlabs.ru>\n <20210702083948.546667-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 13/20] common/sfc_efx/base: add counter\n creation MCDI wrappers", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Igor Romanov <igor.romanov@oktetlabs.ru>\n\nUser will be able to create and free MAE counters. Support for\nassociating counters with action set will be added in upcoming\npatches.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\nReviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>\n---\n drivers/common/sfc_efx/base/efx.h | 37 ++++++\n drivers/common/sfc_efx/base/efx_impl.h | 1 +\n drivers/common/sfc_efx/base/efx_mae.c | 158 +++++++++++++++++++++++++\n drivers/common/sfc_efx/base/efx_mcdi.h | 7 ++\n drivers/common/sfc_efx/version.map | 2 +\n 5 files changed, 205 insertions(+)", "diff": "diff --git a/drivers/common/sfc_efx/base/efx.h b/drivers/common/sfc_efx/base/efx.h\nindex f81837a931..b789e19b98 100644\n--- a/drivers/common/sfc_efx/base/efx.h\n+++ b/drivers/common/sfc_efx/base/efx.h\n@@ -4388,6 +4388,10 @@ efx_mae_action_set_fill_in_eh_id(\n \t__in\t\t\t\tefx_mae_actions_t *spec,\n \t__in\t\t\t\tconst efx_mae_eh_id_t *eh_idp);\n \n+typedef struct efx_counter_s {\n+\tuint32_t id;\n+} efx_counter_t;\n+\n /* Action set ID */\n typedef struct efx_mae_aset_id_s {\n \tuint32_t id;\n@@ -4400,6 +4404,39 @@ efx_mae_action_set_alloc(\n \t__in\t\t\t\tconst efx_mae_actions_t *spec,\n \t__out\t\t\t\tefx_mae_aset_id_t *aset_idp);\n \n+/*\n+ * Generation count has two purposes:\n+ *\n+ * 1) Distinguish between counter packets that belong to freed counter\n+ * and the packets that belong to reallocated counter (with the same ID);\n+ * 2) Make sure that all packets are received for a counter that was freed;\n+ *\n+ * API users should provide generation count out parameter in allocation\n+ * function if counters can be reallocated and consistent counter values are\n+ * required.\n+ *\n+ * API users that need consistent final counter values after counter\n+ * deallocation or counter stream stop should provide the parameter in\n+ * functions that free the counters and stop the counter stream.\n+ */\n+LIBEFX_API\n+extern\t__checkReturn\t\t\tefx_rc_t\n+efx_mae_counters_alloc(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tuint32_t n_counters,\n+\t__out\t\t\t\tuint32_t *n_allocatedp,\n+\t__out_ecount(n_counters)\tefx_counter_t *countersp,\n+\t__out_opt\t\t\tuint32_t *gen_countp);\n+\n+LIBEFX_API\n+extern\t__checkReturn\t\t\tefx_rc_t\n+efx_mae_counters_free(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tuint32_t n_counters,\n+\t__out\t\t\t\tuint32_t *n_freedp,\n+\t__in_ecount(n_counters)\t\tconst efx_counter_t *countersp,\n+\t__out_opt\t\t\tuint32_t *gen_countp);\n+\n LIBEFX_API\n extern\t__checkReturn\t\t\tefx_rc_t\n efx_mae_action_set_free(\ndiff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h\nindex a6b20704ac..b69463385e 100644\n--- a/drivers/common/sfc_efx/base/efx_impl.h\n+++ b/drivers/common/sfc_efx/base/efx_impl.h\n@@ -821,6 +821,7 @@ typedef struct efx_mae_s {\n \t/** Outer rule match field capabilities. */\n \tefx_mae_field_cap_t\t\t*em_outer_rule_field_caps;\n \tsize_t\t\t\t\tem_outer_rule_field_caps_size;\n+\tuint32_t\t\t\tem_max_ncounters;\n } efx_mae_t;\n \n #endif /* EFSYS_OPT_MAE */\ndiff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c\nindex c1784211e7..cf6c449a16 100644\n--- a/drivers/common/sfc_efx/base/efx_mae.c\n+++ b/drivers/common/sfc_efx/base/efx_mae.c\n@@ -67,6 +67,9 @@ efx_mae_get_capabilities(\n \tmaep->em_max_nfields =\n \t MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_MATCH_FIELD_COUNT);\n \n+\tmaep->em_max_ncounters =\n+\t MCDI_OUT_DWORD(req, MAE_GET_CAPS_OUT_COUNTERS);\n+\n \treturn (0);\n \n fail2:\n@@ -2369,6 +2372,161 @@ efx_mae_action_rule_remove(\n \n \treturn (0);\n \n+fail4:\n+\tEFSYS_PROBE(fail4);\n+fail3:\n+\tEFSYS_PROBE(fail3);\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\t\t\tefx_rc_t\n+efx_mae_counters_alloc(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tuint32_t n_counters,\n+\t__out\t\t\t\tuint32_t *n_allocatedp,\n+\t__out_ecount(n_counters)\tefx_counter_t *countersp,\n+\t__out_opt\t\t\tuint32_t *gen_countp)\n+{\n+\tEFX_MCDI_DECLARE_BUF(payload,\n+\t MC_CMD_MAE_COUNTER_ALLOC_IN_LEN,\n+\t MC_CMD_MAE_COUNTER_ALLOC_OUT_LENMAX_MCDI2);\n+\tefx_mae_t *maep = enp->en_maep;\n+\tuint32_t n_allocated;\n+\tefx_mcdi_req_t req;\n+\tunsigned int i;\n+\tefx_rc_t rc;\n+\n+\tif (n_counters > maep->em_max_ncounters ||\n+\t n_counters < MC_CMD_MAE_COUNTER_ALLOC_OUT_COUNTER_ID_MINNUM ||\n+\t n_counters > MC_CMD_MAE_COUNTER_ALLOC_OUT_COUNTER_ID_MAXNUM_MCDI2) {\n+\t\trc = EINVAL;\n+\t\tgoto fail1;\n+\t}\n+\n+\treq.emr_cmd = MC_CMD_MAE_COUNTER_ALLOC;\n+\treq.emr_in_buf = payload;\n+\treq.emr_in_length = MC_CMD_MAE_COUNTER_ALLOC_IN_LEN;\n+\treq.emr_out_buf = payload;\n+\treq.emr_out_length = MC_CMD_MAE_COUNTER_ALLOC_OUT_LEN(n_counters);\n+\n+\tMCDI_IN_SET_DWORD(req, MAE_COUNTER_ALLOC_IN_REQUESTED_COUNT,\n+\t n_counters);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail2;\n+\t}\n+\n+\tif (req.emr_out_length_used < MC_CMD_MAE_COUNTER_ALLOC_OUT_LENMIN) {\n+\t\trc = EMSGSIZE;\n+\t\tgoto fail3;\n+\t}\n+\n+\tn_allocated = MCDI_OUT_DWORD(req,\n+\t MAE_COUNTER_ALLOC_OUT_COUNTER_ID_COUNT);\n+\tif (n_allocated < MC_CMD_MAE_COUNTER_ALLOC_OUT_COUNTER_ID_MINNUM) {\n+\t\trc = EFAULT;\n+\t\tgoto fail4;\n+\t}\n+\n+\tfor (i = 0; i < n_allocated; i++) {\n+\t\tcountersp[i].id = MCDI_OUT_INDEXED_DWORD(req,\n+\t\t MAE_COUNTER_ALLOC_OUT_COUNTER_ID, i);\n+\t}\n+\n+\tif (gen_countp != NULL) {\n+\t\t*gen_countp = MCDI_OUT_DWORD(req,\n+\t\t\t\t MAE_COUNTER_ALLOC_OUT_GENERATION_COUNT);\n+\t}\n+\n+\t*n_allocatedp = n_allocated;\n+\n+\treturn (0);\n+\n+fail4:\n+\tEFSYS_PROBE(fail4);\n+fail3:\n+\tEFSYS_PROBE(fail3);\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\t\t\tefx_rc_t\n+efx_mae_counters_free(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tuint32_t n_counters,\n+\t__out\t\t\t\tuint32_t *n_freedp,\n+\t__in_ecount(n_counters)\t\tconst efx_counter_t *countersp,\n+\t__out_opt\t\t\tuint32_t *gen_countp)\n+{\n+\tEFX_MCDI_DECLARE_BUF(payload,\n+\t MC_CMD_MAE_COUNTER_FREE_IN_LENMAX_MCDI2,\n+\t MC_CMD_MAE_COUNTER_FREE_OUT_LENMAX_MCDI2);\n+\tefx_mae_t *maep = enp->en_maep;\n+\tefx_mcdi_req_t req;\n+\tuint32_t n_freed;\n+\tunsigned int i;\n+\tefx_rc_t rc;\n+\n+\tif (n_counters > maep->em_max_ncounters ||\n+\t n_counters < MC_CMD_MAE_COUNTER_FREE_IN_FREE_COUNTER_ID_MINNUM ||\n+\t n_counters >\n+\t MC_CMD_MAE_COUNTER_FREE_IN_FREE_COUNTER_ID_MAXNUM_MCDI2) {\n+\t\trc = EINVAL;\n+\t\tgoto fail1;\n+\t}\n+\n+\treq.emr_cmd = MC_CMD_MAE_COUNTER_FREE;\n+\treq.emr_in_buf = payload;\n+\treq.emr_in_length = MC_CMD_MAE_COUNTER_FREE_IN_LEN(n_counters);\n+\treq.emr_out_buf = payload;\n+\treq.emr_out_length = MC_CMD_MAE_COUNTER_FREE_OUT_LEN(n_counters);\n+\n+\tfor (i = 0; i < n_counters; i++) {\n+\t\tMCDI_IN_SET_INDEXED_DWORD(req,\n+\t\t MAE_COUNTER_FREE_IN_FREE_COUNTER_ID, i, countersp[i].id);\n+\t}\n+\tMCDI_IN_SET_DWORD(req, MAE_COUNTER_FREE_IN_COUNTER_ID_COUNT,\n+\t\t\t n_counters);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail2;\n+\t}\n+\n+\tif (req.emr_out_length_used < MC_CMD_MAE_COUNTER_FREE_OUT_LENMIN) {\n+\t\trc = EMSGSIZE;\n+\t\tgoto fail3;\n+\t}\n+\n+\tn_freed = MCDI_OUT_DWORD(req, MAE_COUNTER_FREE_OUT_COUNTER_ID_COUNT);\n+\n+\tif (n_freed < MC_CMD_MAE_COUNTER_FREE_OUT_FREED_COUNTER_ID_MINNUM) {\n+\t\trc = EFAULT;\n+\t\tgoto fail4;\n+\t}\n+\n+\tif (gen_countp != NULL) {\n+\t\t*gen_countp = MCDI_OUT_DWORD(req,\n+\t\t\t\t MAE_COUNTER_FREE_OUT_GENERATION_COUNT);\n+\t}\n+\n+\t*n_freedp = n_freed;\n+\n+\treturn (0);\n+\n fail4:\n \tEFSYS_PROBE(fail4);\n fail3:\ndiff --git a/drivers/common/sfc_efx/base/efx_mcdi.h b/drivers/common/sfc_efx/base/efx_mcdi.h\nindex 70a97ea337..90b70de97b 100644\n--- a/drivers/common/sfc_efx/base/efx_mcdi.h\n+++ b/drivers/common/sfc_efx/base/efx_mcdi.h\n@@ -311,6 +311,10 @@ efx_mcdi_phy_module_get_info(\n \tEFX_SET_DWORD_FIELD(*MCDI_IN2(_emr, efx_dword_t, _ofst),\t\\\n \t\tMC_CMD_ ## _field, _value)\n \n+#define\tMCDI_IN_SET_INDEXED_DWORD(_emr, _ofst, _idx, _value)\t\t\\\n+\tEFX_POPULATE_DWORD_1(*(MCDI_IN2(_emr, efx_dword_t, _ofst) +\t\\\n+\t\t\t (_idx)), EFX_DWORD_0, _value)\t\t\\\n+\n #define\tMCDI_IN_POPULATE_DWORD_1(_emr, _ofst, _field1, _value1)\t\t\\\n \tEFX_POPULATE_DWORD_1(*MCDI_IN2(_emr, efx_dword_t, _ofst),\t\\\n \t\tMC_CMD_ ## _field1, _value1)\n@@ -451,6 +455,9 @@ efx_mcdi_phy_module_get_info(\n \tEFX_DWORD_FIELD(*MCDI_OUT2(_emr, efx_dword_t, _ofst),\t\t\\\n \t\t\tMC_CMD_ ## _field)\n \n+#define\tMCDI_OUT_INDEXED_DWORD(_emr, _ofst, _idx)\t\t\t\\\n+\tMCDI_OUT_INDEXED_DWORD_FIELD(_emr, _ofst, _idx, EFX_DWORD_0)\n+\n #define\tMCDI_OUT_INDEXED_DWORD_FIELD(_emr, _ofst, _idx, _field)\t\t\\\n \tEFX_DWORD_FIELD(*(MCDI_OUT2(_emr, efx_dword_t, _ofst) +\t\t\\\n \t\t\t(_idx)), _field)\ndiff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map\nindex d534d8ecb5..d60cd477fa 100644\n--- a/drivers/common/sfc_efx/version.map\n+++ b/drivers/common/sfc_efx/version.map\n@@ -102,6 +102,8 @@ INTERNAL {\n \tefx_mae_action_set_spec_fini;\n \tefx_mae_action_set_spec_init;\n \tefx_mae_action_set_specs_equal;\n+\tefx_mae_counters_alloc;\n+\tefx_mae_counters_free;\n \tefx_mae_encap_header_alloc;\n \tefx_mae_encap_header_free;\n \tefx_mae_fini;\n", "prefixes": [ "v4", "13/20" ] }