Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/83945/?format=api
{ "id": 83945, "url": "http://patches.dpdk.org/api/patches/83945/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201111064936.768604-3-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-3-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201111064936.768604-3-jiawenwu@trustnetic.com", "date": "2020-11-11T06:49:01", "name": "[v2,02/37] net/txgbe: support ntuple filter add and delete", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "4568ce928243586e057d24a3a2536878a4618270", "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-3-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/83945/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/83945/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 80473A09D2;\n\tWed, 11 Nov 2020 07:48:14 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3DFAD5946;\n\tWed, 11 Nov 2020 07:47:33 +0100 (CET)", "from smtpbg501.qq.com (smtpbg501.qq.com [203.205.250.101])\n by dpdk.org (Postfix) with ESMTP id 5775C2AB\n for <dev@dpdk.org>; Wed, 11 Nov 2020 07:47:28 +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:22 +0800 (CST)" ], "X-QQ-mid": "bizesmtp27t1605077242tolorbea", "X-QQ-SSF": "01400000000000C0C000B00A0000000", "X-QQ-FEAT": "uPKj8ga2w7HRmmfnAvfsgi/aDZOWSODCESpDkhXxzzWCQvYiSmqttU/hwbk9v\n WAGISYgY007d4gnVj1303H/TGj3NKmrbudB8HTd6h9pm2cyQaynDBzEx6mn6ae/Q4DtOyR4\n q7e/Gsfm8GOIj181HI8Tfgdt3psPABSfmvRPVq4TQTiHlLPJWcquqMkRbBhf1a/8yNbZHdL\n twWluuBy5XtTPahjZC2qoSXA2I7dD2OOx/WuA2Oo1/Q/lnvn1IpKpDKHVdEKYJf8OgoeZmg\n yaDse1XwqCZXMoR27ZWAYOR9HxHlfMcKd30padS98TGQeI67kbgnboyu//L5Jwr+EWXMmWV\n DGXFNhrru2XJYfY9Uc=", "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:01 +0800", "Message-Id": "<20201111064936.768604-3-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 02/37] net/txgbe: support ntuple 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 add and delete operations on ntuple filter.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n drivers/net/txgbe/txgbe_ethdev.c | 310 +++++++++++++++++++++++++++++++\n drivers/net/txgbe/txgbe_ethdev.h | 6 +\n 2 files changed, 316 insertions(+)", "diff": "diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c\nindex 626c333e6..3a31d4bba 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.c\n+++ b/drivers/net/txgbe/txgbe_ethdev.c\n@@ -109,6 +109,8 @@ static void txgbe_dev_interrupt_handler(void *param);\n static void txgbe_dev_interrupt_delayed_handler(void *param);\n static void txgbe_configure_msix(struct rte_eth_dev *dev);\n \n+static int txgbe_filter_restore(struct rte_eth_dev *dev);\n+\n #define TXGBE_SET_HWSTRIP(h, q) do {\\\n \t\tuint32_t idx = (q) / (sizeof((h)->bitmap[0]) * NBBY); \\\n \t\tuint32_t bit = (q) % (sizeof((h)->bitmap[0]) * NBBY); \\\n@@ -1611,6 +1613,7 @@ txgbe_dev_start(struct rte_eth_dev *dev)\n \n \t/* resume enabled intr since hw reset */\n \ttxgbe_enable_intr(dev);\n+\ttxgbe_filter_restore(dev);\n \n \t/*\n \t * Update link status right before return, because it may\n@@ -3509,6 +3512,293 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static inline enum txgbe_5tuple_protocol\n+convert_protocol_type(uint8_t protocol_value)\n+{\n+\tif (protocol_value == IPPROTO_TCP)\n+\t\treturn TXGBE_5TF_PROT_TCP;\n+\telse if (protocol_value == IPPROTO_UDP)\n+\t\treturn TXGBE_5TF_PROT_UDP;\n+\telse if (protocol_value == IPPROTO_SCTP)\n+\t\treturn TXGBE_5TF_PROT_SCTP;\n+\telse\n+\t\treturn TXGBE_5TF_PROT_NONE;\n+}\n+\n+/* inject a 5-tuple filter to HW */\n+static inline void\n+txgbe_inject_5tuple_filter(struct rte_eth_dev *dev,\n+\t\t\t struct txgbe_5tuple_filter *filter)\n+{\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tint i;\n+\tuint32_t ftqf, sdpqf;\n+\tuint32_t l34timir = 0;\n+\tuint32_t mask = TXGBE_5TFCTL0_MASK;\n+\n+\ti = filter->index;\n+\tsdpqf = TXGBE_5TFPORT_DST(be_to_le16(filter->filter_info.dst_port));\n+\tsdpqf |= TXGBE_5TFPORT_SRC(be_to_le16(filter->filter_info.src_port));\n+\n+\tftqf = TXGBE_5TFCTL0_PROTO(filter->filter_info.proto);\n+\tftqf |= TXGBE_5TFCTL0_PRI(filter->filter_info.priority);\n+\tif (filter->filter_info.src_ip_mask == 0) /* 0 means compare. */\n+\t\tmask &= ~TXGBE_5TFCTL0_MSADDR;\n+\tif (filter->filter_info.dst_ip_mask == 0)\n+\t\tmask &= ~TXGBE_5TFCTL0_MDADDR;\n+\tif (filter->filter_info.src_port_mask == 0)\n+\t\tmask &= ~TXGBE_5TFCTL0_MSPORT;\n+\tif (filter->filter_info.dst_port_mask == 0)\n+\t\tmask &= ~TXGBE_5TFCTL0_MDPORT;\n+\tif (filter->filter_info.proto_mask == 0)\n+\t\tmask &= ~TXGBE_5TFCTL0_MPROTO;\n+\tftqf |= mask;\n+\tftqf |= TXGBE_5TFCTL0_MPOOL;\n+\tftqf |= TXGBE_5TFCTL0_ENA;\n+\n+\twr32(hw, TXGBE_5TFDADDR(i), be_to_le32(filter->filter_info.dst_ip));\n+\twr32(hw, TXGBE_5TFSADDR(i), be_to_le32(filter->filter_info.src_ip));\n+\twr32(hw, TXGBE_5TFPORT(i), sdpqf);\n+\twr32(hw, TXGBE_5TFCTL0(i), ftqf);\n+\n+\tl34timir |= TXGBE_5TFCTL1_QP(filter->queue);\n+\twr32(hw, TXGBE_5TFCTL1(i), l34timir);\n+}\n+\n+/*\n+ * add a 5tuple filter\n+ *\n+ * @param\n+ * dev: Pointer to struct rte_eth_dev.\n+ * index: the index the filter allocates.\n+ * filter: ponter to the filter that will be added.\n+ * rx_queue: the queue id the filter assigned to.\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value.\n+ */\n+static int\n+txgbe_add_5tuple_filter(struct rte_eth_dev *dev,\n+\t\t\tstruct txgbe_5tuple_filter *filter)\n+{\n+\tstruct txgbe_filter_info *filter_info = TXGBE_DEV_FILTER(dev);\n+\tint i, idx, shift;\n+\n+\t/*\n+\t * look for an unused 5tuple filter index,\n+\t * and insert the filter to list.\n+\t */\n+\tfor (i = 0; i < TXGBE_MAX_FTQF_FILTERS; i++) {\n+\t\tidx = i / (sizeof(uint32_t) * NBBY);\n+\t\tshift = i % (sizeof(uint32_t) * NBBY);\n+\t\tif (!(filter_info->fivetuple_mask[idx] & (1 << shift))) {\n+\t\t\tfilter_info->fivetuple_mask[idx] |= 1 << shift;\n+\t\t\tfilter->index = i;\n+\t\t\tTAILQ_INSERT_TAIL(&filter_info->fivetuple_list,\n+\t\t\t\t\t filter,\n+\t\t\t\t\t entries);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\tif (i >= TXGBE_MAX_FTQF_FILTERS) {\n+\t\tPMD_DRV_LOG(ERR, \"5tuple filters are full.\");\n+\t\treturn -ENOSYS;\n+\t}\n+\n+\ttxgbe_inject_5tuple_filter(dev, filter);\n+\n+\treturn 0;\n+}\n+\n+/*\n+ * remove a 5tuple filter\n+ *\n+ * @param\n+ * dev: Pointer to struct rte_eth_dev.\n+ * filter: the pointer of the filter will be removed.\n+ */\n+static void\n+txgbe_remove_5tuple_filter(struct rte_eth_dev *dev,\n+\t\t\tstruct txgbe_5tuple_filter *filter)\n+{\n+\tstruct txgbe_hw *hw = TXGBE_DEV_HW(dev);\n+\tstruct txgbe_filter_info *filter_info = TXGBE_DEV_FILTER(dev);\n+\tuint16_t index = filter->index;\n+\n+\tfilter_info->fivetuple_mask[index / (sizeof(uint32_t) * NBBY)] &=\n+\t\t\t\t~(1 << (index % (sizeof(uint32_t) * NBBY)));\n+\tTAILQ_REMOVE(&filter_info->fivetuple_list, filter, entries);\n+\trte_free(filter);\n+\n+\twr32(hw, TXGBE_5TFDADDR(index), 0);\n+\twr32(hw, TXGBE_5TFSADDR(index), 0);\n+\twr32(hw, TXGBE_5TFPORT(index), 0);\n+\twr32(hw, TXGBE_5TFCTL0(index), 0);\n+\twr32(hw, TXGBE_5TFCTL1(index), 0);\n+}\n+\n+static inline struct txgbe_5tuple_filter *\n+txgbe_5tuple_filter_lookup(struct txgbe_5tuple_filter_list *filter_list,\n+\t\t\tstruct txgbe_5tuple_filter_info *key)\n+{\n+\tstruct txgbe_5tuple_filter *it;\n+\n+\tTAILQ_FOREACH(it, filter_list, entries) {\n+\t\tif (memcmp(key, &it->filter_info,\n+\t\t\tsizeof(struct txgbe_5tuple_filter_info)) == 0) {\n+\t\t\treturn it;\n+\t\t}\n+\t}\n+\treturn NULL;\n+}\n+\n+/* translate elements in struct rte_eth_ntuple_filter\n+ * to struct txgbe_5tuple_filter_info\n+ */\n+static inline int\n+ntuple_filter_to_5tuple(struct rte_eth_ntuple_filter *filter,\n+\t\t\tstruct txgbe_5tuple_filter_info *filter_info)\n+{\n+\tif (filter->queue >= TXGBE_MAX_RX_QUEUE_NUM ||\n+\t\tfilter->priority > TXGBE_5TUPLE_MAX_PRI ||\n+\t\tfilter->priority < TXGBE_5TUPLE_MIN_PRI)\n+\t\treturn -EINVAL;\n+\n+\tswitch (filter->dst_ip_mask) {\n+\tcase UINT32_MAX:\n+\t\tfilter_info->dst_ip_mask = 0;\n+\t\tfilter_info->dst_ip = filter->dst_ip;\n+\t\tbreak;\n+\tcase 0:\n+\t\tfilter_info->dst_ip_mask = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"invalid dst_ip mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tswitch (filter->src_ip_mask) {\n+\tcase UINT32_MAX:\n+\t\tfilter_info->src_ip_mask = 0;\n+\t\tfilter_info->src_ip = filter->src_ip;\n+\t\tbreak;\n+\tcase 0:\n+\t\tfilter_info->src_ip_mask = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"invalid src_ip mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tswitch (filter->dst_port_mask) {\n+\tcase UINT16_MAX:\n+\t\tfilter_info->dst_port_mask = 0;\n+\t\tfilter_info->dst_port = filter->dst_port;\n+\t\tbreak;\n+\tcase 0:\n+\t\tfilter_info->dst_port_mask = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"invalid dst_port mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tswitch (filter->src_port_mask) {\n+\tcase UINT16_MAX:\n+\t\tfilter_info->src_port_mask = 0;\n+\t\tfilter_info->src_port = filter->src_port;\n+\t\tbreak;\n+\tcase 0:\n+\t\tfilter_info->src_port_mask = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"invalid src_port mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tswitch (filter->proto_mask) {\n+\tcase UINT8_MAX:\n+\t\tfilter_info->proto_mask = 0;\n+\t\tfilter_info->proto =\n+\t\t\tconvert_protocol_type(filter->proto);\n+\t\tbreak;\n+\tcase 0:\n+\t\tfilter_info->proto_mask = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"invalid protocol mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfilter_info->priority = (uint8_t)filter->priority;\n+\treturn 0;\n+}\n+\n+/*\n+ * add or delete a ntuple filter\n+ *\n+ * @param\n+ * dev: Pointer to struct rte_eth_dev.\n+ * ntuple_filter: Pointer to struct rte_eth_ntuple_filter\n+ * add: if true, add filter, if false, remove filter\n+ *\n+ * @return\n+ * - On success, zero.\n+ * - On failure, a negative value.\n+ */\n+int\n+txgbe_add_del_ntuple_filter(struct rte_eth_dev *dev,\n+\t\t\tstruct rte_eth_ntuple_filter *ntuple_filter,\n+\t\t\tbool add)\n+{\n+\tstruct txgbe_filter_info *filter_info = TXGBE_DEV_FILTER(dev);\n+\tstruct txgbe_5tuple_filter_info filter_5tuple;\n+\tstruct txgbe_5tuple_filter *filter;\n+\tint ret;\n+\n+\tif (ntuple_filter->flags != RTE_5TUPLE_FLAGS) {\n+\t\tPMD_DRV_LOG(ERR, \"only 5tuple is supported.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tmemset(&filter_5tuple, 0, sizeof(struct txgbe_5tuple_filter_info));\n+\tret = ntuple_filter_to_5tuple(ntuple_filter, &filter_5tuple);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tfilter = txgbe_5tuple_filter_lookup(&filter_info->fivetuple_list,\n+\t\t\t\t\t &filter_5tuple);\n+\tif (filter != NULL && add) {\n+\t\tPMD_DRV_LOG(ERR, \"filter exists.\");\n+\t\treturn -EEXIST;\n+\t}\n+\tif (filter == NULL && !add) {\n+\t\tPMD_DRV_LOG(ERR, \"filter doesn't exist.\");\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tif (add) {\n+\t\tfilter = rte_zmalloc(\"txgbe_5tuple_filter\",\n+\t\t\t\tsizeof(struct txgbe_5tuple_filter), 0);\n+\t\tif (filter == NULL)\n+\t\t\treturn -ENOMEM;\n+\t\trte_memcpy(&filter->filter_info,\n+\t\t\t\t &filter_5tuple,\n+\t\t\t\t sizeof(struct txgbe_5tuple_filter_info));\n+\t\tfilter->queue = ntuple_filter->queue;\n+\t\tret = txgbe_add_5tuple_filter(dev, filter);\n+\t\tif (ret < 0) {\n+\t\t\trte_free(filter);\n+\t\t\treturn ret;\n+\t\t}\n+\t} else {\n+\t\ttxgbe_remove_5tuple_filter(dev, filter);\n+\t}\n+\n+\treturn 0;\n+}\n+\n static u8 *\n txgbe_dev_addr_list_itr(__rte_unused struct txgbe_hw *hw,\n \t\t\tu8 **mc_addr_ptr, u32 *vmdq)\n@@ -4030,6 +4320,26 @@ txgbe_dev_get_dcb_info(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+/* restore n-tuple filter */\n+static inline void\n+txgbe_ntuple_filter_restore(struct rte_eth_dev *dev)\n+{\n+\tstruct txgbe_filter_info *filter_info = TXGBE_DEV_FILTER(dev);\n+\tstruct txgbe_5tuple_filter *node;\n+\n+\tTAILQ_FOREACH(node, &filter_info->fivetuple_list, entries) {\n+\t\ttxgbe_inject_5tuple_filter(dev, node);\n+\t}\n+}\n+\n+static int\n+txgbe_filter_restore(struct rte_eth_dev *dev)\n+{\n+\ttxgbe_ntuple_filter_restore(dev);\n+\n+\treturn 0;\n+}\n+\n static const struct eth_dev_ops txgbe_eth_dev_ops = {\n \t.dev_configure = txgbe_dev_configure,\n \t.dev_infos_get = txgbe_dev_info_get,\ndiff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h\nindex 4ba42a737..b4804ee1c 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.h\n+++ b/drivers/net/txgbe/txgbe_ethdev.h\n@@ -39,6 +39,9 @@\n \n #define TXGBE_MAX_QUEUE_NUM_PER_VF 8\n \n+#define TXGBE_5TUPLE_MAX_PRI 7\n+#define TXGBE_5TUPLE_MIN_PRI 1\n+\n #define TXGBE_RSS_OFFLOAD_ALL ( \\\n \tETH_RSS_IPV4 | \\\n \tETH_RSS_NONFRAG_IPV4_TCP | \\\n@@ -311,6 +314,9 @@ int txgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n \n bool txgbe_rss_update_sp(enum txgbe_mac_type mac_type);\n \n+int txgbe_add_del_ntuple_filter(struct rte_eth_dev *dev,\n+\t\t\tstruct rte_eth_ntuple_filter *filter,\n+\t\t\tbool add);\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", "02/37" ] }