Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73209/?format=api
{ "id": 73209, "url": "http://patches.dpdk.org/api/patches/73209/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200706082502.26935-11-somnath.kotur@broadcom.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": "<20200706082502.26935-11-somnath.kotur@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200706082502.26935-11-somnath.kotur@broadcom.com", "date": "2020-07-06T08:24:52", "name": "[10/20] net/bnxt: remove vnic and vport act bits from template matching", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6beb384bc80ab4bc786619db4bdbdcb39601b524", "submitter": { "id": 908, "url": "http://patches.dpdk.org/api/people/908/?format=api", "name": "Somnath Kotur", "email": "somnath.kotur@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200706082502.26935-11-somnath.kotur@broadcom.com/mbox/", "series": [ { "id": 10805, "url": "http://patches.dpdk.org/api/series/10805/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10805", "date": "2020-07-06T08:24:42", "name": "bnxt patches", "version": 1, "mbox": "http://patches.dpdk.org/series/10805/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/73209/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/73209/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 A712EA00C5;\n\tMon, 6 Jul 2020 10:32:26 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D6B9B1DAC2;\n\tMon, 6 Jul 2020 10:30:21 +0200 (CEST)", "from relay.smtp.broadcom.com (relay.smtp.broadcom.com\n [192.19.211.62]) by dpdk.org (Postfix) with ESMTP id 242961D594\n for <dev@dpdk.org>; Mon, 6 Jul 2020 10:30:06 +0200 (CEST)", "from dhcp-10-123-153-55.dhcp.broadcom.net\n (dhcp-10-123-153-55.dhcp.broadcom.net [10.123.153.55])\n by relay.smtp.broadcom.com (Postfix) with ESMTP id 57EEF2985AB;\n Mon, 6 Jul 2020 01:30:05 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com 57EEF2985AB", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1594024205;\n bh=J5eqMsD5f4C8KVkYP3Q9IeU1u16JfGPuVEkoweNb6iU=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=APJfRj7+Vq4R5A2gqzJX8L5ozScfXGrvv5paTovZmj23iXx8Qg8gdAgmj52ZA3Skr\n DPnHKdOZl/mnPIIpdJe9vwabpWDRYswb2Q6qGOgr8di9Pty9nYcBmpEW6Vijxk4hC4\n MyRMlL7/htt8HIdPsfcSDy3iMKo5AHbhK7R0S5Kk=", "From": "Somnath Kotur <somnath.kotur@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Mon, 6 Jul 2020 13:54:52 +0530", "Message-Id": "<20200706082502.26935-11-somnath.kotur@broadcom.com>", "X-Mailer": "git-send-email 2.10.1.613.g2cc2e70", "In-Reply-To": "<20200706082502.26935-1-somnath.kotur@broadcom.com>", "References": "<20200706082502.26935-1-somnath.kotur@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 10/20] net/bnxt: remove vnic and vport act bits\n\tfrom template matching", "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: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n\nRemoved the vnic and vport bitmaps from template matching. It\nis assumed that these will be populated implicitly and based\non the direction the appropriate action property shall be used.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Michael Baucom <michael.baucom@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_port_db.c | 27 ++++++-\n drivers/net/bnxt/tf_ulp/ulp_port_db.h | 15 ++++\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 133 ++++++++++++++++++++-----------\n 3 files changed, 127 insertions(+), 48 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c\nindex 659cefa..3c5a218 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c\n@@ -71,7 +71,7 @@ int32_t\tulp_port_db_init(struct bnxt_ulp_context *ulp_ctxt, uint8_t port_cnt)\n \t\t\t \"Failed to allocate mem for phy port list\\n\");\n \t\tgoto error_free;\n \t}\n-\n+\tport_db->phy_port_cnt = port_cnt;\n \treturn 0;\n \n error_free:\n@@ -436,3 +436,28 @@ ulp_port_db_vport_get(struct bnxt_ulp_context *ulp_ctxt,\n \t*vport = port_db->phy_port_list[phy_port_id].port_vport;\n \treturn 0;\n }\n+\n+/*\n+ * Api to get the vport for a given physical port.\n+ *\n+ * ulp_ctxt [in] Ptr to ulp context\n+ * phy_port [in] physical port index\n+ * out_port [out] the port of the given physical index\n+ *\n+ * Returns 0 on success or negative number on failure.\n+ */\n+int32_t\n+ulp_port_db_phy_port_vport_get(struct bnxt_ulp_context *ulp_ctxt,\n+\t\t\t uint32_t phy_port,\n+\t\t\t uint16_t *out_port)\n+{\n+\tstruct bnxt_ulp_port_db *port_db;\n+\n+\tport_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);\n+\tif (!port_db || phy_port >= port_db->phy_port_cnt) {\n+\t\tBNXT_TF_DBG(ERR, \"Invalid Arguments\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\t*out_port = port_db->phy_port_list[phy_port].port_vport;\n+\treturn 0;\n+}\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.h b/drivers/net/bnxt/tf_ulp/ulp_port_db.h\nindex b1419a3..e3870f9 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.h\n@@ -71,6 +71,7 @@ struct bnxt_ulp_port_db {\n \t/* dpdk device external port list */\n \tuint16_t\t\t\tdev_port_list[RTE_MAX_ETHPORTS];\n \tstruct ulp_phy_port_info\t*phy_port_list;\n+\tuint16_t\t\t\tphy_port_cnt;\n \tstruct ulp_func_if_info\t\tulp_func_id_tbl[BNXT_PORT_DB_MAX_FUNC];\n };\n \n@@ -203,4 +204,18 @@ int32_t\n ulp_port_db_vport_get(struct bnxt_ulp_context *ulp_ctxt,\n \t\t uint32_t ifindex,\tuint16_t *vport);\n \n+/*\n+ * Api to get the vport for a given physical port.\n+ *\n+ * ulp_ctxt [in] Ptr to ulp context\n+ * phy_port [in] physical port index\n+ * out_port [out] the port of the given physical index\n+ *\n+ * Returns 0 on success or negative number on failure.\n+ */\n+int32_t\n+ulp_port_db_phy_port_vport_get(struct bnxt_ulp_context *ulp_ctxt,\n+\t\t\t uint32_t phy_port,\n+\t\t\t uint16_t *out_port);\n+\n #endif /* _ULP_PORT_DB_H_ */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex 8d35429..b4bf431 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -238,8 +238,17 @@ ulp_rte_parser_vnic_process(struct ulp_rte_parser_params *params)\n \tstruct ulp_rte_act_bitmap *act = ¶ms->act_bitmap;\n \n \tif (ULP_BITMAP_ISSET(act->bits, BNXT_ULP_ACTION_BIT_VNIC) ||\n-\t ULP_BITMAP_ISSET(act->bits, BNXT_ULP_ACTION_BIT_VPORT))\n+\t ULP_BITMAP_ISSET(act->bits, BNXT_ULP_ACTION_BIT_VPORT)) {\n+\t\t/*\n+\t\t * Reset the vnic/vport action bitmaps\n+\t\t * it is not required for match\n+\t\t */\n+\t\tULP_BITMAP_RESET(params->act_bitmap.bits,\n+\t\t\t\t BNXT_ULP_ACTION_BIT_VNIC);\n+\t\tULP_BITMAP_RESET(params->act_bitmap.bits,\n+\t\t\t\t BNXT_ULP_ACTION_BIT_VPORT);\n \t\treturn BNXT_TF_RC_SUCCESS;\n+\t}\n \n \t/* Update the vnic details */\n \tulp_rte_pf_act_handler(NULL, params);\n@@ -1344,28 +1353,59 @@ ulp_rte_port_id_act_handler(const struct rte_flow_action *act_item,\n \t\t\t struct ulp_rte_parser_params *param)\n {\n \tconst struct rte_flow_action_port_id *port_id;\n+\tstruct ulp_rte_act_prop *act;\n \tuint32_t pid;\n+\tint32_t rc;\n+\tuint32_t ifindex;\n+\tuint16_t pid_s;\n \n \tport_id = act_item->conf;\n-\tif (port_id) {\n-\t\tif (port_id->original) {\n-\t\t\tBNXT_TF_DBG(ERR,\n-\t\t\t\t \"ParseErr:Portid Original not supported\\n\");\n-\t\t\treturn BNXT_TF_RC_PARSE_ERR;\n-\t\t}\n-\t\t/* Update the computed VNIC using port conversion */\n-\t\tif (port_id->id >= RTE_MAX_ETHPORTS) {\n-\t\t\tBNXT_TF_DBG(ERR,\n-\t\t\t\t \"ParseErr:Portid is not valid\\n\");\n-\t\t\treturn BNXT_TF_RC_PARSE_ERR;\n-\t\t}\n-\t\tpid = bnxt_get_vnic_id(port_id->id, BNXT_ULP_INTF_TYPE_INVALID);\n+\tif (!port_id) {\n+\t\tBNXT_TF_DBG(ERR,\n+\t\t\t \"ParseErr: Invalid Argument\\n\");\n+\t\treturn BNXT_TF_RC_PARSE_ERR;\n+\t}\n+\tif (port_id->original) {\n+\t\tBNXT_TF_DBG(ERR,\n+\t\t\t \"ParseErr:Portid Original not supported\\n\");\n+\t\treturn BNXT_TF_RC_PARSE_ERR;\n+\t}\n+\n+\t/* Get the port db ifindex */\n+\trc = ulp_port_db_dev_port_to_ulp_index(param->ulp_ctx,\n+\t\t\t\t\t port_id->id,\n+\t\t\t\t\t &ifindex);\n+\tif (rc) {\n+\t\tBNXT_TF_DBG(ERR, \"Invalid port id\\n\");\n+\t\treturn BNXT_TF_RC_ERROR;\n+\t}\n+\n+\tact = ¶m->act_prop;\n+\tif (param->dir == ULP_DIR_EGRESS) {\n+\t\trc = ulp_port_db_vport_get(param->ulp_ctx,\n+\t\t\t\t\t ifindex, &pid_s);\n+\t\tif (rc)\n+\t\t\treturn BNXT_TF_RC_ERROR;\n+\n+\t\tpid = pid_s;\n \t\tpid = rte_cpu_to_be_32(pid);\n-\t\tmemcpy(¶m->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n+\t\tmemcpy(&act->act_details[BNXT_ULP_ACT_PROP_IDX_VPORT],\n+\t\t &pid, BNXT_ULP_ACT_PROP_SZ_VPORT);\n+\t} else {\n+\t\trc = ulp_port_db_default_vnic_get(param->ulp_ctx,\n+\t\t\t\t\t\t ifindex,\n+\t\t\t\t\t\t BNXT_ULP_DRV_FUNC_VNIC,\n+\t\t\t\t\t\t &pid_s);\n+\t\tif (rc)\n+\t\t\treturn BNXT_TF_RC_ERROR;\n+\n+\t\tpid = pid_s;\n+\t\tpid = rte_cpu_to_be_32(pid);\n+\t\tmemcpy(&act->act_details[BNXT_ULP_ACT_PROP_IDX_VNIC],\n \t\t &pid, BNXT_ULP_ACT_PROP_SZ_VNIC);\n \t}\n \n-\t/* Update the hdr_bitmap with count */\n+\t/*Update the hdr_bitmap with vnic */\n \tULP_BITMAP_SET(param->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VNIC);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n@@ -1376,42 +1416,41 @@ ulp_rte_phy_port_act_handler(const struct rte_flow_action *action_item,\n \t\t\t struct ulp_rte_parser_params *prm)\n {\n \tconst struct rte_flow_action_phy_port *phy_port;\n-\tuint32_t vport;\n-\tstruct bnxt_ulp_device_params *dparms;\n-\tuint32_t dev_id;\n+\tuint32_t pid;\n+\tint32_t rc;\n+\tuint16_t pid_s;\n \n \tphy_port = action_item->conf;\n-\tif (phy_port) {\n-\t\tif (phy_port->original) {\n-\t\t\tBNXT_TF_DBG(ERR,\n-\t\t\t\t \"Parse Err:Port Original not supported\\n\");\n-\t\t\treturn BNXT_TF_RC_PARSE_ERR;\n-\t\t}\n-\t\tif (bnxt_ulp_cntxt_dev_id_get(prm->ulp_ctx, &dev_id)) {\n-\t\t\tBNXT_TF_DBG(DEBUG, \"Failed to get device id\\n\");\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tdparms = bnxt_ulp_device_params_get(dev_id);\n-\t\tif (!dparms) {\n-\t\t\tBNXT_TF_DBG(DEBUG, \"Failed to get device parms\\n\");\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\n-\t\tif (phy_port->index > dparms->num_phy_ports) {\n-\t\t\tBNXT_TF_DBG(ERR, \"ParseErr:Phy Port is not valid\\n\");\n-\t\t\treturn BNXT_TF_RC_PARSE_ERR;\n-\t\t}\n+\tif (!phy_port) {\n+\t\tBNXT_TF_DBG(ERR,\n+\t\t\t \"ParseErr: Invalid Argument\\n\");\n+\t\treturn BNXT_TF_RC_PARSE_ERR;\n+\t}\n \n-\t\t/* Get the vport of the physical port */\n-\t\t/* TBD: shall be changed later to portdb call */\n-\t\tvport = 1 << phy_port->index;\n-\t\tvport = rte_cpu_to_be_32(vport);\n-\t\tmemcpy(&prm->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VPORT],\n-\t\t &vport, BNXT_ULP_ACT_PROP_SZ_VPORT);\n+\tif (phy_port->original) {\n+\t\tBNXT_TF_DBG(ERR,\n+\t\t\t \"Parse Err:Port Original not supported\\n\");\n+\t\treturn BNXT_TF_RC_PARSE_ERR;\n+\t}\n+\tif (prm->dir != ULP_DIR_EGRESS) {\n+\t\tBNXT_TF_DBG(ERR,\n+\t\t\t \"Parse Err:Phy ports are valid only for egress\\n\");\n+\t\treturn BNXT_TF_RC_PARSE_ERR;\n+\t}\n+\t/* Get the physical port details from port db */\n+\trc = ulp_port_db_phy_port_vport_get(prm->ulp_ctx, phy_port->index,\n+\t\t\t\t\t &pid_s);\n+\tif (rc) {\n+\t\tBNXT_TF_DBG(DEBUG, \"Failed to get port details\\n\");\n+\t\treturn -EINVAL;\n \t}\n \n-\t/* Update the hdr_bitmap with count */\n+\tpid = pid_s;\n+\tpid = rte_cpu_to_be_32(pid);\n+\tmemcpy(&prm->act_prop.act_details[BNXT_ULP_ACT_PROP_IDX_VPORT],\n+\t &pid, BNXT_ULP_ACT_PROP_SZ_VPORT);\n+\n+\t/* update the hdr_bitmap with vport */\n \tULP_BITMAP_SET(prm->act_bitmap.bits, BNXT_ULP_ACTION_BIT_VPORT);\n \treturn BNXT_TF_RC_SUCCESS;\n }\n", "prefixes": [ "10/20" ] }