Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64608/?format=api
{ "id": 64608, "url": "http://patches.dpdk.org/api/patches/64608/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200114051435.46093-6-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": "<20200114051435.46093-6-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200114051435.46093-6-ajit.khaparde@broadcom.com", "date": "2020-01-14T05:14:30", "name": "[v3,05/10] net/bnxt: fix VLAN strip support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4a1bfc3d507765dae26a2d0d9c6d8f44276a5ee6", "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/20200114051435.46093-6-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 8097, "url": "http://patches.dpdk.org/api/series/8097/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8097", "date": "2020-01-14T05:14:25", "name": "bnxt patchset with bug fixes", "version": 3, "mbox": "http://patches.dpdk.org/series/8097/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64608/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/64608/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 0D593A04FD;\n\tTue, 14 Jan 2020 06:17:29 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 543951C435;\n\tTue, 14 Jan 2020 06:16:45 +0100 (CET)", "from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com\n [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id B102629D2\n for <dev@dpdk.org>; Tue, 14 Jan 2020 06:16:33 +0100 (CET)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n [10.75.242.48])\n by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 0D64E30C55B;\n Mon, 13 Jan 2020 21:10:22 -0800 (PST)", "from localhost.localdomain (unknown [10.230.30.124])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id 2E7C9140069;\n Mon, 13 Jan 2020 21:16:32 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 0D64E30C55B", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1578978622;\n bh=0lCjIn2wI5bYeZEfXvVGILFjyIfZNlvN/gUuFhIqTCM=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=waI5MU7nSVVoLHspW3wVxzQEAZQ6szDC2TWo7nqvlO+LIjlwudrEIWp0RFwx3IAmc\n xKpAjc8JKibIjjTXNmXtXv9pB0fknU5q560ZsZmDBu+LEMtCLSIyQLs3IdWkYhoblN\n YvTv7ShtjVxPbqv8txzmnTX0hiIl/o81ZJYBLqzU=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>", "Date": "Mon, 13 Jan 2020 21:14:30 -0800", "Message-Id": "<20200114051435.46093-6-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.0 (Apple Git-122.2)", "In-Reply-To": "<20200114051435.46093-1-ajit.khaparde@broadcom.com>", "References": "<20200113050118.28719-1-kalesh-anakkur.purayil@broadcom.com>\n <20200114051435.46093-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 05/10] net/bnxt: fix VLAN strip support", "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: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\n\nHWRM_VNIC_CFG command to configure vnic dynamically with\ntraffic running is not working. Driver has to free and\nrecreate the vnic and then reconfigure the vnic filters.\n\nFixes: 7fe5668d2ea3 (\"net/bnxt: support VLAN filter and strip\")\n\nSigned-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\nReviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>\n---\n drivers/net/bnxt/bnxt_ethdev.c | 248 ++++++++++++++++++++-------------\n 1 file changed, 150 insertions(+), 98 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 83f475d49..0b2c29bc8 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -132,6 +132,7 @@ static int bnxt_dev_uninit(struct rte_eth_dev *eth_dev);\n static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);\n static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);\n static void bnxt_cancel_fw_health_check(struct bnxt *bp);\n+static int bnxt_restore_vlan_filters(struct bnxt *bp);\n \n int is_bnxt_in_error(struct bnxt *bp)\n {\n@@ -228,14 +229,97 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool reconfig)\n \treturn rc;\n }\n \n-static int bnxt_init_chip(struct bnxt *bp)\n+static int bnxt_setup_one_vnic(struct bnxt *bp, uint16_t vnic_id)\n {\n+\tstruct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;\n+\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];\n+\tuint64_t rx_offloads = dev_conf->rxmode.offloads;\n \tstruct bnxt_rx_queue *rxq;\n+\tunsigned int j;\n+\tint rc;\n+\n+\trc = bnxt_vnic_grp_alloc(bp, vnic);\n+\tif (rc)\n+\t\tgoto err_out;\n+\n+\tPMD_DRV_LOG(DEBUG, \"vnic[%d] = %p vnic->fw_grp_ids = %p\\n\",\n+\t\t vnic_id, vnic, vnic->fw_grp_ids);\n+\n+\trc = bnxt_hwrm_vnic_alloc(bp, vnic);\n+\tif (rc)\n+\t\tgoto err_out;\n+\n+\t/* Alloc RSS context only if RSS mode is enabled */\n+\tif (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {\n+\t\tint j, nr_ctxs = bnxt_rss_ctxts(bp);\n+\n+\t\trc = 0;\n+\t\tfor (j = 0; j < nr_ctxs; j++) {\n+\t\t\trc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j);\n+\t\t\tif (rc)\n+\t\t\t\tbreak;\n+\t\t}\n+\t\tif (rc) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"HWRM vnic %d ctx %d alloc failure rc: %x\\n\",\n+\t\t\t\t vnic_id, j, rc);\n+\t\t\tgoto err_out;\n+\t\t}\n+\t\tvnic->num_lb_ctxts = nr_ctxs;\n+\t}\n+\n+\t/*\n+\t * Firmware sets pf pair in default vnic cfg. If the VLAN strip\n+\t * setting is not available at this time, it will not be\n+\t * configured correctly in the CFA.\n+\t */\n+\tif (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)\n+\t\tvnic->vlan_strip = true;\n+\telse\n+\t\tvnic->vlan_strip = false;\n+\n+\trc = bnxt_hwrm_vnic_cfg(bp, vnic);\n+\tif (rc)\n+\t\tgoto err_out;\n+\n+\trc = bnxt_set_hwrm_vnic_filters(bp, vnic);\n+\tif (rc)\n+\t\tgoto err_out;\n+\n+\tfor (j = 0; j < bp->rx_num_qs_per_vnic; j++) {\n+\t\trxq = bp->eth_dev->data->rx_queues[j];\n+\n+\t\tPMD_DRV_LOG(DEBUG,\n+\t\t\t \"rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\\n\",\n+\t\t\t j, rxq->vnic, rxq->vnic->fw_grp_ids);\n+\n+\t\tif (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)\n+\t\t\trxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;\n+\t}\n+\n+\trc = bnxt_vnic_rss_configure(bp, vnic);\n+\tif (rc)\n+\t\tgoto err_out;\n+\n+\tbnxt_hwrm_vnic_plcmode_cfg(bp, vnic);\n+\n+\tif (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)\n+\t\tbnxt_hwrm_vnic_tpa_cfg(bp, vnic, 1);\n+\telse\n+\t\tbnxt_hwrm_vnic_tpa_cfg(bp, vnic, 0);\n+\n+\treturn 0;\n+err_out:\n+\tPMD_DRV_LOG(ERR, \"HWRM vnic %d cfg failure rc: %x\\n\",\n+\t\t vnic_id, rc);\n+\treturn rc;\n+}\n+\n+static int bnxt_init_chip(struct bnxt *bp)\n+{\n \tstruct rte_eth_link new;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);\n-\tstruct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n-\tuint64_t rx_offloads = dev_conf->rxmode.offloads;\n \tuint32_t intr_vector = 0;\n \tuint32_t queue_id, base = BNXT_MISC_VEC_ID;\n \tuint32_t vec = BNXT_MISC_VEC_ID;\n@@ -303,93 +387,11 @@ static int bnxt_init_chip(struct bnxt *bp)\n \n \t/* VNIC configuration */\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-\n-\t\trc = bnxt_vnic_grp_alloc(bp, vnic);\n+\t\trc = bnxt_setup_one_vnic(bp, i);\n \t\tif (rc)\n \t\t\tgoto err_out;\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-\n-\t\trc = bnxt_hwrm_vnic_alloc(bp, vnic);\n-\t\tif (rc) {\n-\t\t\tPMD_DRV_LOG(ERR, \"HWRM vnic %d alloc failure rc: %x\\n\",\n-\t\t\t\ti, rc);\n-\t\t\tgoto err_out;\n-\t\t}\n-\n-\t\t/* Alloc RSS context only if RSS mode is enabled */\n-\t\tif (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) {\n-\t\t\tint j, nr_ctxs = bnxt_rss_ctxts(bp);\n-\n-\t\t\trc = 0;\n-\t\t\tfor (j = 0; j < nr_ctxs; j++) {\n-\t\t\t\trc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j);\n-\t\t\t\tif (rc)\n-\t\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tif (rc) {\n-\t\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t \"HWRM vnic %d ctx %d alloc failure rc: %x\\n\",\n-\t\t\t\t i, j, rc);\n-\t\t\t\tgoto err_out;\n-\t\t\t}\n-\t\t\tvnic->num_lb_ctxts = nr_ctxs;\n-\t\t}\n-\n-\t\t/*\n-\t\t * Firmware sets pf pair in default vnic cfg. If the VLAN strip\n-\t\t * setting is not available at this time, it will not be\n-\t\t * configured correctly in the CFA.\n-\t\t */\n-\t\tif (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)\n-\t\t\tvnic->vlan_strip = true;\n-\t\telse\n-\t\t\tvnic->vlan_strip = false;\n-\n-\t\trc = bnxt_hwrm_vnic_cfg(bp, vnic);\n-\t\tif (rc) {\n-\t\t\tPMD_DRV_LOG(ERR, \"HWRM vnic %d cfg failure rc: %x\\n\",\n-\t\t\t\ti, rc);\n-\t\t\tgoto err_out;\n-\t\t}\n-\n-\t\trc = bnxt_set_hwrm_vnic_filters(bp, vnic);\n-\t\tif (rc) {\n-\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t\"HWRM vnic %d filter failure rc: %x\\n\",\n-\t\t\t\ti, rc);\n-\t\t\tgoto err_out;\n-\t\t}\n-\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-\t\t\t\t \"rxq[%d]->vnic=%p vnic->fw_grp_ids=%p\\n\",\n-\t\t\t\t j, rxq->vnic, rxq->vnic->fw_grp_ids);\n-\n-\t\t\tif (BNXT_HAS_RING_GRPS(bp) && rxq->rx_deferred_start)\n-\t\t\t\trxq->vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;\n-\t\t}\n-\n-\t\trc = bnxt_vnic_rss_configure(bp, vnic);\n-\t\tif (rc) {\n-\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t \"HWRM vnic set RSS failure rc: %x\\n\", rc);\n-\t\t\tgoto err_out;\n-\t\t}\n-\n-\t\tbnxt_hwrm_vnic_plcmode_cfg(bp, vnic);\n-\n-\t\tif (bp->eth_dev->data->dev_conf.rxmode.offloads &\n-\t\t DEV_RX_OFFLOAD_TCP_LRO)\n-\t\t\tbnxt_hwrm_vnic_tpa_cfg(bp, vnic, 1);\n-\t\telse\n-\t\t\tbnxt_hwrm_vnic_tpa_cfg(bp, vnic, 0);\n \t}\n+\n \trc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL);\n \tif (rc) {\n \t\tPMD_DRV_LOG(ERR,\n@@ -1892,12 +1894,69 @@ bnxt_config_vlan_hw_filter(struct bnxt *bp, uint64_t rx_offloads)\n \treturn 0;\n }\n \n+static int bnxt_free_one_vnic(struct bnxt *bp, uint16_t vnic_id)\n+{\n+\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];\n+\tunsigned int i;\n+\tint rc;\n+\n+\t/* Destroy vnic filters and vnic */\n+\tif (bp->eth_dev->data->dev_conf.rxmode.offloads &\n+\t DEV_RX_OFFLOAD_VLAN_FILTER) {\n+\t\tfor (i = 0; i < RTE_ETHER_MAX_VLAN_ID; i++)\n+\t\t\tbnxt_del_vlan_filter(bp, i);\n+\t}\n+\tbnxt_del_dflt_mac_filter(bp, vnic);\n+\n+\trc = bnxt_hwrm_vnic_free(bp, vnic);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\trte_free(vnic->fw_grp_ids);\n+\tvnic->fw_grp_ids = NULL;\n+\n+\treturn 0;\n+}\n+\n+static int\n+bnxt_config_vlan_hw_stripping(struct bnxt *bp, uint64_t rx_offloads)\n+{\n+\tstruct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);\n+\tint rc;\n+\n+\t/* Destroy, recreate and reconfigure the default vnic */\n+\trc = bnxt_free_one_vnic(bp, 0);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\t/* default vnic 0 */\n+\trc = bnxt_setup_one_vnic(bp, 0);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\tif (bp->eth_dev->data->dev_conf.rxmode.offloads &\n+\t DEV_RX_OFFLOAD_VLAN_FILTER) {\n+\t\trc = bnxt_add_vlan_filter(bp, 0);\n+\t\tbnxt_restore_vlan_filters(bp);\n+\t} else {\n+\t\trc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0);\n+\t}\n+\n+\trc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);\n+\tif (rc)\n+\t\treturn rc;\n+\n+\tPMD_DRV_LOG(DEBUG, \"VLAN Strip Offload: %d\\n\",\n+\t\t !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));\n+\n+\treturn rc;\n+}\n+\n static int\n bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n {\n \tuint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;\n \tstruct bnxt *bp = dev->data->dev_private;\n-\tunsigned int i;\n \tint rc;\n \n \trc = is_bnxt_in_error(bp);\n@@ -1913,16 +1972,9 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n \n \tif (mask & ETH_VLAN_STRIP_MASK) {\n \t\t/* Enable or disable VLAN stripping */\n-\t\tfor (i = 0; i < bp->nr_vnics; i++) {\n-\t\t\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[i];\n-\t\t\tif (rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP)\n-\t\t\t\tvnic->vlan_strip = true;\n-\t\t\telse\n-\t\t\t\tvnic->vlan_strip = false;\n-\t\t\tbnxt_hwrm_vnic_cfg(bp, vnic);\n-\t\t}\n-\t\tPMD_DRV_LOG(DEBUG, \"VLAN Strip Offload: %d\\n\",\n-\t\t\t!!(rx_offloads & DEV_RX_OFFLOAD_VLAN_STRIP));\n+\t\trc = bnxt_config_vlan_hw_stripping(bp, rx_offloads);\n+\t\tif (rc)\n+\t\t\treturn rc;\n \t}\n \n \tif (mask & ETH_VLAN_EXTEND_MASK) {\n", "prefixes": [ "v3", "05/10" ] }