Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72548/?format=api
{ "id": 72548, "url": "https://patches.dpdk.org/api/patches/72548/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200701065212.41391-26-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "https://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": "<20200701065212.41391-26-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200701065212.41391-26-ajit.khaparde@broadcom.com", "date": "2020-07-01T06:51:46", "name": "[v2,25/51] net/bnxt: remove table scope from session", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "a0a74eddbdeb63547568b59bd6571e6f98c9979e", "submitter": { "id": 501, "url": "https://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 1766, "url": "https://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200701065212.41391-26-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 10703, "url": "https://patches.dpdk.org/api/series/10703/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10703", "date": "2020-07-01T06:51:22", "name": "add features for host-based flow management", "version": 2, "mbox": "https://patches.dpdk.org/series/10703/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/72548/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/72548/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D6116A0350;\n\tWed, 1 Jul 2020 08:58:29 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BF3981D37E;\n\tWed, 1 Jul 2020 08:52:55 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com\n [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 82C2D1C0D2\n for <dev@dpdk.org>; Wed, 1 Jul 2020 08:52:26 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n [10.75.242.48])\n by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 8502930C333;\n Tue, 30 Jun 2020 23:52:25 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.185.215])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id F3ED914008B;\n Tue, 30 Jun 2020 23:52:24 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 8502930C333", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1593586345;\n bh=QGOl8riC0o1ukboDNb9epnJEyv+pbfShx9by8TW1VOg=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=KOBBO9rVcsptPTtF1JJUKUJSNOjwUurv1r8rDf7Gz5L21814QK2Tfd7AX03FPF6sD\n 5Qg9PCLY54kPM/+Wg2w9fnB8J6AtWcWI9tCWbhb+oRjp8kGou59aTjhvRryk7h48oa\n 9IK/XTfqgCRrggfcY2WuUP/uoK3Pyue5ezoBbAcY=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Peter Spreadborough <peter.spreadborough@broadcom.com>,\n Randy Schacher <stuart.schacher@broadcom.com>,\n Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>", "Date": "Tue, 30 Jun 2020 23:51:46 -0700", "Message-Id": "<20200701065212.41391-26-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200701065212.41391-1-ajit.khaparde@broadcom.com>", "References": "<20200612132934.16488-1-somnath.kotur@broadcom.com>\n <20200701065212.41391-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 25/51] net/bnxt: remove table scope from\n\tsession", "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 <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: Peter Spreadborough <peter.spreadborough@broadcom.com>\n\n- Remove table scope data from session. Added to EEM.\n- Complete move to RM of table scope base and range.\n- Fix some err messaging strings.\n- Fix the tcam logging message.\n\nSigned-off-by: Peter Spreadborough <peter.spreadborough@broadcom.com>\nReviewed-by: Randy Schacher <stuart.schacher@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/tf_core/tf_core.c | 2 +-\n drivers/net/bnxt/tf_core/tf_em.h | 1 -\n drivers/net/bnxt/tf_core/tf_em_common.c | 16 +++++++----\n drivers/net/bnxt/tf_core/tf_em_common.h | 5 +---\n drivers/net/bnxt/tf_core/tf_em_host.c | 38 ++++++++++---------------\n drivers/net/bnxt/tf_core/tf_em_system.c | 12 +++-----\n drivers/net/bnxt/tf_core/tf_session.h | 3 --\n drivers/net/bnxt/tf_core/tf_tcam.c | 6 ++--\n 8 files changed, 35 insertions(+), 48 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_core/tf_core.c b/drivers/net/bnxt/tf_core/tf_core.c\nindex 8727900c4..6410843f6 100644\n--- a/drivers/net/bnxt/tf_core/tf_core.c\n+++ b/drivers/net/bnxt/tf_core/tf_core.c\n@@ -573,7 +573,7 @@ tf_free_tcam_entry(struct tf *tfp,\n \trc = dev->ops->tf_dev_free_tcam(tfp, &fparms);\n \tif (rc) {\n \t\tTFP_DRV_LOG(ERR,\n-\t\t\t \"%s: TCAM allocation failed, rc:%s\\n\",\n+\t\t\t \"%s: TCAM free failed, rc:%s\\n\",\n \t\t\t tf_dir_2_str(parms->dir),\n \t\t\t strerror(-rc));\n \t\treturn rc;\ndiff --git a/drivers/net/bnxt/tf_core/tf_em.h b/drivers/net/bnxt/tf_core/tf_em.h\nindex 7042f44e9..c3c712fb9 100644\n--- a/drivers/net/bnxt/tf_core/tf_em.h\n+++ b/drivers/net/bnxt/tf_core/tf_em.h\n@@ -9,7 +9,6 @@\n #include \"tf_core.h\"\n #include \"tf_session.h\"\n \n-#define TF_HACK_TBL_SCOPE_BASE 68\n #define SUPPORT_CFA_HW_P4 1\n #define SUPPORT_CFA_HW_P58 0\n #define SUPPORT_CFA_HW_P59 0\ndiff --git a/drivers/net/bnxt/tf_core/tf_em_common.c b/drivers/net/bnxt/tf_core/tf_em_common.c\nindex d0d80daeb..e31a63b46 100644\n--- a/drivers/net/bnxt/tf_core/tf_em_common.c\n+++ b/drivers/net/bnxt/tf_core/tf_em_common.c\n@@ -29,6 +29,8 @@\n */\n void *eem_db[TF_DIR_MAX];\n \n+#define TF_EEM_DB_TBL_SCOPE 1\n+\n /**\n * Init flag, set on bind and cleared on unbind\n */\n@@ -39,10 +41,12 @@ static uint8_t init;\n */\n static enum tf_mem_type mem_type;\n \n+/** Table scope array */\n+struct tf_tbl_scope_cb tbl_scopes[TF_NUM_TBL_SCOPE];\n+\n /* API defined in tf_em.h */\n struct tf_tbl_scope_cb *\n-tbl_scope_cb_find(struct tf_session *session,\n-\t\t uint32_t tbl_scope_id)\n+tbl_scope_cb_find(uint32_t tbl_scope_id)\n {\n \tint i;\n \tstruct tf_rm_is_allocated_parms parms;\n@@ -50,8 +54,8 @@ tbl_scope_cb_find(struct tf_session *session,\n \n \t/* Check that id is valid */\n \tparms.rm_db = eem_db[TF_DIR_RX];\n-\tparms.db_index = 1/**** TYPE TABLE-SCOPE??? ****/;\n-\tparms.index = tbl_scope_id + TF_HACK_TBL_SCOPE_BASE;\n+\tparms.db_index = TF_EEM_DB_TBL_SCOPE;\n+\tparms.index = tbl_scope_id;\n \tparms.allocated = &allocated;\n \n \ti = tf_rm_is_allocated(&parms);\n@@ -60,8 +64,8 @@ tbl_scope_cb_find(struct tf_session *session,\n \t\treturn NULL;\n \n \tfor (i = 0; i < TF_NUM_TBL_SCOPE; i++) {\n-\t\tif (session->tbl_scopes[i].tbl_scope_id == tbl_scope_id)\n-\t\t\treturn &session->tbl_scopes[i];\n+\t\tif (tbl_scopes[i].tbl_scope_id == tbl_scope_id)\n+\t\t\treturn &tbl_scopes[i];\n \t}\n \n \treturn NULL;\ndiff --git a/drivers/net/bnxt/tf_core/tf_em_common.h b/drivers/net/bnxt/tf_core/tf_em_common.h\nindex 45699a7c3..bf01df9b8 100644\n--- a/drivers/net/bnxt/tf_core/tf_em_common.h\n+++ b/drivers/net/bnxt/tf_core/tf_em_common.h\n@@ -14,8 +14,6 @@\n * Function to search for table scope control block structure\n * with specified table scope ID.\n *\n- * [in] session\n- * Session to use for the search of the table scope control block\n * [in] tbl_scope_id\n * Table scope ID to search for\n *\n@@ -23,8 +21,7 @@\n * Pointer to the found table scope control block struct or NULL if\n * table scope control block struct not found\n */\n-struct tf_tbl_scope_cb *tbl_scope_cb_find(struct tf_session *session,\n-\t\t\t\t\t uint32_t tbl_scope_id);\n+struct tf_tbl_scope_cb *tbl_scope_cb_find(uint32_t tbl_scope_id);\n \n /**\n * Create and initialize a stack to use for action entries\ndiff --git a/drivers/net/bnxt/tf_core/tf_em_host.c b/drivers/net/bnxt/tf_core/tf_em_host.c\nindex 8be39afdd..543edb54a 100644\n--- a/drivers/net/bnxt/tf_core/tf_em_host.c\n+++ b/drivers/net/bnxt/tf_core/tf_em_host.c\n@@ -48,6 +48,9 @@\n * EM DBs.\n */\n extern void *eem_db[TF_DIR_MAX];\n+#define TF_EEM_DB_TBL_SCOPE 1\n+\n+extern struct tf_tbl_scope_cb tbl_scopes[TF_NUM_TBL_SCOPE];\n \n /**\n * Function to free a page table\n@@ -934,14 +937,12 @@ tf_delete_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb,\n * -EINVAL - Error\n */\n int\n-tf_em_insert_ext_entry(struct tf *tfp,\n+tf_em_insert_ext_entry(struct tf *tfp __rte_unused,\n \t\t struct tf_insert_em_entry_parms *parms)\n {\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n \n-\ttbl_scope_cb =\n-\ttbl_scope_cb_find((struct tf_session *)(tfp->session->core_data),\n-\t\t\t parms->tbl_scope_id);\n+\ttbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);\n \tif (tbl_scope_cb == NULL) {\n \t\tTFP_DRV_LOG(ERR, \"Invalid tbl_scope_cb\\n\");\n \t\treturn -EINVAL;\n@@ -957,14 +958,12 @@ tf_em_insert_ext_entry(struct tf *tfp,\n * -EINVAL - Error\n */\n int\n-tf_em_delete_ext_entry(struct tf *tfp,\n+tf_em_delete_ext_entry(struct tf *tfp __rte_unused,\n \t\t struct tf_delete_em_entry_parms *parms)\n {\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n \n-\ttbl_scope_cb =\n-\ttbl_scope_cb_find((struct tf_session *)(tfp->session->core_data),\n-\t\t\t parms->tbl_scope_id);\n+\ttbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);\n \tif (tbl_scope_cb == NULL) {\n \t\tTFP_DRV_LOG(ERR, \"Invalid tbl_scope_cb\\n\");\n \t\treturn -EINVAL;\n@@ -981,16 +980,13 @@ tf_em_ext_host_alloc(struct tf *tfp,\n \tenum tf_dir dir;\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n \tstruct hcapi_cfa_em_table *em_tables;\n-\tstruct tf_session *session;\n \tstruct tf_free_tbl_scope_parms free_parms;\n \tstruct tf_rm_allocate_parms aparms = { 0 };\n \tstruct tf_rm_free_parms fparms = { 0 };\n \n-\tsession = (struct tf_session *)tfp->session->core_data;\n-\n \t/* Get Table Scope control block from the session pool */\n \taparms.rm_db = eem_db[TF_DIR_RX];\n-\taparms.db_index = 1/**** TYPE TABLE-SCOPE??? ****/;\n+\taparms.db_index = TF_EEM_DB_TBL_SCOPE;\n \taparms.index = (uint32_t *)&parms->tbl_scope_id;\n \trc = tf_rm_allocate(&aparms);\n \tif (rc) {\n@@ -999,8 +995,7 @@ tf_em_ext_host_alloc(struct tf *tfp,\n \t\treturn rc;\n \t}\n \n-\tparms->tbl_scope_id -= TF_HACK_TBL_SCOPE_BASE;\n-\ttbl_scope_cb = &session->tbl_scopes[parms->tbl_scope_id];\n+\ttbl_scope_cb = &tbl_scopes[parms->tbl_scope_id];\n \ttbl_scope_cb->index = parms->tbl_scope_id;\n \ttbl_scope_cb->tbl_scope_id = parms->tbl_scope_id;\n \n@@ -1092,8 +1087,8 @@ tf_em_ext_host_alloc(struct tf *tfp,\n cleanup:\n \t/* Free Table control block */\n \tfparms.rm_db = eem_db[TF_DIR_RX];\n-\tfparms.db_index = 1/**** TYPE TABLE-SCOPE??? ****/;\n-\tfparms.index = parms->tbl_scope_id + TF_HACK_TBL_SCOPE_BASE;\n+\tfparms.db_index = TF_EEM_DB_TBL_SCOPE;\n+\tfparms.index = parms->tbl_scope_id;\n \ttf_rm_free(&fparms);\n \treturn -EINVAL;\n }\n@@ -1105,13 +1100,9 @@ tf_em_ext_host_free(struct tf *tfp,\n \tint rc = 0;\n \tenum tf_dir dir;\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n-\tstruct tf_session *session;\n \tstruct tf_rm_free_parms aparms = { 0 };\n \n-\tsession = (struct tf_session *)(tfp->session->core_data);\n-\n-\ttbl_scope_cb = tbl_scope_cb_find(session,\n-\t\t\t\t\t parms->tbl_scope_id);\n+\ttbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);\n \n \tif (tbl_scope_cb == NULL) {\n \t\tTFP_DRV_LOG(ERR, \"Table scope error\\n\");\n@@ -1120,8 +1111,8 @@ tf_em_ext_host_free(struct tf *tfp,\n \n \t/* Free Table control block */\n \taparms.rm_db = eem_db[TF_DIR_RX];\n-\taparms.db_index = 1/**** TYPE TABLE-SCOPE??? ****/;\n-\taparms.index = parms->tbl_scope_id + TF_HACK_TBL_SCOPE_BASE;\n+\taparms.db_index = TF_EEM_DB_TBL_SCOPE;\n+\taparms.index = parms->tbl_scope_id;\n \trc = tf_rm_free(&aparms);\n \tif (rc) {\n \t\tTFP_DRV_LOG(ERR,\n@@ -1142,5 +1133,6 @@ tf_em_ext_host_free(struct tf *tfp,\n \t\ttf_em_ctx_unreg(tfp, tbl_scope_cb, dir);\n \t}\n \n+\ttbl_scopes[parms->tbl_scope_id].tbl_scope_id = -1;\n \treturn rc;\n }\ndiff --git a/drivers/net/bnxt/tf_core/tf_em_system.c b/drivers/net/bnxt/tf_core/tf_em_system.c\nindex ee18a0c70..6dd115470 100644\n--- a/drivers/net/bnxt/tf_core/tf_em_system.c\n+++ b/drivers/net/bnxt/tf_core/tf_em_system.c\n@@ -63,14 +63,12 @@ tf_delete_eem_entry(struct tf_tbl_scope_cb *tbl_scope_cb __rte_unused,\n * -EINVAL - Error\n */\n int\n-tf_em_insert_ext_sys_entry(struct tf *tfp,\n+tf_em_insert_ext_sys_entry(struct tf *tfp __rte_unused,\n \t\t\t struct tf_insert_em_entry_parms *parms)\n {\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n \n-\ttbl_scope_cb = tbl_scope_cb_find\n-\t\t((struct tf_session *)(tfp->session->core_data),\n-\t\tparms->tbl_scope_id);\n+\ttbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);\n \tif (tbl_scope_cb == NULL) {\n \t\tTFP_DRV_LOG(ERR, \"Invalid tbl_scope_cb\\n\");\n \t\treturn -EINVAL;\n@@ -87,14 +85,12 @@ tf_em_insert_ext_sys_entry(struct tf *tfp,\n * -EINVAL - Error\n */\n int\n-tf_em_delete_ext_sys_entry(struct tf *tfp,\n+tf_em_delete_ext_sys_entry(struct tf *tfp __rte_unused,\n \t\t\t struct tf_delete_em_entry_parms *parms)\n {\n \tstruct tf_tbl_scope_cb *tbl_scope_cb;\n \n-\ttbl_scope_cb = tbl_scope_cb_find\n-\t\t((struct tf_session *)(tfp->session->core_data),\n-\t\tparms->tbl_scope_id);\n+\ttbl_scope_cb = tbl_scope_cb_find(parms->tbl_scope_id);\n \tif (tbl_scope_cb == NULL) {\n \t\tTFP_DRV_LOG(ERR, \"Invalid tbl_scope_cb\\n\");\n \t\treturn -EINVAL;\ndiff --git a/drivers/net/bnxt/tf_core/tf_session.h b/drivers/net/bnxt/tf_core/tf_session.h\nindex ebee4db8c..a303fde51 100644\n--- a/drivers/net/bnxt/tf_core/tf_session.h\n+++ b/drivers/net/bnxt/tf_core/tf_session.h\n@@ -100,9 +100,6 @@ struct tf_session {\n \n \t/** Device handle */\n \tstruct tf_dev_info dev;\n-\n-\t/** Table scope array */\n-\tstruct tf_tbl_scope_cb tbl_scopes[TF_NUM_TBL_SCOPE];\n };\n \n /**\ndiff --git a/drivers/net/bnxt/tf_core/tf_tcam.c b/drivers/net/bnxt/tf_core/tf_tcam.c\nindex d5bb4eec1..b67159a54 100644\n--- a/drivers/net/bnxt/tf_core/tf_tcam.c\n+++ b/drivers/net/bnxt/tf_core/tf_tcam.c\n@@ -287,7 +287,8 @@ tf_tcam_free(struct tf *tfp,\n \trc = tf_msg_tcam_entry_free(tfp, parms);\n \tif (rc) {\n \t\t/* Log error */\n-\t\tTFP_DRV_LOG(ERR, \"%s: %s: Entry %d free failed with err %s\",\n+\t\tTFP_DRV_LOG(ERR,\n+\t\t\t \"%s: %s: Entry %d free failed, rc:%s\\n\",\n \t\t\t tf_dir_2_str(parms->dir),\n \t\t\t tf_tcam_tbl_2_str(parms->type),\n \t\t\t parms->idx,\n@@ -382,7 +383,8 @@ tf_tcam_set(struct tf *tfp __rte_unused,\n \trc = tf_msg_tcam_entry_set(tfp, parms);\n \tif (rc) {\n \t\t/* Log error */\n-\t\tTFP_DRV_LOG(ERR, \"%s: %s: Entry %d free failed with err %s\",\n+\t\tTFP_DRV_LOG(ERR,\n+\t\t\t \"%s: %s: Entry %d set failed, rc:%s\",\n \t\t\t tf_dir_2_str(parms->dir),\n \t\t\t tf_tcam_tbl_2_str(parms->type),\n \t\t\t parms->idx,\n", "prefixes": [ "v2", "25/51" ] }