Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/24368/?format=api
{ "id": 24368, "url": "http://patches.dpdk.org/api/patches/24368/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20170518015813.7862-13-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": "<20170518015813.7862-13-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20170518015813.7862-13-ajit.khaparde@broadcom.com", "date": "2017-05-18T01:58:02", "name": "[dpdk-dev,12/23] bnxt: Add support for VLAN filter and strip dev_ops", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "0bf7ebf129b2b5f3a942cd2116ea7933edbeb76a", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20170518015813.7862-13-ajit.khaparde@broadcom.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/24368/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/24368/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 86E9F7CB3;\n\tThu, 18 May 2017 03:58:51 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (lpdvrndsmtp01.broadcom.com\n\t[192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 95B74324D\n\tfor <dev@dpdk.org>; Thu, 18 May 2017 03:58:27 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n\t[10.75.224.233])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id A388130C060;\n\tWed, 17 May 2017 18:58:26 -0700 (PDT)", "from C02PT1RBG8WP.vpn.broadcom.net (unknown [10.10.118.136])\n\tby mail-irv-17.broadcom.com (Postfix) with ESMTP id D7E8781EDA;\n\tWed, 17 May 2017 18:58:25 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com A388130C060", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1495072706;\n\tbh=lsHE/2qYk/Ot/KqO/bJDiP5QO5GfoqeWSCaiv4sEpao=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=E0Jh5/kUZkEVmN9zPqRMae9ykQa7Tyo9izbCT+mfDi7/iySbUyHMLVZTuwuuYumvK\n\tR92ktB1kXV9FpJ6O3ZABAPFT0S8/sEnKLIJC7aJ1nQq5n30sZJqVGtQjjowRHBxXVD\n\th7aAt7S7/Uvy9aSX16SGJxkbW7AmkVdcJa9SZR3w=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Wed, 17 May 2017 20:58:02 -0500", "Message-Id": "<20170518015813.7862-13-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.10.1 (Apple Git-78)", "In-Reply-To": "<20170518015813.7862-1-ajit.khaparde@broadcom.com>", "References": "<20170518015813.7862-1-ajit.khaparde@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 12/23] bnxt: Add support for VLAN filter and\n\tstrip dev_ops", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch adds VLAN strip and offload callbacks.\nTo add a VLAN filter:\n For each VNIC and each associated filter(s)\n if VLAN exists:\n if VLAN matches vlan_id\n VLAN filter already exists, just skip and continue\n else\n add a new MAC+VLAN filter\n else\n Remove the old MAC only filter\n Add a new MAC+VLAN filter\n\nTo remove a VLAN filter:\n For each VNIC and each associated filter(s)\n if VLAN exists && VLAN matches vlan_id\n remove the MAC+VLAN filter\n add a new MAC only filter\n else\n VLAN filter doesn't exist, just skip and continue\n\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_ethdev.c | 201 +++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 201 insertions(+)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex e110e9b..1dc2327 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -141,6 +141,7 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {\n \tETH_RSS_NONFRAG_IPV6_TCP |\t\\\n \tETH_RSS_NONFRAG_IPV6_UDP)\n \n+static void bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask);\n /***********************/\n \n /*\n@@ -487,6 +488,7 @@ static int bnxt_dev_lsc_intr_setup(struct rte_eth_dev *eth_dev)\n static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)\n {\n \tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\n+\tint vlan_mask = 0;\n \tint rc;\n \n \tbp->dev_stopped = 0;\n@@ -496,6 +498,13 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)\n \t\tgoto error;\n \n \tbnxt_link_update_op(eth_dev, 0);\n+\n+\tif (eth_dev->data->dev_conf.rxmode.hw_vlan_filter)\n+\t\tvlan_mask |= ETH_VLAN_FILTER_MASK;\n+\tif (eth_dev->data->dev_conf.rxmode.hw_vlan_strip)\n+\t\tvlan_mask |= ETH_VLAN_STRIP_MASK;\n+\tbnxt_vlan_offload_set_op(eth_dev, vlan_mask);\n+\n \treturn 0;\n \n error:\n@@ -1091,6 +1100,196 @@ bnxt_udp_tunnel_port_del_op(struct rte_eth_dev *eth_dev,\n \treturn rc;\n }\n \n+static int bnxt_del_vlan_filter(struct bnxt *bp, uint16_t vlan_id)\n+{\n+\tstruct bnxt_filter_info *filter, *temp_filter, *new_filter;\n+\tstruct bnxt_vnic_info *vnic;\n+\tunsigned int i;\n+\tint rc = 0;\n+\tuint32_t chk = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN;\n+\n+\t/* Cycle through all VNICs */\n+\tfor (i = 0; i < bp->nr_vnics; i++) {\n+\t\t/*\n+\t\t * For each VNIC and each associated filter(s)\n+\t\t * if VLAN exists && VLAN matches vlan_id\n+\t\t * remove the MAC+VLAN filter\n+\t\t * add a new MAC only filter\n+\t\t * else\n+\t\t * VLAN filter doesn't exist, just skip and continue\n+\t\t */\n+\t\tSTAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {\n+\t\t\tfilter = STAILQ_FIRST(&vnic->filter);\n+\t\t\twhile (filter) {\n+\t\t\t\ttemp_filter = STAILQ_NEXT(filter, next);\n+\n+\t\t\t\tif (filter->enables & chk &&\n+\t\t\t\t filter->l2_ovlan == vlan_id) {\n+\t\t\t\t\t/* Must delete the filter */\n+\t\t\t\t\tSTAILQ_REMOVE(&vnic->filter, filter,\n+\t\t\t\t\t\t bnxt_filter_info, next);\n+\t\t\t\t\tbnxt_hwrm_clear_filter(bp, filter);\n+\t\t\t\t\tSTAILQ_INSERT_TAIL(\n+\t\t\t\t\t\t\t&bp->free_filter_list,\n+\t\t\t\t\t\t\tfilter, next);\n+\n+\t\t\t\t\t/*\n+\t\t\t\t\t * Need to examine to see if the MAC\n+\t\t\t\t\t * filter already existed or not before\n+\t\t\t\t\t * allocating a new one\n+\t\t\t\t\t */\n+\n+\t\t\t\t\tnew_filter = bnxt_alloc_filter(bp);\n+\t\t\t\t\tif (!new_filter) {\n+\t\t\t\t\t\tRTE_LOG(ERR, PMD,\n+\t\t\t\t\t\t\t\"MAC/VLAN filter alloc failed\\n\");\n+\t\t\t\t\t\trc = -ENOMEM;\n+\t\t\t\t\t\tgoto exit;\n+\t\t\t\t\t}\n+\t\t\t\t\tSTAILQ_INSERT_TAIL(&vnic->filter,\n+\t\t\t\t\t\t\t new_filter, next);\n+\t\t\t\t\t/* Inherit MAC from previous filter */\n+\t\t\t\t\tnew_filter->mac_index =\n+\t\t\t\t\t\t\tfilter->mac_index;\n+\t\t\t\t\tmemcpy(new_filter->l2_addr,\n+\t\t\t\t\t filter->l2_addr, ETHER_ADDR_LEN);\n+\t\t\t\t\t/* MAC only filter */\n+\t\t\t\t\trc = bnxt_hwrm_set_filter(bp,\n+\t\t\t\t\t\t\tvnic->fw_vnic_id,\n+\t\t\t\t\t\t\tnew_filter);\n+\t\t\t\t\tif (rc)\n+\t\t\t\t\t\tgoto exit;\n+\t\t\t\t\tRTE_LOG(INFO, PMD,\n+\t\t\t\t\t\t\"Del Vlan filter for %d\\n\",\n+\t\t\t\t\t\tvlan_id);\n+\t\t\t\t}\n+\t\t\t\tfilter = temp_filter;\n+\t\t\t}\n+\t\t}\n+\t}\n+exit:\n+\treturn rc;\n+}\n+\n+static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id)\n+{\n+\tstruct bnxt_filter_info *filter, *temp_filter, *new_filter;\n+\tstruct bnxt_vnic_info *vnic;\n+\tunsigned int i;\n+\tint rc = 0;\n+\tuint32_t en = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN |\n+\t\tHWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN_MASK;\n+\tuint32_t chk = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN;\n+\n+\t/* Cycle through all VNICs */\n+\tfor (i = 0; i < bp->nr_vnics; i++) {\n+\t\t/*\n+\t\t * For each VNIC and each associated filter(s)\n+\t\t * if VLAN exists:\n+\t\t * if VLAN matches vlan_id\n+\t\t * VLAN filter already exists, just skip and continue\n+\t\t * else\n+\t\t * add a new MAC+VLAN filter\n+\t\t * else\n+\t\t * Remove the old MAC only filter\n+\t\t * Add a new MAC+VLAN filter\n+\t\t */\n+\t\tSTAILQ_FOREACH(vnic, &bp->ff_pool[i], next) {\n+\t\t\tfilter = STAILQ_FIRST(&vnic->filter);\n+\t\t\twhile (filter) {\n+\t\t\t\ttemp_filter = STAILQ_NEXT(filter, next);\n+\n+\t\t\t\tif (filter->enables & chk) {\n+\t\t\t\t\tif (filter->l2_ovlan == vlan_id)\n+\t\t\t\t\t\tgoto cont;\n+\t\t\t\t} else {\n+\t\t\t\t\t/* Must delete the MAC filter */\n+\t\t\t\t\tSTAILQ_REMOVE(&vnic->filter, filter,\n+\t\t\t\t\t\t bnxt_filter_info, next);\n+\t\t\t\t\tbnxt_hwrm_clear_filter(bp, filter);\n+\t\t\t\t\tfilter->l2_ovlan = 0;\n+\t\t\t\t\tSTAILQ_INSERT_TAIL(\n+\t\t\t\t\t\t\t&bp->free_filter_list,\n+\t\t\t\t\t\t\tfilter, next);\n+\t\t\t\t}\n+\t\t\t\tnew_filter = bnxt_alloc_filter(bp);\n+\t\t\t\tif (!new_filter) {\n+\t\t\t\t\tRTE_LOG(ERR, PMD,\n+\t\t\t\t\t\t\"MAC/VLAN filter alloc failed\\n\");\n+\t\t\t\t\trc = -ENOMEM;\n+\t\t\t\t\tgoto exit;\n+\t\t\t\t}\n+\t\t\t\tSTAILQ_INSERT_TAIL(&vnic->filter, new_filter,\n+\t\t\t\t\t\t next);\n+\t\t\t\t/* Inherit MAC from the previous filter */\n+\t\t\t\tnew_filter->mac_index = filter->mac_index;\n+\t\t\t\tmemcpy(new_filter->l2_addr, filter->l2_addr,\n+\t\t\t\t ETHER_ADDR_LEN);\n+\t\t\t\t/* MAC + VLAN ID filter */\n+\t\t\t\tnew_filter->l2_ovlan = vlan_id;\n+\t\t\t\tnew_filter->l2_ovlan_mask = 0xF000;\n+\t\t\t\tnew_filter->enables |= en;\n+\t\t\t\trc = bnxt_hwrm_set_filter(bp, vnic->fw_vnic_id,\n+\t\t\t\t\t\t\t new_filter);\n+\t\t\t\tif (rc)\n+\t\t\t\t\tgoto exit;\n+\t\t\t\tRTE_LOG(INFO, PMD,\n+\t\t\t\t\t\"Added Vlan filter for %d\\n\", vlan_id);\n+cont:\n+\t\t\t\tfilter = temp_filter;\n+\t\t\t}\n+\t\t}\n+\t}\n+exit:\n+\treturn rc;\n+}\n+\n+static int bnxt_vlan_filter_set_op(struct rte_eth_dev *eth_dev,\n+\t\t\t\t uint16_t vlan_id, int on)\n+{\n+\tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\n+\n+\t/* These operations apply to ALL existing MAC/VLAN filters */\n+\tif (on)\n+\t\treturn bnxt_add_vlan_filter(bp, vlan_id);\n+\telse\n+\t\treturn bnxt_del_vlan_filter(bp, vlan_id);\n+}\n+\n+static void\n+bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)\n+{\n+\tstruct bnxt *bp = (struct bnxt *)dev->data->dev_private;\n+\tunsigned int i;\n+\n+\tif (mask & ETH_VLAN_FILTER_MASK) {\n+\t\tif (!dev->data->dev_conf.rxmode.hw_vlan_filter) {\n+\t\t\t/* Remove any VLAN filters programmed */\n+\t\t\tfor (i = 0; i < 4095; i++)\n+\t\t\t\tbnxt_del_vlan_filter(bp, i);\n+\t\t}\n+\t\tRTE_LOG(INFO, PMD, \"VLAN Filtering: %d\\n\",\n+\t\t\tdev->data->dev_conf.rxmode.hw_vlan_filter);\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+\t\t\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[i];\n+\t\t\tif (dev->data->dev_conf.rxmode.hw_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\tRTE_LOG(INFO, PMD, \"VLAN Strip Offload: %d\\n\",\n+\t\t\tdev->data->dev_conf.rxmode.hw_vlan_strip);\n+\t}\n+\n+\tif (mask & ETH_VLAN_EXTEND_MASK)\n+\t\tRTE_LOG(ERR, PMD, \"Extend VLAN Not supported\\n\");\n+}\n+\n /*\n * Initialization\n */\n@@ -1124,6 +1323,8 @@ static const struct eth_dev_ops bnxt_dev_ops = {\n \t.flow_ctrl_set = bnxt_flow_ctrl_set_op,\n \t.udp_tunnel_port_add = bnxt_udp_tunnel_port_add_op,\n \t.udp_tunnel_port_del = bnxt_udp_tunnel_port_del_op,\n+\t.vlan_filter_set = bnxt_vlan_filter_set_op,\n+\t.vlan_offload_set = bnxt_vlan_offload_set_op,\n \t.xstats_get = bnxt_dev_xstats_get_op,\n \t.xstats_get_names = bnxt_dev_xstats_get_names_op,\n \t.xstats_reset = bnxt_dev_xstats_reset_op,\n", "prefixes": [ "dpdk-dev", "12/23" ] }