Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77271/?format=api
{ "id": 77271, "url": "http://patches.dpdk.org/api/patches/77271/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911015603.88359-10-ajit.khaparde@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": "<20200911015603.88359-10-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911015603.88359-10-ajit.khaparde@broadcom.com", "date": "2020-09-11T01:55:47", "name": "[09/25] net/bnxt: fix the function id used in the flow flush", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "faa9265a4a5a6383478bf0e8a5de4c45e0075bb8", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@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/20200911015603.88359-10-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 12116, "url": "http://patches.dpdk.org/api/series/12116/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12116", "date": "2020-09-11T01:55:38", "name": "patchset for bnxt", "version": 1, "mbox": "http://patches.dpdk.org/series/12116/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77271/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77271/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 63D26A04B5;\n\tFri, 11 Sep 2020 03:57:58 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C5E261C131;\n\tFri, 11 Sep 2020 03:56:53 +0200 (CEST)", "from mail-pj1-f98.google.com (mail-pj1-f98.google.com\n [209.85.216.98]) by dpdk.org (Postfix) with ESMTP id 0E5311C12D\n for <dev@dpdk.org>; Fri, 11 Sep 2020 03:56:52 +0200 (CEST)", "by mail-pj1-f98.google.com with SMTP id u3so933695pjr.3\n for <dev@dpdk.org>; Thu, 10 Sep 2020 18:56:51 -0700 (PDT)", "from localhost.localdomain ([192.19.223.252])\n by smtp-relay.gmail.com with ESMTPS id cl6sm80986pjb.15.2020.09.10.18.56.48\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Thu, 10 Sep 2020 18:56:51 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=UVNFQ6Zf59VORwTZH6a2SgFt4C8M2WuktHxty5wkAPA=;\n b=Tt6O7OIRFOJ+qnodXOOwnA0rOt1eO9dTcxiU+oKR15Hdke+bG6Gsdh9b7Q1MRE+VKa\n pV1PyEpR7p2BgmkflvpE7Fe0+3l8oxSQ3THOH3J/aJ/HDSh2bywT9kBR0CsaG1yhIy2+\n FSYG3POKq4kfEKzHV6KInCQWaWip6bonWT1Ws=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=UVNFQ6Zf59VORwTZH6a2SgFt4C8M2WuktHxty5wkAPA=;\n b=g0mFXX6e31XJAhmJqK0rkNEVwtarGkhptGalTsedYS74xAloOVWTYkZ8sl17rAhzXP\n fUrEELQm5vzulo0CLQQuxt+nNOV6FQhas0u6D1QnimtjZOjjqP/Qu+jBEIH1TAxQVqxK\n AhaWfgdnPTgjGUJ4lwECm5wRsKqfioWzMXb3KeHSsF7M8kcmBKlASgyc0A6Dn9v1Yy33\n 0KuWiaGcsns8/h+53WiRQ8NpldKOlQWqepi/v+QdnBMiRi1qJ28XitTGcRqFeuimuixG\n 4oYnfQxFC8ScDQgtAwZjV55AAjYpCwjynPU9vwEE/2YHjouOClzdNkTbv0X0keiXmqC5\n brPA==", "X-Gm-Message-State": "AOAM532vF9DCp34TfEbGZkmQ2866O1n9ddOra+BfjcwW8V52EHBVPrvv\n oUsUa7j3F+2j9o6Ic/AC0QOi/fWDPvi9JWF6YI5Z7ZufHZ7igJXehAKoenVg+Mxzb0Hjq46Fpwh\n 3tYGg3T9OeBOJ0+QgrzAX/RbDg6bQE5PFFrwb9cRNbpibflqGMBSTALAjN1RMlEEuCJrhoe5mlm\n mXCg==", "X-Google-Smtp-Source": "\n ABdhPJyzr4d+mujV9mDCFZIuRyQWF14k6B1FyATXo8Fo5UV8qhXHwiT2N9+R/Z97F/ZZ9JqUi2Icpa8U0s9I", "X-Received": "by 2002:a17:90b:3014:: with SMTP id\n hg20mr66105pjb.128.1599789411112;\n Thu, 10 Sep 2020 18:56:51 -0700 (PDT)", "X-Relaying-Domain": "broadcom.com", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Shahaji Bhosle <sbhosle@broadcom.com>", "Date": "Thu, 10 Sep 2020 18:55:47 -0700", "Message-Id": "<20200911015603.88359-10-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.1 (Apple Git-122.3)", "In-Reply-To": "<20200911015603.88359-1-ajit.khaparde@broadcom.com>", "References": "<20200911015603.88359-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 09/25] net/bnxt: fix the function id used in the\n\tflow flush", "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\nThe function id being used in the flush is incorrect, fixed the\nflush of the flows.\n\nFixes: 74bcfc062489 (\"net/bnxt: add session and function flow flush\")\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Shahaji Bhosle <sbhosle@broadcom.com>\n---\n drivers/net/bnxt/bnxt_ethdev.c | 1 +\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 19 +++++++-----\n drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 5 +--\n drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 39 ++++++++++++++++-------\n drivers/net/bnxt/tf_ulp/ulp_port_db.c | 41 +++++++++++++++++++++++++\n drivers/net/bnxt/tf_ulp/ulp_port_db.h | 13 ++++++++\n 6 files changed, 95 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex fdbd6ce58..bc9aeba08 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -3708,6 +3708,7 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev,\n \tif (BNXT_ETH_DEV_IS_REPRESENTOR(dev)) {\n \t\tstruct bnxt_vf_representor *vfr = dev->data->dev_private;\n \t\tbp = vfr->parent_dev->data->dev_private;\n+\t\t/* parent is deleted while children are still valid */\n \t\tif (!bp)\n \t\t\treturn -EIO;\n \t}\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex bd6039d2a..63d453ffb 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -35,14 +35,12 @@ static pthread_mutex_t bnxt_ulp_global_mutex = PTHREAD_MUTEX_INITIALIZER;\n * created the session.\n */\n bool\n-ulp_ctx_deinit_allowed(void *ptr)\n+ulp_ctx_deinit_allowed(struct bnxt_ulp_context *ulp_ctx)\n {\n-\tstruct bnxt *bp = (struct bnxt *)ptr;\n-\n-\tif (!bp || !bp->ulp_ctx || !bp->ulp_ctx->cfg_data)\n+\tif (!ulp_ctx || !ulp_ctx->cfg_data)\n \t\treturn false;\n \n-\tif (!bp->ulp_ctx->cfg_data->ref_cnt) {\n+\tif (!ulp_ctx->cfg_data->ref_cnt) {\n \t\tBNXT_TF_DBG(DEBUG, \"ulp ctx shall initiate deinit\\n\");\n \t\treturn true;\n \t}\n@@ -629,9 +627,14 @@ bnxt_ulp_flush_port_flows(struct bnxt *bp)\n {\n \tuint16_t func_id;\n \n-\tfunc_id = bnxt_get_fw_func_id(bp->eth_dev->data->port_id,\n-\t\t\t\t BNXT_ULP_INTF_TYPE_INVALID);\n-\tulp_flow_db_function_flow_flush(bp->ulp_ctx, func_id);\n+\t/* it is assumed that port is either TVF or PF */\n+\tif (ulp_port_db_port_func_id_get(bp->ulp_ctx,\n+\t\t\t\t\t bp->eth_dev->data->port_id,\n+\t\t\t\t\t &func_id)) {\n+\t\tBNXT_TF_DBG(ERR, \"Invalid argument\\n\");\n+\t\treturn;\n+\t}\n+\t(void)ulp_flow_db_function_flow_flush(bp->ulp_ctx, func_id);\n }\n \n /* Internal function to delete the VFR default flows */\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\nindex 8a2825ae5..5882c545c 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n@@ -83,12 +83,9 @@ struct ulp_tlv_param {\n /*\n * Allow the deletion of context only for the bnxt device that\n * created the session\n- * TBD - The implementation of the function should change to\n- * using the reference count once tf_session_attach functionality\n- * is fixed.\n */\n bool\n-ulp_ctx_deinit_allowed(void *bp);\n+ulp_ctx_deinit_allowed(struct bnxt_ulp_context *ulp_ctx);\n \n /* Function to set the device id of the hardware. */\n int32_t\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\nindex 2ab00453a..566e1254a 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n@@ -10,6 +10,7 @@\n #include \"ulp_flow_db.h\"\n #include \"ulp_mapper.h\"\n #include \"ulp_fc_mgr.h\"\n+#include \"ulp_port_db.h\"\n #include <rte_malloc.h>\n \n static int32_t\n@@ -146,8 +147,14 @@ bnxt_ulp_flow_create(struct rte_eth_dev *dev,\n \tmapper_cparms.act_prop = ¶ms.act_prop;\n \tmapper_cparms.class_tid = class_id;\n \tmapper_cparms.act_tid = act_tmpl;\n-\tmapper_cparms.func_id = bnxt_get_fw_func_id(dev->data->port_id,\n-\t\t\t\t\t\t BNXT_ULP_INTF_TYPE_INVALID);\n+\n+\t/* Get the function id */\n+\tif (ulp_port_db_port_func_id_get(ulp_ctx,\n+\t\t\t\t\t dev->data->port_id,\n+\t\t\t\t\t &mapper_cparms.func_id)) {\n+\t\tBNXT_TF_DBG(ERR, \"conversion of port to func id failed\\n\");\n+\t\tgoto parse_error;\n+\t}\n \tmapper_cparms.dir_attr = params.dir_attr;\n \n \t/* Call the ulp mapper to create the flow in the hardware. */\n@@ -251,8 +258,17 @@ bnxt_ulp_flow_destroy(struct rte_eth_dev *dev,\n \t}\n \n \tflow_id = (uint32_t)(uintptr_t)flow;\n-\tfunc_id = bnxt_get_fw_func_id(dev->data->port_id,\n-\t\t\t\t BNXT_ULP_INTF_TYPE_INVALID);\n+\n+\tif (ulp_port_db_port_func_id_get(ulp_ctx,\n+\t\t\t\t\t dev->data->port_id,\n+\t\t\t\t\t &func_id)) {\n+\t\tBNXT_TF_DBG(ERR, \"conversion of port to func id failed\\n\");\n+\t\tif (error)\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\t\t \"Failed to destroy flow.\");\n+\t\treturn -EINVAL;\n+\t}\n \n \tif (ulp_flow_db_validate_flow_func(ulp_ctx, flow_id, func_id) ==\n \t false) {\n@@ -284,23 +300,24 @@ bnxt_ulp_flow_flush(struct rte_eth_dev *eth_dev,\n {\n \tstruct bnxt_ulp_context *ulp_ctx;\n \tint32_t ret = 0;\n-\tstruct bnxt *bp;\n \tuint16_t func_id;\n \n \tulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(eth_dev);\n \tif (!ulp_ctx) {\n-\t\tBNXT_TF_DBG(DEBUG, \"ULP context is not initialized\\n\");\n \t\treturn ret;\n \t}\n-\tbp = eth_dev->data->dev_private;\n \n \t/* Free the resources for the last device */\n-\tif (ulp_ctx_deinit_allowed(bp)) {\n+\tif (ulp_ctx_deinit_allowed(ulp_ctx)) {\n \t\tret = ulp_flow_db_session_flow_flush(ulp_ctx);\n \t} else if (bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctx)) {\n-\t\tfunc_id = bnxt_get_fw_func_id(eth_dev->data->port_id,\n-\t\t\t\t\t BNXT_ULP_INTF_TYPE_INVALID);\n-\t\tret = ulp_flow_db_function_flow_flush(ulp_ctx, func_id);\n+\t\tret = ulp_port_db_port_func_id_get(ulp_ctx,\n+\t\t\t\t\t\t eth_dev->data->port_id,\n+\t\t\t\t\t\t &func_id);\n+\t\tif (!ret)\n+\t\t\tret = ulp_flow_db_function_flow_flush(ulp_ctx, func_id);\n+\t\telse\n+\t\t\tBNXT_TF_DBG(ERR, \"convert port to func id failed\\n\");\n \t}\n \tif (ret)\n \t\trte_flow_error_set(error, ret,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c\nindex 30876478d..4b4eaeb12 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c\n@@ -540,3 +540,44 @@ ulp_port_db_dev_func_id_to_ulp_index(struct bnxt_ulp_context *ulp_ctxt,\n \t*ifindex = port_db->ulp_func_id_tbl[func_id].ifindex;\n \treturn 0;\n }\n+\n+/*\n+ * Api to get the function id for a given port id.\n+ *\n+ * ulp_ctxt [in] Ptr to ulp context\n+ * port_id [in] dpdk port id\n+ * func_id [out] the function id of the given ifindex.\n+ *\n+ * Returns 0 on success or negative number on failure.\n+ */\n+int32_t\n+ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt,\n+\t\t\t uint16_t port_id, uint16_t *func_id)\n+{\n+\tstruct bnxt_ulp_port_db *port_db;\n+\tuint32_t ifindex;\n+\n+\tport_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt);\n+\tif (!port_db || port_id >= RTE_MAX_ETHPORTS) {\n+\t\tBNXT_TF_DBG(ERR, \"Invalid Arguments\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\tifindex = port_db->dev_port_list[port_id];\n+\tif (!ifindex)\n+\t\treturn -ENOENT;\n+\n+\tswitch (port_db->ulp_intf_list[ifindex].type) {\n+\tcase BNXT_ULP_INTF_TYPE_TRUSTED_VF:\n+\tcase BNXT_ULP_INTF_TYPE_PF:\n+\t\t*func_id = port_db->ulp_intf_list[ifindex].drv_func_id;\n+\t\tbreak;\n+\tcase BNXT_ULP_INTF_TYPE_VF:\n+\tcase BNXT_ULP_INTF_TYPE_VF_REP:\n+\t\t*func_id = port_db->ulp_intf_list[ifindex].vf_func_id;\n+\t\tbreak;\n+\tdefault:\n+\t\t*func_id = 0;\n+\t\tbreak;\n+\t}\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 2b323d168..7b85987a0 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.h\n@@ -259,4 +259,17 @@ int32_t\n ulp_port_db_dev_func_id_to_ulp_index(struct bnxt_ulp_context *ulp_ctxt,\n \t\t\t\t uint32_t func_id, uint32_t *ifindex);\n \n+/*\n+ * Api to get the function id for a given port id.\n+ *\n+ * ulp_ctxt [in] Ptr to ulp context\n+ * port_id [in] dpdk port id\n+ * func_id [out] the function id of the given ifindex.\n+ *\n+ * Returns 0 on success or negative number on failure.\n+ */\n+int32_t\n+ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt,\n+\t\t\t uint16_t port_id, uint16_t *func_id);\n+\n #endif /* _ULP_PORT_DB_H_ */\n", "prefixes": [ "09/25" ] }