Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/88462/?format=api
{ "id": 88462, "url": "https://patches.dpdk.org/api/patches/88462/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210304090728.26166-4-kalesh-anakkur.purayil@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": "<20210304090728.26166-4-kalesh-anakkur.purayil@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210304090728.26166-4-kalesh-anakkur.purayil@broadcom.com", "date": "2021-03-04T09:07:28", "name": "[3/3] net/bnxt: fix VF info allocation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7ebb2af913bf77416365cff154fe097fd2c67c72", "submitter": { "id": 1479, "url": "https://patches.dpdk.org/api/people/1479/?format=api", "name": "Kalesh A P", "email": "kalesh-anakkur.purayil@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/20210304090728.26166-4-kalesh-anakkur.purayil@broadcom.com/mbox/", "series": [ { "id": 15488, "url": "https://patches.dpdk.org/api/series/15488/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=15488", "date": "2021-03-04T09:07:25", "name": "bnxt fixes", "version": 1, "mbox": "https://patches.dpdk.org/series/15488/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/88462/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/88462/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 386BEA0561;\n\tThu, 4 Mar 2021 09:45:34 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D730722A2D9;\n\tThu, 4 Mar 2021 09:45:17 +0100 (CET)", "from relay.smtp-ext.broadcom.com (lpdvacalvio01.broadcom.com\n [192.19.229.182])\n by mails.dpdk.org (Postfix) with ESMTP id 2932522A2D5\n for <dev@dpdk.org>; Thu, 4 Mar 2021 09:45:16 +0100 (CET)", "from dhcp-10-123-153-22.dhcp.broadcom.net\n (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22])\n by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 6E3F889A8;\n Thu, 4 Mar 2021 00:45:14 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 6E3F889A8", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1614847515;\n bh=pTbFTxg3rb+dA9AeUqvbtvTTrly1/hN0k5hTxkJbE3g=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=EnynPxGJvfOXZcfGvka2rdh5VaXjuXX/ArQhxEebMLhLVgbqyu0S1HyOfAub7/kzQ\n 7w26jdpO8YqIsRn8rOFgue+Ct1TBMvPOQOYV6QXlkoq6iavaq/zurtSECFFex2aGXF\n kaK4KGvqu1Gv/4w9bfTwLLZ1Z6xvyOmGTp32T194=", "From": "Kalesh A P <kalesh-anakkur.purayil@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tajit.khaparde@broadcom.com", "Date": "Thu, 4 Mar 2021 14:37:28 +0530", "Message-Id": "<20210304090728.26166-4-kalesh-anakkur.purayil@broadcom.com>", "X-Mailer": "git-send-email 2.10.1", "In-Reply-To": "<20210304090728.26166-1-kalesh-anakkur.purayil@broadcom.com>", "References": "<20210304090728.26166-1-kalesh-anakkur.purayil@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 3/3] net/bnxt: fix VF info allocation", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\n\n1. Renamed bnxt_hwrm_alloc_vf_info()/bnxt_hwrm_free_vf_info to\n bnxt_alloc_vf_info()/bnxt_free_vf_info as it does not\n issue any HWRM command to fw.\n2. Fix missing unlock when memory allocation fails.\n\nFixes: b7778e8a1c00 (\"net/bnxt: refactor to properly allocate resources for PF/VF\")\nCc: stable@dpdk.org\n\nSigned-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_ethdev.c | 2 +-\n drivers/net/bnxt/bnxt_hwrm.c | 94 ++++++++++++++++++++++++------------------\n drivers/net/bnxt/bnxt_hwrm.h | 2 +-\n 3 files changed, 57 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex c55a2d8..3898849 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -1557,7 +1557,7 @@ static void bnxt_drv_uninit(struct bnxt *bp)\n \trte_memzone_free((const struct rte_memzone *)bp->rx_mem_zone);\n \tbp->rx_mem_zone = NULL;\n \n-\tbnxt_hwrm_free_vf_info(bp);\n+\tbnxt_free_vf_info(bp);\n \n \trte_free(bp->grp_info);\n \tbp->grp_info = NULL;\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex 5ef0845..c16edc8 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -788,10 +788,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp)\n \treturn 0;\n }\n \n-void bnxt_hwrm_free_vf_info(struct bnxt *bp)\n+void bnxt_free_vf_info(struct bnxt *bp)\n {\n \tint i;\n \n+\tif (bp->pf->vf_info == NULL)\n+\t\treturn;\n+\n \tfor (i = 0; i < bp->pf->max_vfs; i++) {\n \t\trte_free(bp->pf->vf_info[i].vlan_table);\n \t\tbp->pf->vf_info[i].vlan_table = NULL;\n@@ -802,6 +805,50 @@ void bnxt_hwrm_free_vf_info(struct bnxt *bp)\n \tbp->pf->vf_info = NULL;\n }\n \n+static int bnxt_alloc_vf_info(struct bnxt *bp, uint16_t max_vfs)\n+{\n+\tstruct bnxt_child_vf_info *vf_info = bp->pf->vf_info;\n+\tint i;\n+\n+\tif (vf_info)\n+\t\tbnxt_free_vf_info(bp);\n+\n+\tvf_info = rte_zmalloc(\"bnxt_vf_info\", sizeof(*vf_info) * max_vfs, 0);\n+\tif (vf_info == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to alloc vf info\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tbp->pf->max_vfs = max_vfs;\n+\tfor (i = 0; i < max_vfs; i++) {\n+\t\tvf_info[i].fid = bp->pf->first_vf_id + i;\n+\t\tvf_info[i].vlan_table = rte_zmalloc(\"VF VLAN table\",\n+\t\t\t\t\t\t getpagesize(), getpagesize());\n+\t\tif (vf_info[i].vlan_table == NULL) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to alloc VLAN table for VF %d\\n\", i);\n+\t\t\tgoto err;\n+\t\t}\n+\t\trte_mem_lock_page(vf_info[i].vlan_table);\n+\n+\t\tvf_info[i].vlan_as_table = rte_zmalloc(\"VF VLAN AS table\",\n+\t\t\t\t\t\t getpagesize(), getpagesize());\n+\t\tif (vf_info[i].vlan_as_table == NULL) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to alloc VLAN AS table for VF %d\\n\", i);\n+\t\t\tgoto err;\n+\t\t}\n+\t\trte_mem_lock_page(vf_info[i].vlan_as_table);\n+\n+\t\tSTAILQ_INIT(&vf_info[i].filter);\n+\t}\n+\n+\tbp->pf->vf_info = vf_info;\n+\n+\treturn 0;\n+err:\n+\tbnxt_free_vf_info(bp);\n+\treturn -ENOMEM;\n+}\n+\n static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)\n {\n \tint rc = 0;\n@@ -809,7 +856,6 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)\n \tstruct hwrm_func_qcaps_output *resp = bp->hwrm_cmd_resp_addr;\n \tuint16_t new_max_vfs;\n \tuint32_t flags;\n-\tint i;\n \n \tHWRM_PREP(&req, HWRM_FUNC_QCAPS, BNXT_USE_CHIMP_MB);\n \n@@ -827,43 +873,9 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)\n \t\tbp->pf->total_vfs = rte_le_to_cpu_16(resp->max_vfs);\n \t\tnew_max_vfs = bp->pdev->max_vfs;\n \t\tif (new_max_vfs != bp->pf->max_vfs) {\n-\t\t\tif (bp->pf->vf_info)\n-\t\t\t\tbnxt_hwrm_free_vf_info(bp);\n-\t\t\tbp->pf->vf_info = rte_zmalloc(\"bnxt_vf_info\",\n-\t\t\t sizeof(bp->pf->vf_info[0]) * new_max_vfs, 0);\n-\t\t\tif (bp->pf->vf_info == NULL) {\n-\t\t\t\tPMD_DRV_LOG(ERR, \"Alloc vf info fail\\n\");\n-\t\t\t\tHWRM_UNLOCK();\n-\t\t\t\treturn -ENOMEM;\n-\t\t\t}\n-\t\t\tbp->pf->max_vfs = new_max_vfs;\n-\t\t\tfor (i = 0; i < new_max_vfs; i++) {\n-\t\t\t\tbp->pf->vf_info[i].fid =\n-\t\t\t\t\tbp->pf->first_vf_id + i;\n-\t\t\t\tbp->pf->vf_info[i].vlan_table =\n-\t\t\t\t\trte_zmalloc(\"VF VLAN table\",\n-\t\t\t\t\t\t getpagesize(),\n-\t\t\t\t\t\t getpagesize());\n-\t\t\t\tif (bp->pf->vf_info[i].vlan_table == NULL)\n-\t\t\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t\t\"Fail to alloc VLAN table for VF %d\\n\",\n-\t\t\t\t\ti);\n-\t\t\t\telse\n-\t\t\t\t\trte_mem_lock_page(\n-\t\t\t\t\t\tbp->pf->vf_info[i].vlan_table);\n-\t\t\t\tbp->pf->vf_info[i].vlan_as_table =\n-\t\t\t\t\trte_zmalloc(\"VF VLAN AS table\",\n-\t\t\t\t\t\t getpagesize(),\n-\t\t\t\t\t\t getpagesize());\n-\t\t\t\tif (bp->pf->vf_info[i].vlan_as_table == NULL)\n-\t\t\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t\t\"Alloc VLAN AS table for VF %d fail\\n\",\n-\t\t\t\t\ti);\n-\t\t\t\telse\n-\t\t\t\t\trte_mem_lock_page(\n-\t\t\t\t\t bp->pf->vf_info[i].vlan_as_table);\n-\t\t\t\tSTAILQ_INIT(&bp->pf->vf_info[i].filter);\n-\t\t\t}\n+\t\t\trc = bnxt_alloc_vf_info(bp, new_max_vfs);\n+\t\t\tif (rc)\n+\t\t\t\tgoto unlock;\n \t\t}\n \t}\n \n@@ -922,6 +934,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)\n \tif (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_LINK_ADMIN_STATUS_SUPPORTED)\n \t\tbp->fw_cap |= BNXT_FW_CAP_LINK_ADMIN;\n \n+unlock:\n \tHWRM_UNLOCK();\n \n \treturn rc;\n@@ -932,6 +945,9 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp)\n \tint rc;\n \n \trc = __bnxt_hwrm_func_qcaps(bp);\n+\tif (rc == -ENOMEM)\n+\t\treturn rc;\n+\n \tif (!rc && bp->hwrm_spec_code >= HWRM_SPEC_CODE_1_8_3) {\n \t\trc = bnxt_alloc_ctx_mem(bp);\n \t\tif (rc)\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h\nindex 3d05acf..0c2e32c 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.h\n+++ b/drivers/net/bnxt/bnxt_hwrm.h\n@@ -297,7 +297,7 @@ int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp);\n int bnxt_hwrm_oem_cmd(struct bnxt *bp, uint32_t entry_num);\n int bnxt_clear_one_vnic_filter(struct bnxt *bp,\n \t\t\t struct bnxt_filter_info *filter);\n-void bnxt_hwrm_free_vf_info(struct bnxt *bp);\n+void bnxt_free_vf_info(struct bnxt *bp);\n int bnxt_hwrm_first_vf_id_query(struct bnxt *bp, uint16_t fid,\n \t\t\t\tuint16_t *first_vf_id);\n int bnxt_hwrm_cfa_pair_alloc(struct bnxt *bp, struct bnxt_representor *rep);\n", "prefixes": [ "3/3" ] }