Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/61452/?format=api
{ "id": 61452, "url": "http://patches.dpdk.org/api/patches/61452/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191018111602.26742-6-yahui.cao@intel.com/", "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": "<20191018111602.26742-6-yahui.cao@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191018111602.26742-6-yahui.cao@intel.com", "date": "2019-10-18T11:15:58", "name": "[v7,5/9] net/ice: add FDIR counter resource init/release", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "9b18e291423d0b7b1874fc40860408de45f9c125", "submitter": { "id": 1176, "url": "http://patches.dpdk.org/api/people/1176/?format=api", "name": "Cao, Yahui", "email": "yahui.cao@intel.com" }, "delegate": { "id": 31221, "url": "http://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191018111602.26742-6-yahui.cao@intel.com/mbox/", "series": [ { "id": 6926, "url": "http://patches.dpdk.org/api/series/6926/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6926", "date": "2019-10-18T11:15:53", "name": "net/ice: add ice Flow Director driver", "version": 7, "mbox": "http://patches.dpdk.org/series/6926/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/61452/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/61452/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 2B0081E882;\n\tFri, 18 Oct 2019 05:33:58 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 74AD11E540\n\tfor <dev@dpdk.org>; Fri, 18 Oct 2019 05:33:49 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 Oct 2019 20:33:49 -0700", "from dpdk-yahui-skylake.sh.intel.com ([10.67.119.16])\n\tby FMSMGA003.fm.intel.com with ESMTP; 17 Oct 2019 20:33:47 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.67,310,1566889200\"; d=\"scan'208\";a=\"202577933\"", "From": "Yahui Cao <yahui.cao@intel.com>", "To": "Qiming Yang <qiming.yang@intel.com>,\n\tWenzhuo Lu <wenzhuo.lu@intel.com>", "Cc": "dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,\n\tXiaolong Ye <xiaolong.ye@intel.com>,\n\tBeilei Xing <beilei.xing@intel.com>, Yahui Cao <yahui.cao@intel.com>", "Date": "Fri, 18 Oct 2019 19:15:58 +0800", "Message-Id": "<20191018111602.26742-6-yahui.cao@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191018111602.26742-1-yahui.cao@intel.com>", "References": "<20191017160454.14518-1-yahui.cao@intel.com>\n\t<20191018111602.26742-1-yahui.cao@intel.com>", "Subject": "[dpdk-dev] [PATCH v7 5/9] net/ice: add FDIR counter resource\n\tinit/release", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The patch integrates the counter resource init/release into fdir's\ninit/release scenario\n\nSigned-off-by: Yahui Cao <yahui.cao@intel.com>\nAcked-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/ice/ice_ethdev.h | 33 +++++++++++\n drivers/net/ice/ice_fdir_filter.c | 92 +++++++++++++++++++++++++++++++\n 2 files changed, 125 insertions(+)", "diff": "diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h\nindex 914e065ba..5947a7883 100644\n--- a/drivers/net/ice/ice_ethdev.h\n+++ b/drivers/net/ice/ice_ethdev.h\n@@ -252,6 +252,37 @@ struct ice_fdir_filter_conf {\n \tuint64_t input_set;\n };\n \n+#define ICE_FDIR_COUNTER_DEFAULT_POOL_SIZE\t1\n+#define ICE_FDIR_COUNTER_MAX_POOL_SIZE\t\t32\n+#define ICE_FDIR_COUNTERS_PER_BLOCK\t\t256\n+#define ICE_FDIR_COUNTER_INDEX(base_idx) \\\n+\t\t\t\t((base_idx) * ICE_FDIR_COUNTERS_PER_BLOCK)\n+struct ice_fdir_counter {\n+\tTAILQ_ENTRY(ice_fdir_counter) next;\n+\tuint8_t shared;\n+\tuint32_t ref_cnt;\n+\tuint32_t id;\n+\tuint64_t hits;\n+\tuint64_t bytes;\n+\tuint32_t hw_index;\n+};\n+\n+TAILQ_HEAD(ice_fdir_counter_list, ice_fdir_counter);\n+\n+struct ice_fdir_counter_pool {\n+\tTAILQ_ENTRY(ice_fdir_counter_pool) next;\n+\tstruct ice_fdir_counter_list counter_list;\n+\tstruct ice_fdir_counter counters[0];\n+};\n+\n+TAILQ_HEAD(ice_fdir_counter_pool_list, ice_fdir_counter_pool);\n+\n+struct ice_fdir_counter_pool_container {\n+\tstruct ice_fdir_counter_pool_list pool_list;\n+\tstruct ice_fdir_counter_pool *pools[ICE_FDIR_COUNTER_MAX_POOL_SIZE];\n+\tuint8_t index_free;\n+};\n+\n /**\n * A structure used to define fields of a FDIR related info.\n */\n@@ -262,6 +293,8 @@ struct ice_fdir_info {\n \tvoid *prg_pkt; /* memory for fdir program packet */\n \tuint64_t dma_addr; /* physic address of packet memory*/\n \tstruct ice_fdir_filter_conf conf;\n+\n+\tstruct ice_fdir_counter_pool_container counter;\n };\n \n struct ice_pf {\ndiff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c\nindex 66001702b..8dbd6fc72 100644\n--- a/drivers/net/ice/ice_fdir_filter.c\n+++ b/drivers/net/ice/ice_fdir_filter.c\n@@ -101,6 +101,88 @@ ice_fdir_prof_alloc(struct ice_hw *hw)\n \treturn -ENOMEM;\n }\n \n+static int\n+ice_fdir_counter_pool_add(__rte_unused struct ice_pf *pf,\n+\t\t\t struct ice_fdir_counter_pool_container *container,\n+\t\t\t uint32_t index_start,\n+\t\t\t uint32_t len)\n+{\n+\tstruct ice_fdir_counter_pool *pool;\n+\tuint32_t i;\n+\tint ret = 0;\n+\n+\tpool = rte_zmalloc(\"ice_fdir_counter_pool\",\n+\t\t\t sizeof(*pool) +\n+\t\t\t sizeof(struct ice_fdir_counter) * len,\n+\t\t\t 0);\n+\tif (!pool) {\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\t \"Failed to allocate memory for fdir counter pool\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tTAILQ_INIT(&pool->counter_list);\n+\tTAILQ_INSERT_TAIL(&container->pool_list, pool, next);\n+\n+\tfor (i = 0; i < len; i++) {\n+\t\tstruct ice_fdir_counter *counter = &pool->counters[i];\n+\n+\t\tcounter->hw_index = index_start + i;\n+\t\tTAILQ_INSERT_TAIL(&pool->counter_list, counter, next);\n+\t}\n+\n+\tif (container->index_free == ICE_FDIR_COUNTER_MAX_POOL_SIZE) {\n+\t\tPMD_INIT_LOG(ERR, \"FDIR counter pool is full\");\n+\t\tret = -EINVAL;\n+\t\tgoto free_pool;\n+\t}\n+\n+\tcontainer->pools[container->index_free++] = pool;\n+\treturn 0;\n+\n+free_pool:\n+\trte_free(pool);\n+\treturn ret;\n+}\n+\n+static int\n+ice_fdir_counter_init(struct ice_pf *pf)\n+{\n+\tstruct ice_hw *hw = ICE_PF_TO_HW(pf);\n+\tstruct ice_fdir_info *fdir_info = &pf->fdir;\n+\tstruct ice_fdir_counter_pool_container *container =\n+\t\t\t\t&fdir_info->counter;\n+\tuint32_t cnt_index, len;\n+\tint ret;\n+\n+\tTAILQ_INIT(&container->pool_list);\n+\n+\tcnt_index = ICE_FDIR_COUNTER_INDEX(hw->fd_ctr_base);\n+\tlen = ICE_FDIR_COUNTERS_PER_BLOCK;\n+\n+\tret = ice_fdir_counter_pool_add(pf, container, cnt_index, len);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to add fdir pool to container\");\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+ice_fdir_counter_release(struct ice_pf *pf)\n+{\n+\tstruct ice_fdir_info *fdir_info = &pf->fdir;\n+\tstruct ice_fdir_counter_pool_container *container =\n+\t\t\t\t&fdir_info->counter;\n+\tuint8_t i;\n+\n+\tfor (i = 0; i < container->index_free; i++)\n+\t\trte_free(container->pools[i]);\n+\n+\treturn 0;\n+}\n+\n /*\n * ice_fdir_setup - reserve and initialize the Flow Director resources\n * @pf: board private structure\n@@ -138,6 +220,12 @@ ice_fdir_setup(struct ice_pf *pf)\n \t}\n \tpf->fdir.fdir_vsi = vsi;\n \n+\terr = ice_fdir_counter_init(pf);\n+\tif (err) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to init FDIR counter.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \t/*Fdir tx queue setup*/\n \terr = ice_fdir_setup_tx_resources(pf);\n \tif (err) {\n@@ -289,6 +377,10 @@ ice_fdir_teardown(struct ice_pf *pf)\n \tif (err)\n \t\tPMD_DRV_LOG(ERR, \"Failed to stop RX queue.\");\n \n+\terr = ice_fdir_counter_release(pf);\n+\tif (err)\n+\t\tPMD_DRV_LOG(ERR, \"Failed to release FDIR counter resource.\");\n+\n \tice_tx_queue_release(pf->fdir.txq);\n \tpf->fdir.txq = NULL;\n \tice_rx_queue_release(pf->fdir.rxq);\n", "prefixes": [ "v7", "5/9" ] }