Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41884/?format=api
{ "id": 41884, "url": "http://patchwork.dpdk.org/api/patches/41884/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20180628201549.3507-22-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20180628201549.3507-22-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180628201549.3507-22-ajit.khaparde@broadcom.com", "date": "2018-06-28T20:15:47", "name": "[v2,21/23] net/bnxt: check VF resources if resource manager is enabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "78efea6fa48f0deebc39792f4bc6a9f7fe90a307", "submitter": { "id": 501, "url": "http://patchwork.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20180628201549.3507-22-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 300, "url": "http://patchwork.dpdk.org/api/series/300/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=300", "date": "2018-06-28T20:15:29", "name": "bnxt patchset", "version": 2, "mbox": "http://patchwork.dpdk.org/series/300/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/41884/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/41884/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 011141B5BD;\n\tThu, 28 Jun 2018 22:16:52 +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 417271B4F7\n\tfor <dev@dpdk.org>; Thu, 28 Jun 2018 22:16:00 +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 832FA30C031;\n\tThu, 28 Jun 2018 13:15:59 -0700 (PDT)", "from C02VPB22HTD6.dhcp.broadcom.net (c02vpb22htd6.dhcp.broadcom.net\n\t[10.136.50.120])\n\tby nis-sj1-27.broadcom.com (Postfix) with ESMTP id 0A47AAC0745;\n\tThu, 28 Jun 2018 13:15:59 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 832FA30C031", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1530216959;\n\tbh=7YMntajm0yStd8UlvoyGF75WsAIJZUw1bZkyWV2rcZM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=kBwdv6ASUeBPn/EmdlYwWZfpT7hPWLhYf9PpDgoJdKorbzj7By/PYSf5moSR4gDuF\n\tuoezpE+VzdROOHXR12EDpwEFXyvWT3nIBCV/wc7RmetfvWCi8HfARTklNEZ+rQ1OZ7\n\tnssJn1yLDtk5IjZECmjdrJhPI7IbMya1nkN883jU=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Thu, 28 Jun 2018 13:15:47 -0700", "Message-Id": "<20180628201549.3507-22-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.15.2 (Apple Git-101.1)", "In-Reply-To": "<20180628201549.3507-1-ajit.khaparde@broadcom.com>", "References": "<f02289d7-4111-ab00-9ce9-00dd5c8b3c18@intel.com>\n\t<20180628201549.3507-1-ajit.khaparde@broadcom.com>", "Subject": "[dpdk-dev] [PATCH v2 21/23] net/bnxt: check VF resources if\n\tresource manager is enabled", "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": "If HWRM resource manager is enabled, check VF resources before proceeding.\nMake sure there are enough resources allocated and return an error in case\nof insufficient error.\n\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 5 ++++\n drivers/net/bnxt/bnxt_ethdev.c | 21 ++++++++++-----\n drivers/net/bnxt/bnxt_hwrm.c | 59 +++++++++++++++++++++++++++++++++++++++---\n drivers/net/bnxt/bnxt_hwrm.h | 6 ++++-\n 4 files changed, 80 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 246b8d4d8..db5c4eb0d 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -22,6 +22,10 @@\n \n #define BNXT_MAX_MTU\t\t9500\n #define VLAN_TAG_SIZE\t\t4\n+#define BNXT_VF_RSV_NUM_RSS_CTX\t1\n+#define BNXT_VF_RSV_NUM_L2_CTX\t4\n+/* TODO: For now, do not support VMDq/RFS on VFs. */\n+#define BNXT_VF_RSV_NUM_VNIC\t1\n #define BNXT_MAX_LED\t\t4\n #define BNXT_NUM_VLANS\t\t2\n #define BNXT_MIN_RING_DESC\t16\n@@ -328,6 +332,7 @@ struct bnxt {\n \tstruct bnxt_led_info\tleds[BNXT_MAX_LED];\n \tuint8_t\t\t\tnum_leds;\n \tstruct bnxt_ptp_cfg *ptp_cfg;\n+\tuint16_t\t\tvf_resv_strategy;\n };\n \n int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete);\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 44c6cfa0a..34c3d6ba3 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -509,6 +509,7 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)\n {\n \tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\n \tuint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;\n+\tint rc;\n \n \tbp->rx_queues = (void *)eth_dev->data->rx_queues;\n \tbp->tx_queues = (void *)eth_dev->data->tx_queues;\n@@ -516,19 +517,23 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)\n \tbp->rx_nr_rings = eth_dev->data->nb_rx_queues;\n \n \tif (BNXT_VF(bp) && (bp->flags & BNXT_FLAG_NEW_RM)) {\n-\t\tint rc;\n+\t\trc = bnxt_hwrm_check_vf_rings(bp);\n+\t\tif (rc) {\n+\t\t\tPMD_DRV_LOG(ERR, \"HWRM insufficient resources\\n\");\n+\t\t\treturn -ENOSPC;\n+\t\t}\n \n-\t\trc = bnxt_hwrm_func_reserve_vf_resc(bp);\n+\t\trc = bnxt_hwrm_func_reserve_vf_resc(bp, false);\n \t\tif (rc) {\n \t\t\tPMD_DRV_LOG(ERR, \"HWRM resource alloc fail:%x\\n\", rc);\n \t\t\treturn -ENOSPC;\n \t\t}\n-\n+\t} else {\n \t\t/* legacy driver needs to get updated values */\n \t\trc = bnxt_hwrm_func_qcaps(bp);\n \t\tif (rc) {\n \t\t\tPMD_DRV_LOG(ERR, \"hwrm func qcaps fail:%d\\n\", rc);\n-\t\t\treturn -ENOSPC;\n+\t\t\treturn rc;\n \t\t}\n \t}\n \n@@ -539,7 +544,9 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)\n \t bp->max_cp_rings ||\n \t eth_dev->data->nb_rx_queues + eth_dev->data->nb_tx_queues >\n \t bp->max_stat_ctx ||\n-\t (uint32_t)(eth_dev->data->nb_rx_queues) > bp->max_ring_grps) {\n+\t (uint32_t)(eth_dev->data->nb_rx_queues) > bp->max_ring_grps ||\n+\t (!(eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) &&\n+\t bp->max_vnics < eth_dev->data->nb_rx_queues)) {\n \t\tPMD_DRV_LOG(ERR,\n \t\t\t\"Insufficient resources to support requested config\\n\");\n \t\tPMD_DRV_LOG(ERR,\n@@ -547,9 +554,9 @@ static int bnxt_dev_configure_op(struct rte_eth_dev *eth_dev)\n \t\t\teth_dev->data->nb_tx_queues,\n \t\t\teth_dev->data->nb_rx_queues);\n \t\tPMD_DRV_LOG(ERR,\n-\t\t\t\"Res available: TxQ %d, RxQ %d, CQ %d Stat %d, Grp %d\\n\",\n+\t\t\t\"MAX: TxQ %d, RxQ %d, CQ %d Stat %d, Grp %d, Vnic %d\\n\",\n \t\t\tbp->max_tx_rings, bp->max_rx_rings, bp->max_cp_rings,\n-\t\t\tbp->max_stat_ctx, bp->max_ring_grps);\n+\t\t\tbp->max_stat_ctx, bp->max_ring_grps, bp->max_vnics);\n \t\treturn -ENOSPC;\n \t}\n \ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex ba8e44a9b..de04fe863 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -166,6 +166,18 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,\n \treq.resp_addr = rte_cpu_to_le_64(bp->hwrm_cmd_resp_dma_addr); \\\n } while (0)\n \n+#define HWRM_CHECK_RESULT_SILENT() do {\\\n+\tif (rc) { \\\n+\t\trte_spinlock_unlock(&bp->hwrm_lock); \\\n+\t\treturn rc; \\\n+\t} \\\n+\tif (resp->error_code) { \\\n+\t\trc = rte_le_to_cpu_16(resp->error_code); \\\n+\t\trte_spinlock_unlock(&bp->hwrm_lock); \\\n+\t\treturn rc; \\\n+\t} \\\n+} while (0)\n+\n #define HWRM_CHECK_RESULT() do {\\\n \tif (rc) { \\\n \t\tPMD_DRV_LOG(ERR, \"failed rc:%d\\n\", rc); \\\n@@ -658,9 +670,19 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)\n \treturn rc;\n }\n \n-int bnxt_hwrm_func_reserve_vf_resc(struct bnxt *bp)\n+int bnxt_hwrm_check_vf_rings(struct bnxt *bp)\n+{\n+\tif (!(BNXT_VF(bp) && (bp->flags & BNXT_FLAG_NEW_RM)))\n+\t\treturn 0;\n+\n+\treturn bnxt_hwrm_func_reserve_vf_resc(bp, true);\n+}\n+\n+int bnxt_hwrm_func_reserve_vf_resc(struct bnxt *bp, bool test)\n {\n \tint rc;\n+\tuint32_t flags = 0;\n+\tuint32_t enables;\n \tstruct hwrm_func_vf_cfg_output *resp = bp->hwrm_cmd_resp_addr;\n \tstruct hwrm_func_vf_cfg_input req = {0};\n \n@@ -671,7 +693,8 @@ int bnxt_hwrm_func_reserve_vf_resc(struct bnxt *bp)\n \t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_TX_RINGS |\n \t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_STAT_CTXS |\n \t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_CMPL_RINGS |\n-\t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_HW_RING_GRPS);\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_HW_RING_GRPS |\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_VNICS);\n \n \treq.num_tx_rings = rte_cpu_to_le_16(bp->tx_nr_rings);\n \treq.num_rx_rings = rte_cpu_to_le_16(bp->rx_nr_rings *\n@@ -680,10 +703,35 @@ int bnxt_hwrm_func_reserve_vf_resc(struct bnxt *bp)\n \treq.num_cmpl_rings = rte_cpu_to_le_16(bp->rx_nr_rings +\n \t\t\t\t\t bp->tx_nr_rings);\n \treq.num_hw_ring_grps = rte_cpu_to_le_16(bp->rx_nr_rings);\n+\treq.num_vnics = rte_cpu_to_le_16(bp->rx_nr_rings);\n+\tif (bp->vf_resv_strategy ==\n+\t HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESV_STRATEGY_MINIMAL_STATIC) {\n+\t\tenables = HWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_VNICS |\n+\t\t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_L2_CTXS |\n+\t\t\t\tHWRM_FUNC_VF_CFG_INPUT_ENABLES_NUM_RSSCOS_CTXS;\n+\t\treq.enables |= rte_cpu_to_le_32(enables);\n+\t\treq.num_rsscos_ctxs = rte_cpu_to_le_16(BNXT_VF_RSV_NUM_RSS_CTX);\n+\t\treq.num_l2_ctxs = rte_cpu_to_le_16(BNXT_VF_RSV_NUM_L2_CTX);\n+\t\treq.num_vnics = rte_cpu_to_le_16(BNXT_VF_RSV_NUM_VNIC);\n+\t}\n+\n+\tif (test)\n+\t\tflags = HWRM_FUNC_VF_CFG_INPUT_FLAGS_TX_ASSETS_TEST |\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_FLAGS_RX_ASSETS_TEST |\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_FLAGS_CMPL_ASSETS_TEST |\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_FLAGS_RING_GRP_ASSETS_TEST |\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_FLAGS_STAT_CTX_ASSETS_TEST |\n+\t\t\tHWRM_FUNC_VF_CFG_INPUT_FLAGS_VNIC_ASSETS_TEST;\n+\n+\treq.flags = rte_cpu_to_le_32(flags);\n \n \trc = bnxt_hwrm_send_message(bp, &req, sizeof(req));\n \n-\tHWRM_CHECK_RESULT();\n+\tif (test)\n+\t\tHWRM_CHECK_RESULT_SILENT();\n+\telse\n+\t\tHWRM_CHECK_RESULT();\n+\n \tHWRM_UNLOCK();\n \treturn rc;\n }\n@@ -711,6 +759,11 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)\n \t\tbp->max_vnics = rte_le_to_cpu_16(resp->max_vnics);\n \t\tbp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx);\n \t}\n+\tbp->vf_resv_strategy = rte_le_to_cpu_16(resp->vf_reservation_strategy);\n+\tif (bp->vf_resv_strategy >\n+\t HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESV_STRATEGY_MINIMAL_STATIC)\n+\t\tbp->vf_resv_strategy =\n+\t\tHWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESERVATION_STRATEGY_MAXIMAL;\n \n \tHWRM_UNLOCK();\n \treturn rc;\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h\nindex 4a237c4b4..379aac6e1 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.h\n+++ b/drivers/net/bnxt/bnxt_hwrm.h\n@@ -29,6 +29,9 @@ struct bnxt_cp_ring_info;\n #define HWRM_QUEUE_SERVICE_PROFILE_LOSSY \\\n \tHWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_ID0_SERVICE_PROFILE_LOSSY\n \n+#define HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESV_STRATEGY_MINIMAL_STATIC \\\n+\tHWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESERVATION_STRATEGY_MINIMAL_STATIC\n+\n int bnxt_hwrm_cfa_l2_clear_rx_mask(struct bnxt *bp,\n \t\t\t\t struct bnxt_vnic_info *vnic);\n int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic,\n@@ -113,7 +116,7 @@ int bnxt_get_hwrm_link_config(struct bnxt *bp, struct rte_eth_link *link);\n int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up);\n int bnxt_hwrm_func_qcfg(struct bnxt *bp);\n int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp);\n-int bnxt_hwrm_func_reserve_vf_resc(struct bnxt *bp);\n+int bnxt_hwrm_func_reserve_vf_resc(struct bnxt *bp, bool test);\n int bnxt_hwrm_allocate_pf_only(struct bnxt *bp);\n int bnxt_hwrm_allocate_vfs(struct bnxt *bp, int num_vfs);\n int bnxt_hwrm_func_vf_mac(struct bnxt *bp, uint16_t vf,\n@@ -170,4 +173,5 @@ int bnxt_vnic_rss_configure(struct bnxt *bp,\n \t\t\t struct bnxt_vnic_info *vnic);\n int bnxt_hwrm_set_ring_coal(struct bnxt *bp,\n \t\t\tstruct bnxt_coal *coal, uint16_t ring_id);\n+int bnxt_hwrm_check_vf_rings(struct bnxt *bp);\n #endif\n", "prefixes": [ "v2", "21/23" ] }