Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/83956/?format=api
{ "id": 83956, "url": "http://patches.dpdk.org/api/patches/83956/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201111064936.768604-12-jiawenwu@trustnetic.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": "<20201111064936.768604-12-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201111064936.768604-12-jiawenwu@trustnetic.com", "date": "2020-11-11T06:49:10", "name": "[v2,11/37] net/txgbe: support L2 tunnel filter add and delete", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "657f0eddb398e0bddec02d91d65dd7f4ad732bd9", "submitter": { "id": 1932, "url": "http://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.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/20201111064936.768604-12-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 13798, "url": "http://patches.dpdk.org/api/series/13798/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13798", "date": "2020-11-11T06:49:00", "name": "net: add txgbe PMD part 2", "version": 2, "mbox": "http://patches.dpdk.org/series/13798/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/83956/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/83956/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 C74C1A09D2;\n\tWed, 11 Nov 2020 07:52:08 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 367FFACA2;\n\tWed, 11 Nov 2020 07:47:54 +0100 (CET)", "from smtpbg506.qq.com (smtpbg506.qq.com [203.205.250.33])\n by dpdk.org (Postfix) with ESMTP id 20EFD5AA7\n for <dev@dpdk.org>; Wed, 11 Nov 2020 07:47:42 +0100 (CET)", "from localhost.localdomain.com (unknown [183.129.236.74])\n by esmtp10.qq.com (ESMTP) with\n id ; Wed, 11 Nov 2020 14:47:34 +0800 (CST)" ], "X-QQ-mid": "bizesmtp27t1605077254ty8c9o4w", "X-QQ-SSF": "01400000000000C0C000B00A0000000", "X-QQ-FEAT": "Zxv4QyQ/lFbOuH7PypfRME4IV9Wzt6K9NHPPCv59TtRVFQ+QwjoA6QfkXg2Rg\n M46fpcsHOuCBz64dMAc9eLHDPgq3KGA4wfOIVwFMOy+x12XK5CXwJ6bmMIROvGqCK0gfNrD\n toRI9OwG11B3T9fiVebPqs3xayf9Al0Yr67NcOyGsVCinsRDxTc6ahYl3CXqN4KveCsEiPX\n 3b/uNHb2yRMomLaL1wTvezR2EBejTgQkWqib4GsK7/wlWlbMGH8+jzCOEsQ7OXo+s5uPhwT\n xOpczdv6YcsW21vMdXlTxKRTD8IUipEBHGsL8NzCoy+bDhdl8E/6hE879bFCzgjyEoi8L6G\n nmBRTqKhH7M3+pXkl2Qj14j6N6mlw==", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Wed, 11 Nov 2020 14:49:10 +0800", "Message-Id": "<20201111064936.768604-12-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.18.4", "In-Reply-To": "<20201111064936.768604-1-jiawenwu@trustnetic.com>", "References": "<20201111064936.768604-1-jiawenwu@trustnetic.com>", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign7", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v2 11/37] net/txgbe: support L2 tunnel filter add\n\tand delete", "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": "Support L2 tunnel filter add and delete operations.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n drivers/net/txgbe/txgbe_ethdev.c | 230 +++++++++++++++++++++++++++++++\n drivers/net/txgbe/txgbe_ethdev.h | 18 +++\n 2 files changed, 248 insertions(+)", "diff": "diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c\nindex 21369d40f..e4154c4b9 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.c\n+++ b/drivers/net/txgbe/txgbe_ethdev.c\n@@ -4526,6 +4526,219 @@ txgbe_e_tag_enable(struct txgbe_hw *hw)\n \treturn 0;\n }\n \n+static int\n+txgbe_e_tag_filter_del(struct rte_eth_dev *dev,\n+\t\t struct txgbe_l2_tunnel_conf *l2_tunnel)\n+{\n+\tint ret = 0;\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tuint32_t i, rar_entries;\n+\tuint32_t rar_low, rar_high;\n+\n+\trar_entries = hw->mac.num_rar_entries;\n+\n+\tfor (i = 1; i < rar_entries; i++) {\n+\t\twr32(hw, TXGBE_ETHADDRIDX, i);\n+\t\trar_high = rd32(hw, TXGBE_ETHADDRH);\n+\t\trar_low = rd32(hw, TXGBE_ETHADDRL);\n+\t\tif ((rar_high & TXGBE_ETHADDRH_VLD) &&\n+\t\t (rar_high & TXGBE_ETHADDRH_ETAG) &&\n+\t\t (TXGBE_ETHADDRL_ETAG(rar_low) ==\n+\t\t l2_tunnel->tunnel_id)) {\n+\t\t\twr32(hw, TXGBE_ETHADDRL, 0);\n+\t\t\twr32(hw, TXGBE_ETHADDRH, 0);\n+\n+\t\t\ttxgbe_clear_vmdq(hw, i, BIT_MASK32);\n+\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+txgbe_e_tag_filter_add(struct rte_eth_dev *dev,\n+\t\t struct txgbe_l2_tunnel_conf *l2_tunnel)\n+{\n+\tint ret = 0;\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tuint32_t i, rar_entries;\n+\tuint32_t rar_low, rar_high;\n+\n+\t/* One entry for one tunnel. Try to remove potential existing entry. */\n+\ttxgbe_e_tag_filter_del(dev, l2_tunnel);\n+\n+\trar_entries = hw->mac.num_rar_entries;\n+\n+\tfor (i = 1; i < rar_entries; i++) {\n+\t\twr32(hw, TXGBE_ETHADDRIDX, i);\n+\t\trar_high = rd32(hw, TXGBE_ETHADDRH);\n+\t\tif (rar_high & TXGBE_ETHADDRH_VLD) {\n+\t\t\tcontinue;\n+\t\t} else {\n+\t\t\ttxgbe_set_vmdq(hw, i, l2_tunnel->pool);\n+\t\t\trar_high = TXGBE_ETHADDRH_VLD | TXGBE_ETHADDRH_ETAG;\n+\t\t\trar_low = l2_tunnel->tunnel_id;\n+\n+\t\t\twr32(hw, TXGBE_ETHADDRL, rar_low);\n+\t\t\twr32(hw, TXGBE_ETHADDRH, rar_high);\n+\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\tPMD_INIT_LOG(NOTICE, \"The table of E-tag forwarding rule is full.\"\n+\t\t \" Please remove a rule before adding a new one.\");\n+\treturn -EINVAL;\n+}\n+\n+static inline struct txgbe_l2_tn_filter *\n+txgbe_l2_tn_filter_lookup(struct txgbe_l2_tn_info *l2_tn_info,\n+\t\t\t struct txgbe_l2_tn_key *key)\n+{\n+\tint ret;\n+\n+\tret = rte_hash_lookup(l2_tn_info->hash_handle, (const void *)key);\n+\tif (ret < 0)\n+\t\treturn NULL;\n+\n+\treturn l2_tn_info->hash_map[ret];\n+}\n+\n+static inline int\n+txgbe_insert_l2_tn_filter(struct txgbe_l2_tn_info *l2_tn_info,\n+\t\t\t struct txgbe_l2_tn_filter *l2_tn_filter)\n+{\n+\tint ret;\n+\n+\tret = rte_hash_add_key(l2_tn_info->hash_handle,\n+\t\t\t &l2_tn_filter->key);\n+\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"Failed to insert L2 tunnel filter\"\n+\t\t\t \" to hash table %d!\",\n+\t\t\t ret);\n+\t\treturn ret;\n+\t}\n+\n+\tl2_tn_info->hash_map[ret] = l2_tn_filter;\n+\n+\tTAILQ_INSERT_TAIL(&l2_tn_info->l2_tn_list, l2_tn_filter, entries);\n+\n+\treturn 0;\n+}\n+\n+static inline int\n+txgbe_remove_l2_tn_filter(struct txgbe_l2_tn_info *l2_tn_info,\n+\t\t\t struct txgbe_l2_tn_key *key)\n+{\n+\tint ret;\n+\tstruct txgbe_l2_tn_filter *l2_tn_filter;\n+\n+\tret = rte_hash_del_key(l2_tn_info->hash_handle, key);\n+\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"No such L2 tunnel filter to delete %d!\",\n+\t\t\t ret);\n+\t\treturn ret;\n+\t}\n+\n+\tl2_tn_filter = l2_tn_info->hash_map[ret];\n+\tl2_tn_info->hash_map[ret] = NULL;\n+\n+\tTAILQ_REMOVE(&l2_tn_info->l2_tn_list, l2_tn_filter, entries);\n+\trte_free(l2_tn_filter);\n+\n+\treturn 0;\n+}\n+\n+/* Add l2 tunnel filter */\n+int\n+txgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,\n+\t\t\t struct txgbe_l2_tunnel_conf *l2_tunnel,\n+\t\t\t bool restore)\n+{\n+\tint ret;\n+\tstruct txgbe_l2_tn_info *l2_tn_info = TXGBE_DEV_L2_TN(dev);\n+\tstruct txgbe_l2_tn_key key;\n+\tstruct txgbe_l2_tn_filter *node;\n+\n+\tif (!restore) {\n+\t\tkey.l2_tn_type = l2_tunnel->l2_tunnel_type;\n+\t\tkey.tn_id = l2_tunnel->tunnel_id;\n+\n+\t\tnode = txgbe_l2_tn_filter_lookup(l2_tn_info, &key);\n+\n+\t\tif (node) {\n+\t\t\tPMD_DRV_LOG(ERR,\n+\t\t\t\t \"The L2 tunnel filter already exists!\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tnode = rte_zmalloc(\"txgbe_l2_tn\",\n+\t\t\t\t sizeof(struct txgbe_l2_tn_filter),\n+\t\t\t\t 0);\n+\t\tif (!node)\n+\t\t\treturn -ENOMEM;\n+\n+\t\trte_memcpy(&node->key,\n+\t\t\t\t &key,\n+\t\t\t\t sizeof(struct txgbe_l2_tn_key));\n+\t\tnode->pool = l2_tunnel->pool;\n+\t\tret = txgbe_insert_l2_tn_filter(l2_tn_info, node);\n+\t\tif (ret < 0) {\n+\t\t\trte_free(node);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\tswitch (l2_tunnel->l2_tunnel_type) {\n+\tcase RTE_L2_TUNNEL_TYPE_E_TAG:\n+\t\tret = txgbe_e_tag_filter_add(dev, l2_tunnel);\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Invalid tunnel type\");\n+\t\tret = -EINVAL;\n+\t\tbreak;\n+\t}\n+\n+\tif (!restore && ret < 0)\n+\t\t(void)txgbe_remove_l2_tn_filter(l2_tn_info, &key);\n+\n+\treturn ret;\n+}\n+\n+/* Delete l2 tunnel filter */\n+int\n+txgbe_dev_l2_tunnel_filter_del(struct rte_eth_dev *dev,\n+\t\t\t struct txgbe_l2_tunnel_conf *l2_tunnel)\n+{\n+\tint ret;\n+\tstruct txgbe_l2_tn_info *l2_tn_info = TXGBE_DEV_L2_TN(dev);\n+\tstruct txgbe_l2_tn_key key;\n+\n+\tkey.l2_tn_type = l2_tunnel->l2_tunnel_type;\n+\tkey.tn_id = l2_tunnel->tunnel_id;\n+\tret = txgbe_remove_l2_tn_filter(l2_tn_info, &key);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tswitch (l2_tunnel->l2_tunnel_type) {\n+\tcase RTE_L2_TUNNEL_TYPE_E_TAG:\n+\t\tret = txgbe_e_tag_filter_del(dev, l2_tunnel);\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Invalid tunnel type\");\n+\t\tret = -EINVAL;\n+\t\tbreak;\n+\t}\n+\n+\treturn ret;\n+}\n+\n static int\n txgbe_e_tag_forwarding_en_dis(struct rte_eth_dev *dev, bool en)\n {\n@@ -4589,12 +4802,29 @@ txgbe_syn_filter_restore(struct rte_eth_dev *dev)\n \t}\n }\n \n+/* restore L2 tunnel filter */\n+static inline void\n+txgbe_l2_tn_filter_restore(struct rte_eth_dev *dev)\n+{\n+\tstruct txgbe_l2_tn_info *l2_tn_info = TXGBE_DEV_L2_TN(dev);\n+\tstruct txgbe_l2_tn_filter *node;\n+\tstruct txgbe_l2_tunnel_conf l2_tn_conf;\n+\n+\tTAILQ_FOREACH(node, &l2_tn_info->l2_tn_list, entries) {\n+\t\tl2_tn_conf.l2_tunnel_type = node->key.l2_tn_type;\n+\t\tl2_tn_conf.tunnel_id = node->key.tn_id;\n+\t\tl2_tn_conf.pool = node->pool;\n+\t\t(void)txgbe_dev_l2_tunnel_filter_add(dev, &l2_tn_conf, TRUE);\n+\t}\n+}\n+\n static int\n txgbe_filter_restore(struct rte_eth_dev *dev)\n {\n \ttxgbe_ntuple_filter_restore(dev);\n \ttxgbe_ethertype_filter_restore(dev);\n \ttxgbe_syn_filter_restore(dev);\n+\ttxgbe_l2_tn_filter_restore(dev);\n \n \treturn 0;\n }\ndiff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h\nindex d6487beb0..2fbfc7940 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.h\n+++ b/drivers/net/txgbe/txgbe_ethdev.h\n@@ -358,6 +358,24 @@ int txgbe_syn_filter_set(struct rte_eth_dev *dev,\n \t\t\tstruct rte_eth_syn_filter *filter,\n \t\t\tbool add);\n \n+/**\n+ * l2 tunnel configuration.\n+ */\n+struct txgbe_l2_tunnel_conf {\n+\tenum rte_eth_tunnel_type l2_tunnel_type;\n+\tuint16_t ether_type; /* ether type in l2 header */\n+\tuint32_t tunnel_id; /* port tag id for e-tag */\n+\tuint16_t vf_id; /* VF id for tag insertion */\n+\tuint32_t pool; /* destination pool for tag based forwarding */\n+};\n+\n+int\n+txgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,\n+\t\t\t struct txgbe_l2_tunnel_conf *l2_tunnel,\n+\t\t\t bool restore);\n+int\n+txgbe_dev_l2_tunnel_filter_del(struct rte_eth_dev *dev,\n+\t\t\t struct txgbe_l2_tunnel_conf *l2_tunnel);\n void txgbe_set_ivar_map(struct txgbe_hw *hw, int8_t direction,\n \t\t\t uint8_t queue, uint8_t msix_vector);\n \n", "prefixes": [ "v2", "11/37" ] }