Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64605/?format=api
{ "id": 64605, "url": "http://patches.dpdk.org/api/patches/64605/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200114051435.46093-5-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-5-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200114051435.46093-5-ajit.khaparde@broadcom.com", "date": "2020-01-14T05:14:29", "name": "[v3,04/10] net/bnxt: fix enable/disable VLAN filtering", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "674058eb9b8488178016ab6e3f2b6d2b79789770", "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-5-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/64605/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/64605/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 48C4AA04FD;\n\tTue, 14 Jan 2020 06:17:01 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id DCFE01C2E9;\n\tTue, 14 Jan 2020 06:16:40 +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 14D4B1C2AD;\n 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 73FA930C551;\n Mon, 13 Jan 2020 21:10:21 -0800 (PST)", "from localhost.localdomain (unknown [10.230.30.124])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id DBA1514008F;\n Mon, 13 Jan 2020 21:16:31 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 73FA930C551", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1578978621;\n bh=ZdAir/HhXhGZS1IRDH+iF8OVr5/St3dYLEigedGMmDM=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=q9E0n3hxMEPjZ3SGKKAKJwlkD7nHieh/Cq8sm3JiPj7DgI8OrAgmYWViC3FspolXP\n FPtKrY9iX9VRqU/FYRKdWgcOZgo1jG0Y3RIUMqCaoruE7TD8FidcN6Pi8AQrThRYZC\n GDZpr4Dss8d4VqDXMTkjFVlQunOW5v5gr9fP53Yo=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,\n stable@dpdk.org, Somnath Kotur <somnath.kotur@broadcom.com>", "Date": "Mon, 13 Jan 2020 21:14:29 -0800", "Message-Id": "<20200114051435.46093-5-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 04/10] net/bnxt: fix enable/disable VLAN\n\tfiltering", "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\nThere is no condition check for the user requested operation\nfor VLAN filtering. As a result, VLAN filtering is getting disabled\nwhen the user enables/disables VLAN stripping on same port.\n\nThe function bnxt_hwrm_clear_l2_filter() didn't actually free\nL2 filter in HW if the reference count of filter is zero.\n\nFixed it by incrementing the reference count of filter in\nbnxt_alloc_filter() routine.\n\nBecause of the recent changes in bnxt_hwrm_clear_l2_filter(),\nchange was needed in the routine bnxt_set_default_mac_addr_op()\nto destroy and re-create the default filter when the user\nchanges the default MAC of the port.\n\nFixes: 5c1171c97216 (\"net/bnxt: refactor filter/flow\")\nFixes: 6118503d8071 (\"net/bnxt: fix VLAN filtering\")\nCc: stable@dpdk.org\n\nSigned-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\nReviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_ethdev.c | 66 ++++++++++++++++++----------------\n drivers/net/bnxt/bnxt_filter.c | 5 +--\n 2 files changed, 39 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex a948c78cb..83f475d49 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -1860,18 +1860,12 @@ static int bnxt_del_dflt_mac_filter(struct bnxt *bp,\n }\n \n static int\n-bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n+bnxt_config_vlan_hw_filter(struct bnxt *bp, uint64_t rx_offloads)\n {\n-\tstruct bnxt *bp = dev->data->dev_private;\n-\tuint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;\n \tstruct bnxt_vnic_info *vnic;\n \tunsigned int i;\n \tint rc;\n \n-\trc = is_bnxt_in_error(bp);\n-\tif (rc)\n-\t\treturn rc;\n-\n \tvnic = BNXT_GET_DEFAULT_VNIC(bp);\n \tif (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {\n \t\t/* Remove any VLAN filters programmed */\n@@ -1895,6 +1889,28 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n \tPMD_DRV_LOG(DEBUG, \"VLAN Filtering: %d\\n\",\n \t\t !!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER));\n \n+\treturn 0;\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+\tif (rc)\n+\t\treturn rc;\n+\n+\tif (mask & ETH_VLAN_FILTER_MASK) {\n+\t\t/* Enable or disable VLAN filtering */\n+\t\trc = bnxt_config_vlan_hw_filter(bp, rx_offloads);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\t}\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@@ -1984,7 +2000,6 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,\n \tstruct bnxt *bp = dev->data->dev_private;\n \t/* Default Filter is tied to VNIC 0 */\n \tstruct bnxt_vnic_info *vnic = BNXT_GET_DEFAULT_VNIC(bp);\n-\tstruct bnxt_filter_info *filter;\n \tint rc;\n \n \trc = is_bnxt_in_error(bp);\n@@ -1997,32 +2012,23 @@ bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,\n \tif (rte_is_zero_ether_addr(addr))\n \t\treturn -EINVAL;\n \n-\tSTAILQ_FOREACH(filter, &vnic->filter, next) {\n-\t\t/* Default Filter is at Index 0 */\n-\t\tif (filter->mac_index != 0)\n-\t\t\tcontinue;\n-\n-\t\tmemcpy(filter->l2_addr, addr, RTE_ETHER_ADDR_LEN);\n-\t\tmemset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);\n-\t\tfilter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX |\n-\t\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;\n-\t\tfilter->enables |=\n-\t\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |\n-\t\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;\n+\t/* Check if the requested MAC is already added */\n+\tif (memcmp(addr, bp->mac_addr, RTE_ETHER_ADDR_LEN) == 0)\n+\t\treturn 0;\n \n-\t\trc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter);\n-\t\tif (rc) {\n-\t\t\tmemcpy(filter->l2_addr, bp->mac_addr,\n-\t\t\t RTE_ETHER_ADDR_LEN);\n-\t\t\treturn rc;\n-\t\t}\n+\t/* Destroy filter and re-create it */\n+\tbnxt_del_dflt_mac_filter(bp, vnic);\n \n-\t\tmemcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);\n-\t\tPMD_DRV_LOG(DEBUG, \"Set MAC addr\\n\");\n-\t\treturn 0;\n+\tmemcpy(bp->mac_addr, addr, RTE_ETHER_ADDR_LEN);\n+\tif (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_VLAN_FILTER) {\n+\t\t/* This filter will allow only untagged packets */\n+\t\trc = bnxt_add_vlan_filter(bp, 0);\n+\t} else {\n+\t\trc = bnxt_add_mac_filter(bp, vnic, addr, 0, 0);\n \t}\n \n-\treturn 0;\n+\tPMD_DRV_LOG(DEBUG, \"Set MAC addr\\n\");\n+\treturn rc;\n }\n \n static int\ndiff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c\nindex 0c410f8ba..b31f10479 100644\n--- a/drivers/net/bnxt/bnxt_filter.c\n+++ b/drivers/net/bnxt/bnxt_filter.c\n@@ -39,9 +39,10 @@ struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp)\n \tfilter->flags = HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;\n \tfilter->enables = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |\n \t\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;\n-\tmemcpy(filter->l2_addr, bp->eth_dev->data->mac_addrs->addr_bytes,\n-\t RTE_ETHER_ADDR_LEN);\n+\tmemcpy(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN);\n \tmemset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);\n+\t/* bump up the reference count of filter */\n+\tfilter->l2_ref_cnt++;\n \treturn filter;\n }\n \n", "prefixes": [ "v3", "04/10" ] }