Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58424/?format=api
{ "id": 58424, "url": "https://patches.dpdk.org/api/patches/58424/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190903021901.25895-3-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-3-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190903021901.25895-3-ajit.khaparde@broadcom.com", "date": "2019-09-03T02:18:46", "name": "[02/17] net/bnxt: refactor code to allow dynamic creation of VNIC", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "bcecc851d982eccc3d6fcd4e97892732818d9921", "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-3-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/58424/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/58424/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 B4DE91EA06;\n\tTue, 3 Sep 2019 04:19:14 +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 9F0B51E950\n\tfor <dev@dpdk.org>; Tue, 3 Sep 2019 04:19:07 +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 22C7530C1F9;\n\tMon, 2 Sep 2019 19:19:00 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.30.225])\n\tby nis-sj1-27.broadcom.com (Postfix) with ESMTP id 26C58AC078E;\n\tMon, 2 Sep 2019 19:19:06 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 22C7530C1F9", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1567477140;\n\tbh=Hm9GESuAYhkjbFlpRJMQw9IHPexbJ5ps2abaNwL/eoI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=XBpepwYD7aXQwrc9i21firv/cFXQN8NYd+34VLUsn6IuyOhCgLTX1zyikq8gG2xJ2\n\tgFTmRtxUOH8Jankuz1XCsXEGsnj+gKhUYOE7a6xDmnACKFumrifgucF/iNmG9BbNOF\n\t/uFTlQNag23YF930/Y1oVXBIfhChJuwWLNyMOWmU=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Rahul Gupta <rahul.gupta@broadcom.com>,\n\tVenkat Duvvuru <venkatkumar.duvvuru@broadcom.com>", "Date": "Mon, 2 Sep 2019 19:18:46 -0700", "Message-Id": "<20190903021901.25895-3-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 02/17] net/bnxt: refactor code to allow dynamic\n\tcreation of VNIC", "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": "Refactor code to allow dynamic creation of VNIC for RSS\nor Queue Action during flow create.\n\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\nReviewed-by: Rahul Gupta <rahul.gupta@broadcom.com>\nReviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 1 +\n drivers/net/bnxt/bnxt_ethdev.c | 54 ++++++++++------------------------\n drivers/net/bnxt/bnxt_flow.c | 5 ++++\n drivers/net/bnxt/bnxt_rxq.c | 30 ++++++++-----------\n drivers/net/bnxt/bnxt_vnic.c | 36 +++++++++++++++++++++++\n drivers/net/bnxt/bnxt_vnic.h | 3 ++\n 6 files changed, 73 insertions(+), 56 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 2e662b297..c3938af37 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -460,6 +460,7 @@ struct bnxt {\n \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 \tstruct bnxt_rx_queue **rx_queues;\n \tconst void\t\t*rx_mem_zone;\n \tstruct rx_port_stats *hw_rx_port_stats;\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 3b190d4e4..6da4a9b09 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -321,17 +321,10 @@ static int bnxt_init_chip(struct bnxt *bp)\n \tfor (i = 0; i < bp->nr_vnics; i++) {\n \t\tstruct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;\n \t\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[i];\n-\t\tuint32_t size = sizeof(*vnic->fw_grp_ids) * bp->max_ring_grps;\n \n-\t\tvnic->fw_grp_ids = rte_zmalloc(\"vnic_fw_grp_ids\", size, 0);\n-\t\tif (!vnic->fw_grp_ids) {\n-\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t \"Failed to alloc %d bytes for group ids\\n\",\n-\t\t\t\t size);\n-\t\t\trc = -ENOMEM;\n+\t\trc = bnxt_vnic_grp_alloc(bp, vnic);\n+\t\tif (rc)\n \t\t\tgoto err_out;\n-\t\t}\n-\t\tmemset(vnic->fw_grp_ids, -1, size);\n \n \t\tPMD_DRV_LOG(DEBUG, \"vnic[%d] = %p vnic->fw_grp_ids = %p\\n\",\n \t\t\t i, vnic, vnic->fw_grp_ids);\n@@ -387,7 +380,7 @@ static int bnxt_init_chip(struct bnxt *bp)\n \t\t\tgoto err_out;\n \t\t}\n \n-\t\tfor (j = 0; j < bp->rx_nr_rings; j++) {\n+\t\tfor (j = 0; j < bp->rx_num_qs_per_vnic; j++) {\n \t\t\trxq = bp->eth_dev->data->rx_queues[j];\n \n \t\t\tPMD_DRV_LOG(DEBUG,\n@@ -1288,8 +1281,6 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,\n \tstruct bnxt *bp = eth_dev->data->dev_private;\n \tstruct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;\n \tstruct bnxt_vnic_info *vnic;\n-\tuint16_t hash_type = 0;\n-\tunsigned int i;\n \tint rc;\n \n \trc = is_bnxt_in_error(bp);\n@@ -1311,35 +1302,20 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,\n \tbp->flags |= BNXT_FLAG_UPDATE_HASH;\n \tmemcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf));\n \n-\tif (rss_conf->rss_hf & ETH_RSS_IPV4)\n-\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;\n-\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)\n-\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;\n-\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)\n-\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;\n-\tif (rss_conf->rss_hf & ETH_RSS_IPV6)\n-\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;\n-\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP)\n-\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;\n-\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_UDP)\n-\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;\n-\n-\t/* Update the RSS VNIC(s) */\n-\tfor (i = 0; i < bp->nr_vnics; i++) {\n-\t\tvnic = &bp->vnic_info[i];\n-\t\tvnic->hash_type = hash_type;\n+\t/* Update the default RSS VNIC(s) */\n+\tvnic = &bp->vnic_info[0];\n+\tvnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_conf->rss_hf);\n \n-\t\t/*\n-\t\t * Use the supplied key if the key length is\n-\t\t * acceptable and the rss_key is not NULL\n-\t\t */\n-\t\tif (rss_conf->rss_key &&\n-\t\t rss_conf->rss_key_len <= HW_HASH_KEY_SIZE)\n-\t\t\tmemcpy(vnic->rss_hash_key, rss_conf->rss_key,\n-\t\t\t rss_conf->rss_key_len);\n+\t/*\n+\t * Use the supplied key if the key length is\n+\t * acceptable and the rss_key is not NULL\n+\t */\n+\tif (rss_conf->rss_key && rss_conf->rss_key_len <= HW_HASH_KEY_SIZE)\n+\t\tmemcpy(vnic->rss_hash_key,\n+\t\t rss_conf->rss_key,\n+\t\t rss_conf->rss_key_len);\n \n-\t\tbnxt_hwrm_vnic_rss_cfg(bp, vnic);\n-\t}\n+\tbnxt_hwrm_vnic_rss_cfg(bp, vnic);\n \treturn 0;\n }\n \ndiff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c\nindex be9b6fad3..0eeff7b33 100644\n--- a/drivers/net/bnxt/bnxt_flow.c\n+++ b/drivers/net/bnxt/bnxt_flow.c\n@@ -1249,6 +1249,11 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,\n \tstruct bnxt_vnic_info *vnic = flow->vnic;\n \tint ret = 0;\n \n+\tif (!filter) {\n+\t\tret = -EINVAL;\n+\t\tgoto done;\n+\t}\n+\n \tif (filter->filter_type == HWRM_CFA_TUNNEL_REDIRECT_FILTER &&\n \t filter->enables == filter->tunnel_type) {\n \t\tret = bnxt_handle_tunnel_redirect_destroy(bp,\ndiff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c\nindex d6bca7fd4..2e5f2cf29 100644\n--- a/drivers/net/bnxt/bnxt_rxq.c\n+++ b/drivers/net/bnxt/bnxt_rxq.c\n@@ -100,6 +100,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)\n \t\t}\n \t}\n \tnb_q_per_grp = bp->rx_cp_nr_rings / pools;\n+\tbp->rx_num_qs_per_vnic = nb_q_per_grp;\n \tPMD_DRV_LOG(DEBUG, \"pools = %u nb_q_per_grp = %u\\n\",\n \t\t pools, nb_q_per_grp);\n \tstart_grp_id = 0;\n@@ -158,29 +159,16 @@ int bnxt_mq_rx_configure(struct bnxt *bp)\n out:\n \tif (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {\n \t\tstruct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf;\n-\t\tuint16_t hash_type = 0;\n \n \t\tif (bp->flags & BNXT_FLAG_UPDATE_HASH) {\n \t\t\trss = &bp->rss_conf;\n \t\t\tbp->flags &= ~BNXT_FLAG_UPDATE_HASH;\n \t\t}\n \n-\t\tif (rss->rss_hf & ETH_RSS_IPV4)\n-\t\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;\n-\t\tif (rss->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)\n-\t\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;\n-\t\tif (rss->rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)\n-\t\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;\n-\t\tif (rss->rss_hf & ETH_RSS_IPV6)\n-\t\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;\n-\t\tif (rss->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP)\n-\t\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;\n-\t\tif (rss->rss_hf & ETH_RSS_NONFRAG_IPV6_UDP)\n-\t\t\thash_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;\n-\n \t\tfor (i = 0; i < bp->nr_vnics; i++) {\n \t\t\tvnic = &bp->vnic_info[i];\n-\t\t\tvnic->hash_type = hash_type;\n+\t\t\tvnic->hash_type =\n+\t\t\t\tbnxt_rte_to_hwrm_hash_types(rss->rss_hf);\n \n \t\t\t/*\n \t\t\t * Use the supplied key if the key length is\n@@ -471,7 +459,12 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \t\t\t\t vnic, bp->grp_info[rx_queue_id].fw_grp_id);\n \t\t}\n \n-\t\trc = bnxt_vnic_rss_configure(bp, vnic);\n+\t\tPMD_DRV_LOG(DEBUG,\n+\t\t\t \"vnic = %p fw_grp_id = %d\\n\",\n+\t\t\t vnic, bp->grp_info[rx_queue_id].fw_grp_id);\n+\t\tPMD_DRV_LOG(DEBUG, \"Rx Queue Count %d\\n\", vnic->rx_queue_cnt);\n+\t\tif (vnic->rx_queue_cnt > 1)\n+\t\t\trc = bnxt_vnic_rss_configure(bp, vnic);\n \t}\n \n \tif (rc == 0)\n@@ -524,7 +517,10 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \t\tvnic = rxq->vnic;\n \t\tif (BNXT_HAS_RING_GRPS(bp))\n \t\t\tvnic->fw_grp_ids[rx_queue_id] = INVALID_HW_RING_ID;\n-\t\trc = bnxt_vnic_rss_configure(bp, vnic);\n+\n+\t\tPMD_DRV_LOG(DEBUG, \"Rx Queue Count %d\\n\", vnic->rx_queue_cnt);\n+\t\tif (vnic->rx_queue_cnt > 1)\n+\t\t\trc = bnxt_vnic_rss_configure(bp, vnic);\n \t}\n \n \tif (rc == 0)\ndiff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c\nindex 9ea99388b..4f3f9b359 100644\n--- a/drivers/net/bnxt/bnxt_vnic.c\n+++ b/drivers/net/bnxt/bnxt_vnic.c\n@@ -222,3 +222,39 @@ int bnxt_alloc_vnic_mem(struct bnxt *bp)\n \tbp->vnic_info = vnic_mem;\n \treturn 0;\n }\n+\n+int bnxt_vnic_grp_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic)\n+{\n+\tuint32_t size = sizeof(*vnic->fw_grp_ids) * bp->max_ring_grps;\n+\n+\tvnic->fw_grp_ids = rte_zmalloc(\"vnic_fw_grp_ids\", size, 0);\n+\tif (!vnic->fw_grp_ids) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"Failed to alloc %d bytes for group ids\\n\",\n+\t\t\t size);\n+\t\treturn -ENOMEM;\n+\t}\n+\tmemset(vnic->fw_grp_ids, -1, size);\n+\n+\treturn 0;\n+}\n+\n+uint16_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type)\n+{\n+\tuint16_t hwrm_type = 0;\n+\n+\tif (rte_type & ETH_RSS_IPV4)\n+\t\thwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;\n+\tif (rte_type & ETH_RSS_NONFRAG_IPV4_TCP)\n+\t\thwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;\n+\tif (rte_type & ETH_RSS_NONFRAG_IPV4_UDP)\n+\t\thwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;\n+\tif (rte_type & ETH_RSS_IPV6)\n+\t\thwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;\n+\tif (rte_type & ETH_RSS_NONFRAG_IPV6_TCP)\n+\t\thwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;\n+\tif (rte_type & ETH_RSS_NONFRAG_IPV6_UDP)\n+\t\thwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;\n+\n+\treturn hwrm_type;\n+}\ndiff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h\nindex 16a0d5763..cb2707f36 100644\n--- a/drivers/net/bnxt/bnxt_vnic.h\n+++ b/drivers/net/bnxt/bnxt_vnic.h\n@@ -42,6 +42,7 @@ struct bnxt_vnic_info {\n \n \tuint16_t\tcos_rule;\n \tuint16_t\tlb_rule;\n+\tuint16_t\trx_queue_cnt;\n \tbool\t\tvlan_strip;\n \tbool\t\tfunc_default;\n \tbool\t\tbd_stall;\n@@ -63,4 +64,6 @@ void bnxt_free_vnic_attributes(struct bnxt *bp);\n int bnxt_alloc_vnic_attributes(struct bnxt *bp);\n void bnxt_free_vnic_mem(struct bnxt *bp);\n int bnxt_alloc_vnic_mem(struct bnxt *bp);\n+int bnxt_vnic_grp_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic);\n+uint16_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type);\n #endif\n", "prefixes": [ "02/17" ] }