Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77285/?format=api
{ "id": 77285, "url": "http://patches.dpdk.org/api/patches/77285/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911015603.88359-24-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-24-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911015603.88359-24-ajit.khaparde@broadcom.com", "date": "2020-09-11T01:56:01", "name": "[23/25] net/bnxt: add support for locks in flow database", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ad48b9f975ac42b0c8ffe24314ee3ea197492483", "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-24-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/77285/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77285/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 84D12A04B5;\n\tFri, 11 Sep 2020 04:00:16 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 555D01C1D5;\n\tFri, 11 Sep 2020 03:57:44 +0200 (CEST)", "from mail-pj1-f99.google.com (mail-pj1-f99.google.com\n [209.85.216.99]) by dpdk.org (Postfix) with ESMTP id A5EFA1C0CF\n for <dev@dpdk.org>; Fri, 11 Sep 2020 03:57:42 +0200 (CEST)", "by mail-pj1-f99.google.com with SMTP id o16so943222pjr.2\n for <dev@dpdk.org>; Thu, 10 Sep 2020 18:57:42 -0700 (PDT)", "from localhost.localdomain ([192.19.223.252])\n by smtp-relay.gmail.com with ESMTPS id cl6sm80986pjb.15.2020.09.10.18.57.39\n (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);\n Thu, 10 Sep 2020 18:57:41 -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=cnL0zcDjeGUp+hjKnxF8lHYM2BBiAreSTA3YZ/iUp4I=;\n b=U6NszTXo117L16FUAq+2kD30XtaoWeyL11FhMJX2DPd4XUvDY9U6z/WK0SWebtQvOh\n c1gWNoHj+Q27PEXkc83RplVkD5p1DdnU1kVmiv7kTdqhEBzs2pHK46WvLXf9L0bKqJNc\n 9DAeyjx1YcCCHg4egKKhUoK6qiecG4rE0/weE=", "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=cnL0zcDjeGUp+hjKnxF8lHYM2BBiAreSTA3YZ/iUp4I=;\n b=Zcot+B8Cb7X0C6SAWvwjpsuEFAcsAlo+8cdv+XcS8rUrOR/TpuFCCulDq1boeTal6d\n /JSs0nB2M0j0Cp2TxHCW5sAF5mz9fqNcD1zXg5v6Dlej0ZDDHItIOnhrFesADXBWLv37\n +G9OOWiQVokhZFmxEnKh66av7Jn2cQhGWPlMj3ov9jyxAwBhEP+A8Opj+dgwnqL7a7ft\n Jwd9j2oc5/su85zIZSCeMBkmrpzWuMZVrj1+Wu2He6Bi85Yg94sXRvEGJFTOr7Bfk8BE\n I8n4LGqkLTxWDyD2QImZX9u5LFY6eNto/V0+PFrSYW03yVpdCjZCvgBi8NSHhk8Jr9+N\n AT6w==", "X-Gm-Message-State": "AOAM530jMNNJKKs30swWwrUflvoSBCxc10htQBdkzzTZEKlZiorgq6/Q\n uK5ojiki0EsB+Ha9js1czsBz/fuFteHc2KpavChtFsi4dSLp4W3T1b3nkVg9UIVttVx/9VaekmZ\n d9cdgcwclmfN1noskNY7jEKAdDZ/bDbz4bKb3WpLFLx8ncZ9E0O3N9oVYg3l081Cj7w4cqfGxVD\n dBZA==", "X-Google-Smtp-Source": "\n ABdhPJwr71WsCx0NSunBypL0xTGMr8NHXWqrhGRM/6pJgZbgGVDrUmX9UpiRWMwDSUvadTx3FvyiD8DmwPXe", "X-Received": "by 2002:a17:90a:2e03:: with SMTP id q3mr42424pjd.61.1599789461705;\n Thu, 10 Sep 2020 18:57:41 -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 Mike Baucom <michael.baucom@broadcom.com>,\n Shahaji Bhosle <sbhosle@broadcom.com>", "Date": "Thu, 10 Sep 2020 18:56:01 -0700", "Message-Id": "<20200911015603.88359-24-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 23/25] net/bnxt: add support for locks in flow\n\tdatabase", "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\nAdded support for mutex protection for the flow database to prevent\nsimultaneous access to flow database and protect flow creation and\ndeletion.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nReviewed-by: Mike Baucom <michael.baucom@broadcom.com>\nReviewed-by: Shahaji Bhosle <sbhosle@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 33 +++++++++++++++++++++++++++\n drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 7 ++++++\n drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 13 ++++++++++-\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 20 +++++++++++++++-\n 4 files changed, 71 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex 364853a6e..e8927f629 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -727,6 +727,9 @@ bnxt_ulp_deinit(struct bnxt *bp,\n \t\t\t\t\t TF_TUNNEL_ENCAP_NAT,\n \t\t\t\t\t BNXT_ULP_NAT_OUTER_MOST_FLAGS, 0);\n \n+\t/* free the flow db lock */\n+\tpthread_mutex_destroy(&bp->ulp_ctx->cfg_data->flow_db_lock);\n+\n \t/* Delete the ulp context and tf session and free the ulp context */\n \tulp_ctx_deinit(bp, session);\n \tBNXT_TF_DBG(DEBUG, \"ulp ctx has been deinitialized\\n\");\n@@ -750,6 +753,12 @@ bnxt_ulp_init(struct bnxt *bp,\n \t\tgoto jump_to_error;\n \t}\n \n+\trc = pthread_mutex_init(&bp->ulp_ctx->cfg_data->flow_db_lock, NULL);\n+\tif (rc) {\n+\t\tBNXT_TF_DBG(ERR, \"Unable to initialize flow db lock\\n\");\n+\t\tgoto jump_to_error;\n+\t}\n+\n \t/* Initialize ulp dparms with values devargs passed */\n \trc = ulp_dparms_init(bp, bp->ulp_ctx);\n \tif (rc) {\n@@ -1235,3 +1244,27 @@ bnxt_ulp_cntxt_ptr2_ulp_vfr_info_get(struct bnxt_ulp_context *ulp_ctx,\n \n \treturn &ulp_ctx->cfg_data->vfr_rule_info[port_id];\n }\n+\n+/* Function to acquire the flow database lock from the ulp context. */\n+int32_t\n+bnxt_ulp_cntxt_acquire_fdb_lock(struct bnxt_ulp_context\t*ulp_ctx)\n+{\n+\tif (!ulp_ctx || !ulp_ctx->cfg_data)\n+\t\treturn -1;\n+\n+\tif (pthread_mutex_lock(&ulp_ctx->cfg_data->flow_db_lock)) {\n+\t\tBNXT_TF_DBG(ERR, \"unable to acquire fdb lock\\n\");\n+\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* Function to release the flow database lock from the ulp context. */\n+void\n+bnxt_ulp_cntxt_release_fdb_lock(struct bnxt_ulp_context\t*ulp_ctx)\n+{\n+\tif (!ulp_ctx || !ulp_ctx->cfg_data)\n+\t\treturn;\n+\n+\tpthread_mutex_unlock(&ulp_ctx->cfg_data->flow_db_lock);\n+}\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\nindex ed978734a..36405ae1e 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n@@ -47,6 +47,7 @@ struct bnxt_ulp_data {\n \tuint32_t\t\t\tdev_id; /* Hardware device id */\n \tuint32_t\t\t\tref_cnt;\n \tstruct bnxt_ulp_flow_db\t\t*flow_db;\n+\tpthread_mutex_t\t\t\tflow_db_lock;\n \tvoid\t\t\t\t*mapper_data;\n \tstruct bnxt_ulp_port_db\t\t*port_db;\n \tstruct bnxt_ulp_fc_info\t\t*fc_info;\n@@ -196,4 +197,10 @@ struct bnxt_ulp_vfr_rule_info*\n bnxt_ulp_cntxt_ptr2_ulp_vfr_info_get(struct bnxt_ulp_context *ulp_ctx,\n \t\t\t\t uint32_t port_id);\n \n+int32_t\n+bnxt_ulp_cntxt_acquire_fdb_lock(struct bnxt_ulp_context\t*ulp_ctx);\n+\n+void\n+bnxt_ulp_cntxt_release_fdb_lock(struct bnxt_ulp_context\t*ulp_ctx);\n+\n #endif /* _BNXT_ULP_H_ */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\nindex cbdf5df68..9a2d3758d 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\n@@ -793,10 +793,17 @@ int32_t\tulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx,\n \t\tBNXT_TF_DBG(ERR, \"Flow database not found\\n\");\n \t\treturn -EINVAL;\n \t}\n+\tif (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) {\n+\t\tBNXT_TF_DBG(ERR, \"Flow db lock acquire failed\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \tflow_tbl = &flow_db->flow_tbl[idx];\n \twhile (!ulp_flow_db_next_entry_get(flow_tbl, &fid))\n \t\tulp_mapper_resources_free(ulp_ctx, fid, idx);\n \n+\tbnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);\n+\n \treturn 0;\n }\n \n@@ -826,13 +833,17 @@ ulp_flow_db_function_flow_flush(struct bnxt_ulp_context *ulp_ctx,\n \t\tBNXT_TF_DBG(ERR, \"Flow database not found\\n\");\n \t\treturn -EINVAL;\n \t}\n+\tif (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) {\n+\t\tBNXT_TF_DBG(ERR, \"Flow db lock acquire failed\\n\");\n+\t\treturn -EINVAL;\n+\t}\n \tflow_tbl = &flow_db->flow_tbl[BNXT_ULP_REGULAR_FLOW_TABLE];\n \twhile (!ulp_flow_db_next_entry_get(flow_tbl, &flow_id)) {\n \t\tif (flow_db->func_id_tbl[flow_id] == func_id)\n \t\t\tulp_mapper_resources_free(ulp_ctx, flow_id,\n \t\t\t\t\t\t BNXT_ULP_REGULAR_FLOW_TABLE);\n \t}\n-\n+\tbnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);\n \treturn 0;\n }\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 732141166..85ae3b5c4 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -2668,12 +2668,21 @@ int32_t\n ulp_mapper_flow_destroy(struct bnxt_ulp_context\t*ulp_ctx, uint32_t fid,\n \t\t\tenum bnxt_ulp_flow_db_tables flow_tbl_type)\n {\n+\tint32_t rc;\n+\n \tif (!ulp_ctx) {\n \t\tBNXT_TF_DBG(ERR, \"Invalid parms, unable to free flow\\n\");\n \t\treturn -EINVAL;\n \t}\n+\tif (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) {\n+\t\tBNXT_TF_DBG(ERR, \"Flow db lock acquire failed\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\trc = ulp_mapper_resources_free(ulp_ctx, fid, flow_tbl_type);\n+\tbnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);\n+\treturn rc;\n \n-\treturn ulp_mapper_resources_free(ulp_ctx, fid, flow_tbl_type);\n }\n \n /* Function to handle the default global templates that are allocated during\n@@ -2838,6 +2847,12 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,\n \t\treturn -EINVAL;\n \t}\n \n+\t/* Protect flow creation */\n+\tif (bnxt_ulp_cntxt_acquire_fdb_lock(ulp_ctx)) {\n+\t\tBNXT_TF_DBG(ERR, \"Flow db lock acquire failed\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \t/* Allocate a Flow ID for attaching all resources for the flow to.\n \t * Once allocated, all errors have to walk the list of resources and\n \t * free each of them.\n@@ -2848,6 +2863,7 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,\n \t\t\t\t &parms.fid);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Unable to allocate flow table entry\\n\");\n+\t\tbnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);\n \t\treturn rc;\n \t}\n \n@@ -2871,10 +2887,12 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,\n \t}\n \n \t*flowid = parms.fid;\n+\tbnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);\n \n \treturn rc;\n \n flow_error:\n+\tbnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);\n \t/* Free all resources that were allocated during flow creation */\n \ttrc = ulp_mapper_flow_destroy(ulp_ctx, parms.fid,\n \t\t\t\t BNXT_ULP_REGULAR_FLOW_TABLE);\n", "prefixes": [ "23/25" ] }