Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58438/?format=api
{ "id": 58438, "url": "https://patches.dpdk.org/api/patches/58438/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190903021901.25895-17-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": "<20190903021901.25895-17-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190903021901.25895-17-ajit.khaparde@broadcom.com", "date": "2019-09-03T02:19:00", "name": "[16/17] net/bnxt: synchronize between flow related functions", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "86bdb8a9b45d6f71853456339cb85669a7a90436", "submitter": { "id": 501, "url": "https://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190903021901.25895-17-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 6209, "url": "https://patches.dpdk.org/api/series/6209/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6209", "date": "2019-09-03T02:18:44", "name": "bnxt patchset to improve rte flow support", "version": 1, "mbox": "https://patches.dpdk.org/series/6209/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/58438/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/58438/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 441E51EB58;\n\tTue, 3 Sep 2019 04:19:40 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com\n\t[192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 29CB11E96E\n\tfor <dev@dpdk.org>; Tue, 3 Sep 2019 04:19:10 +0200 (CEST)", "from nis-sj1-27.broadcom.com (nis-sj1-27.lvn.broadcom.net\n\t[10.75.144.136])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id F17E830C201;\n\tMon, 2 Sep 2019 19:19:02 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.30.225])\n\tby nis-sj1-27.broadcom.com (Postfix) with ESMTP id 5CC56AC078A;\n\tMon, 2 Sep 2019 19:19:09 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com F17E830C201", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1567477143;\n\tbh=yBalHPcK9/YcWl+lxtRn849ukz03IEAkUePR9uGsAwI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=doIaxb36jf1eNatYFpMa3cIWXmHoIGPJrp1exN2xy7J7REqtTtVbdPpFdd1LiUPO2\n\taW3m9IZGY3tk7/f75C+vwdJqxbaXCcwiBqMd63AMvDkoKDibdXwVlV9WWg4e9N9inn\n\t8VgdElhBnw2vAk1kSpcfxzzqAz2NsPmjVv9tVNE4=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,\n\tKalesh Anakkur Purayil <kalesh-anakkur.purayil@broadcom.com>", "Date": "Mon, 2 Sep 2019 19:19:00 -0700", "Message-Id": "<20190903021901.25895-17-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.20.1 (Apple Git-117)", "In-Reply-To": "<20190903021901.25895-1-ajit.khaparde@broadcom.com>", "References": "<20190903021901.25895-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 16/17] net/bnxt: synchronize between flow related\n\tfunctions", "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": "From: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\n\nCurrently, there are four flow related functions, namely\nbnxt_flow_create, bnxt_flow_destroy, bnxt_flow_validate,\nbnxt_flow_flush. All these functions are not multi-thread safe.\n\nThis patch fixes it by synchronizing these functions with a lock.\n\nReviewed-by: Kalesh Anakkur Purayil <kalesh-anakkur.purayil@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 6 +++++\n drivers/net/bnxt/bnxt_ethdev.c | 23 ++++++++++++++++\n drivers/net/bnxt/bnxt_flow.c | 49 +++++++++++++++++++++++++++-------\n 3 files changed, 69 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 64cc06304..773227048 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -462,6 +462,7 @@ struct bnxt {\n \tuint32_t\t\tflow_flags;\n #define BNXT_FLOW_FLAG_L2_HDR_SRC_FILTER_EN\tBIT(0)\n \n+\tpthread_mutex_t flow_lock;\n \tunsigned int\t\trx_nr_rings;\n \tunsigned int\t\trx_cp_nr_rings;\n \tunsigned int\t\trx_num_qs_per_vnic;\n@@ -571,6 +572,11 @@ void bnxt_schedule_fw_health_check(struct bnxt *bp);\n bool is_bnxt_supported(struct rte_eth_dev *dev);\n bool bnxt_stratus_device(struct bnxt *bp);\n extern const struct rte_flow_ops bnxt_flow_ops;\n+#define bnxt_acquire_flow_lock(bp) \\\n+\tpthread_mutex_lock(&(bp)->flow_lock)\n+\n+#define bnxt_release_flow_lock(bp) \\\n+\tpthread_mutex_unlock(&(bp)->flow_lock)\n \n extern int bnxt_logtype_driver;\n #define PMD_DRV_LOG_RAW(level, fmt, args...) \\\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 5ef2ee0c4..f5cbc0038 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -4297,6 +4297,17 @@ static int bnxt_init_fw(struct bnxt *bp)\n \treturn 0;\n }\n \n+static int\n+bnxt_init_locks(struct bnxt *bp)\n+{\n+\tint err;\n+\n+\terr = pthread_mutex_init(&bp->flow_lock, NULL);\n+\tif (err)\n+\t\tPMD_DRV_LOG(ERR, \"Unable to initialize flow_lock\\n\");\n+\treturn err;\n+}\n+\n static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)\n {\n \tint rc;\n@@ -4350,6 +4361,10 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)\n \tif (rc)\n \t\treturn rc;\n \n+\trc = bnxt_init_locks(bp);\n+\tif (rc)\n+\t\treturn rc;\n+\n \treturn 0;\n }\n \n@@ -4430,6 +4445,12 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)\n \treturn rc;\n }\n \n+static void\n+bnxt_uninit_locks(struct bnxt *bp)\n+{\n+\tpthread_mutex_destroy(&bp->flow_lock);\n+}\n+\n static int\n bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)\n {\n@@ -4451,6 +4472,8 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)\n \t\tbp->recovery_info = NULL;\n \t}\n \n+\tbnxt_uninit_locks(bp);\n+\n \treturn rc;\n }\n \ndiff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c\nindex 8156b5b4b..d640a923a 100644\n--- a/drivers/net/bnxt/bnxt_flow.c\n+++ b/drivers/net/bnxt/bnxt_flow.c\n@@ -1385,13 +1385,17 @@ bnxt_flow_validate(struct rte_eth_dev *dev,\n \tstruct bnxt_filter_info *filter;\n \tint ret = 0;\n \n+\tbnxt_acquire_flow_lock(bp);\n \tret = bnxt_flow_args_validate(attr, pattern, actions, error);\n-\tif (ret != 0)\n+\tif (ret != 0) {\n+\t\tbnxt_release_flow_lock(bp);\n \t\treturn ret;\n+\t}\n \n \tfilter = bnxt_get_unused_filter(bp);\n \tif (filter == NULL) {\n \t\tPMD_DRV_LOG(ERR, \"Not enough resources for a new flow.\\n\");\n+\t\tbnxt_release_flow_lock(bp);\n \t\treturn -ENOMEM;\n \t}\n \n@@ -1423,6 +1427,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev,\n \t/* No need to hold on to this filter if we are just validating flow */\n \tfilter->fw_l2_filter_id = UINT64_MAX;\n \tbnxt_free_filter(bp, filter);\n+\tbnxt_release_flow_lock(bp);\n \n \treturn ret;\n }\n@@ -1535,6 +1540,7 @@ bnxt_flow_create(struct rte_eth_dev *dev,\n \t\treturn flow;\n \t}\n \n+\tbnxt_acquire_flow_lock(bp);\n \tret = bnxt_flow_args_validate(attr, pattern, actions, error);\n \tif (ret != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Not a validate flow.\\n\");\n@@ -1630,6 +1636,7 @@ bnxt_flow_create(struct rte_eth_dev *dev,\n \t\tSTAILQ_INSERT_TAIL(&vnic->filter, filter, next);\n \t\tPMD_DRV_LOG(ERR, \"Successfully created flow.\\n\");\n \t\tSTAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);\n+\t\tbnxt_release_flow_lock(bp);\n \t\treturn flow;\n \t}\n \n@@ -1650,6 +1657,7 @@ bnxt_flow_create(struct rte_eth_dev *dev,\n \t\t\t\t \"Failed to create flow.\");\n \trte_free(flow);\n \tflow = NULL;\n+\tbnxt_release_flow_lock(bp);\n \treturn flow;\n }\n \n@@ -1700,13 +1708,28 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,\n \t\t struct rte_flow_error *error)\n {\n \tstruct bnxt *bp = dev->data->dev_private;\n-\tstruct bnxt_filter_info *filter = flow->filter;\n-\tstruct bnxt_vnic_info *vnic = flow->vnic;\n+\tstruct bnxt_filter_info *filter;\n+\tstruct bnxt_vnic_info *vnic;\n \tint ret = 0;\n \n+\tbnxt_acquire_flow_lock(bp);\n+\tif (!flow) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\t \"Invalid flow: failed to destroy flow.\");\n+\t\tbnxt_release_flow_lock(bp);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfilter = flow->filter;\n+\tvnic = flow->vnic;\n+\n \tif (!filter) {\n-\t\tret = -EINVAL;\n-\t\tgoto done;\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\t \"Invalid flow: failed to destroy flow.\");\n+\t\tbnxt_release_flow_lock(bp);\n+\t\treturn -EINVAL;\n \t}\n \n \tif (filter->filter_type == HWRM_CFA_TUNNEL_REDIRECT_FILTER &&\n@@ -1714,10 +1737,12 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,\n \t\tret = bnxt_handle_tunnel_redirect_destroy(bp,\n \t\t\t\t\t\t\t filter,\n \t\t\t\t\t\t\t error);\n-\t\tif (!ret)\n+\t\tif (!ret) {\n \t\t\tgoto done;\n-\t\telse\n+\t\t} else {\n+\t\t\tbnxt_release_flow_lock(bp);\n \t\t\treturn ret;\n+\t\t}\n \t}\n \n \tret = bnxt_match_filter(bp, filter);\n@@ -1756,6 +1781,7 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,\n \t\t\t\t \"Failed to destroy flow.\");\n \t}\n \n+\tbnxt_release_flow_lock(bp);\n \treturn ret;\n }\n \n@@ -1769,6 +1795,7 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\n \tunsigned int i;\n \tint ret = 0;\n \n+\tbnxt_acquire_flow_lock(bp);\n \tfor (i = 0; i < bp->max_vnics; i++) {\n \t\tvnic = &bp->vnic_info[i];\n \t\tif (vnic && vnic->fw_vnic_id == INVALID_VNIC_ID)\n@@ -1785,10 +1812,12 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\n \t\t\t\tbnxt_handle_tunnel_redirect_destroy(bp,\n \t\t\t\t\t\t\t\t filter,\n \t\t\t\t\t\t\t\t error);\n-\t\t\t\tif (!ret)\n+\t\t\t\tif (!ret) {\n \t\t\t\t\tgoto done;\n-\t\t\t\telse\n+\t\t\t\t} else {\n+\t\t\t\t\tbnxt_release_flow_lock(bp);\n \t\t\t\t\treturn ret;\n+\t\t\t\t}\n \t\t\t}\n \n \t\t\tif (filter->filter_type == HWRM_CFA_EM_FILTER)\n@@ -1805,6 +1834,7 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE,\n \t\t\t\t\t NULL,\n \t\t\t\t\t \"Failed to flush flow in HW.\");\n+\t\t\t\tbnxt_release_flow_lock(bp);\n \t\t\t\treturn -rte_errno;\n \t\t\t}\n done:\n@@ -1833,6 +1863,7 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\n \t\t}\n \t}\n \n+\tbnxt_release_flow_lock(bp);\n \treturn ret;\n }\n \n", "prefixes": [ "16/17" ] }