Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/59754/?format=api
{ "id": 59754, "url": "http://patches.dpdk.org/api/patches/59754/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/6351438f3543ad7170a4b9c28484c863938af1e4.1569421287.git.cloud.wangxiaoyun@huawei.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": "<6351438f3543ad7170a4b9c28484c863938af1e4.1569421287.git.cloud.wangxiaoyun@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/6351438f3543ad7170a4b9c28484c863938af1e4.1569421287.git.cloud.wangxiaoyun@huawei.com", "date": "2019-09-25T14:30:38", "name": "[v2,10/17] net/hinic: create and destroy fdir filter", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f6a5c01dcca0c79a3dd2f7acb42e75f0e89ae662", "submitter": { "id": 1446, "url": "http://patches.dpdk.org/api/people/1446/?format=api", "name": "Wangxiaoyun (Cloud)", "email": "cloud.wangxiaoyun@huawei.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/6351438f3543ad7170a4b9c28484c863938af1e4.1569421287.git.cloud.wangxiaoyun@huawei.com/mbox/", "series": [ { "id": 6529, "url": "http://patches.dpdk.org/api/series/6529/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6529", "date": "2019-09-25T14:26:40", "name": "Add advanced features for Huawei hinic pmd", "version": 2, "mbox": "http://patches.dpdk.org/series/6529/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/59754/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/59754/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 0359B1BEE0;\n\tWed, 25 Sep 2019 16:16:58 +0200 (CEST)", "from huawei.com (szxga05-in.huawei.com [45.249.212.191])\n\tby dpdk.org (Postfix) with ESMTP id 36CD01BEC9\n\tfor <dev@dpdk.org>; Wed, 25 Sep 2019 16:16:54 +0200 (CEST)", "from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.60])\n\tby Forcepoint Email with ESMTP id 1CE1BBC35CFB0BFD7910\n\tfor <dev@dpdk.org>; Wed, 25 Sep 2019 22:16:52 +0800 (CST)", "from tester.localdomain (10.175.119.39) by\n\tDGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP\n\tServer id 14.3.439.0; Wed, 25 Sep 2019 22:16:41 +0800" ], "From": "Xiaoyun wang <cloud.wangxiaoyun@huawei.com>", "To": "<ferruh.yigit@intel.com>", "CC": "<dev@dpdk.org>, <xuanziyang2@huawei.com>, <shahar.belkar@huawei.com>,\n\t<luoxianjun@huawei.com>, <tanya.brokhman@huawei.com>,\n\t<zhouguoyang@huawei.com>, <wulike1@huawei.com>, Xiaoyun wang\n\t<cloud.wangxiaoyun@huawei.com>", "Date": "Wed, 25 Sep 2019 22:30:38 +0800", "Message-ID": "<6351438f3543ad7170a4b9c28484c863938af1e4.1569421287.git.cloud.wangxiaoyun@huawei.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<cover.1569421286.git.cloud.wangxiaoyun@huawei.com>", "References": "<cover.1569421286.git.cloud.wangxiaoyun@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.175.119.39]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH v2 10/17] net/hinic: create and destroy fdir\n\tfilter", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add support for creating/destroying fdir filter.\nThe filter rule includes LACP,ARP and ICMP packet type.\n\nSigned-off-by: Xiaoyun wang <cloud.wangxiaoyun@huawei.com>\n---\n drivers/net/hinic/hinic_pmd_ethdev.h | 16 ++\n drivers/net/hinic/hinic_pmd_flow.c | 423 +++++++++++++++++++++++++++++++++--\n 2 files changed, 422 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/hinic/hinic_pmd_ethdev.h b/drivers/net/hinic/hinic_pmd_ethdev.h\nindex 93cd6a7..b7fcef6 100644\n--- a/drivers/net/hinic/hinic_pmd_ethdev.h\n+++ b/drivers/net/hinic/hinic_pmd_ethdev.h\n@@ -117,6 +117,18 @@ struct hinic_ntuple_filter_ele {\n \tstruct rte_eth_ntuple_filter filter_info;\n };\n \n+/* ethertype filter list structure */\n+struct hinic_ethertype_filter_ele {\n+\tTAILQ_ENTRY(hinic_ethertype_filter_ele) entries;\n+\tstruct rte_eth_ethertype_filter filter_info;\n+};\n+\n+/* fdir filter list structure */\n+struct hinic_fdir_rule_ele {\n+\tTAILQ_ENTRY(hinic_fdir_rule_ele) entries;\n+\tstruct hinic_fdir_rule filter_info;\n+};\n+\n struct rte_flow {\n \tenum rte_filter_type filter_type;\n \tvoid *rule;\n@@ -129,6 +141,8 @@ struct hinic_flow_mem {\n };\n \n TAILQ_HEAD(hinic_ntuple_filter_list, hinic_ntuple_filter_ele);\n+TAILQ_HEAD(hinic_ethertype_filter_list, hinic_ethertype_filter_ele);\n+TAILQ_HEAD(hinic_fdir_rule_filter_list, hinic_fdir_rule_ele);\n TAILQ_HEAD(hinic_flow_mem_list, hinic_flow_mem);\n \n extern const struct rte_flow_ops hinic_flow_ops;\n@@ -168,6 +182,8 @@ struct hinic_nic_dev {\n \n \tstruct hinic_filter_info filter;\n \tstruct hinic_ntuple_filter_list filter_ntuple_list;\n+\tstruct hinic_ethertype_filter_list filter_ethertype_list;\n+\tstruct hinic_fdir_rule_filter_list filter_fdir_rule_list;\n \tstruct hinic_flow_mem_list hinic_flow_list;\n };\n \ndiff --git a/drivers/net/hinic/hinic_pmd_flow.c b/drivers/net/hinic/hinic_pmd_flow.c\nindex 73a336a..b2eff2e 100644\n--- a/drivers/net/hinic/hinic_pmd_flow.c\n+++ b/drivers/net/hinic/hinic_pmd_flow.c\n@@ -82,6 +82,19 @@\n #define HINIC_DEV_PRIVATE_TO_FILTER_INFO(nic_dev) \\\n \t(&((struct hinic_nic_dev *)nic_dev)->filter)\n \n+enum hinic_atr_flow_type {\n+\tHINIC_ATR_FLOW_TYPE_IPV4_DIP = 0x1,\n+\tHINIC_ATR_FLOW_TYPE_IPV4_SIP = 0x2,\n+\tHINIC_ATR_FLOW_TYPE_DPORT = 0x3,\n+\tHINIC_ATR_FLOW_TYPE_SPORT = 0x4,\n+};\n+\n+/* Structure to store fdir's info. */\n+struct hinic_fdir_info {\n+\tuint8_t fdir_flag;\n+\tuint8_t qid;\n+\tuint32_t fdir_key;\n+};\n \n /**\n * Endless loop will never happen with below assumption\n@@ -1340,6 +1353,29 @@ static int hinic_flow_validate(struct rte_eth_dev *dev,\n \treturn NULL;\n }\n \n+static int hinic_set_lacp_tcam(struct hinic_nic_dev *nic_dev)\n+{\n+\tstruct tag_pa_rule lacp_rule;\n+\tstruct tag_pa_action lacp_action;\n+\n+\tmemset(&lacp_rule, 0, sizeof(lacp_rule));\n+\tmemset(&lacp_action, 0, sizeof(lacp_action));\n+\t/* LACP TCAM rule */\n+\tlacp_rule.eth_type = PA_ETH_TYPE_OTHER;\n+\tlacp_rule.l2_header.eth_type.val16 = 0x8809;\n+\tlacp_rule.l2_header.eth_type.mask16 = 0xffff;\n+\n+\t/* LACP TCAM action */\n+\tlacp_action.err_type = 0x3f; /* err from ipsu, not convert */\n+\tlacp_action.fwd_action = 0x7; /* 0x3:drop; 0x7: not convert */\n+\tlacp_action.pkt_type = PKT_LACP_TYPE;\n+\tlacp_action.pri = 0x0;\n+\tlacp_action.push_len = 0xf; /* push_len:0xf, not convert */\n+\n+\treturn hinic_set_fdir_tcam(nic_dev->hwdev, TCAM_PKT_LACP,\n+\t\t\t\t\t&lacp_rule, &lacp_action);\n+}\n+\n static int hinic_set_bgp_dport_tcam(struct hinic_nic_dev *nic_dev)\n {\n \tstruct tag_pa_rule bgp_rule;\n@@ -1722,6 +1758,276 @@ static int hinic_add_del_ntuple_filter(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+static inline int\n+hinic_check_ethertype_filter(struct rte_eth_ethertype_filter *filter)\n+{\n+\tif (filter->queue >= HINIC_MAX_RX_QUEUE_NUM)\n+\t\treturn -EINVAL;\n+\n+\tif (filter->ether_type == RTE_ETHER_TYPE_IPV4 ||\n+\t\tfilter->ether_type == RTE_ETHER_TYPE_IPV6) {\n+\t\tPMD_DRV_LOG(ERR, \"Unsupported ether_type(0x%04x) in\"\n+\t\t\t\" ethertype filter\", filter->ether_type);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (filter->flags & RTE_ETHTYPE_FLAGS_MAC) {\n+\t\tPMD_DRV_LOG(ERR, \"Mac compare is not supported\");\n+\t\treturn -EINVAL;\n+\t}\n+\tif (filter->flags & RTE_ETHTYPE_FLAGS_DROP) {\n+\t\tPMD_DRV_LOG(ERR, \"Drop option is not supported\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static inline int\n+hinic_ethertype_filter_lookup(struct hinic_filter_info *filter_info,\n+\t\t\t struct hinic_pkt_filter *ethertype_filter)\n+{\n+\tswitch (ethertype_filter->pkt_proto) {\n+\tcase RTE_ETHER_TYPE_SLOW:\n+\t\tfilter_info->pkt_type = PKT_LACP_TYPE;\n+\t\tbreak;\n+\n+\tcase RTE_ETHER_TYPE_ARP:\n+\t\tfilter_info->pkt_type = PKT_ARP_TYPE;\n+\t\tbreak;\n+\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Just support LACP/ARP for ethertype filters\");\n+\t\treturn -EIO;\n+\t}\n+\n+\treturn HINIC_PKT_TYPE_FIND_ID(filter_info->pkt_type);\n+}\n+\n+static inline int\n+hinic_ethertype_filter_insert(struct hinic_filter_info *filter_info,\n+\t\t\t struct hinic_pkt_filter *ethertype_filter)\n+{\n+\tint id;\n+\n+\t/* Find LACP or VRRP type id */\n+\tid = hinic_ethertype_filter_lookup(filter_info, ethertype_filter);\n+\tif (id < 0)\n+\t\treturn -EINVAL;\n+\n+\tif (!(filter_info->type_mask & (1 << id))) {\n+\t\tfilter_info->type_mask |= 1 << id;\n+\t\tfilter_info->pkt_filters[id].pkt_proto =\n+\t\t\tethertype_filter->pkt_proto;\n+\t\tfilter_info->pkt_filters[id].enable = ethertype_filter->enable;\n+\t\tfilter_info->qid = ethertype_filter->qid;\n+\t\treturn id;\n+\t}\n+\n+\tPMD_DRV_LOG(ERR, \"Filter type: %d exists\", id);\n+\treturn -EINVAL;\n+}\n+\n+static inline void\n+hinic_ethertype_filter_remove(struct hinic_filter_info *filter_info,\n+\t\t\t uint8_t idx)\n+{\n+\tif (idx >= HINIC_MAX_Q_FILTERS)\n+\t\treturn;\n+\n+\tfilter_info->pkt_type = 0;\n+\tfilter_info->type_mask &= ~(1 << idx);\n+\tfilter_info->pkt_filters[idx].pkt_proto = (uint16_t)0;\n+\tfilter_info->pkt_filters[idx].enable = FALSE;\n+\tfilter_info->pkt_filters[idx].qid = 0;\n+}\n+\n+static inline int\n+hinic_add_del_ethertype_filter(struct rte_eth_dev *dev,\n+\t\t\t struct rte_eth_ethertype_filter *filter,\n+\t\t\t bool add)\n+{\n+\tstruct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);\n+\tstruct hinic_filter_info *filter_info =\n+\t\tHINIC_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);\n+\tstruct hinic_pkt_filter ethertype_filter;\n+\tint i;\n+\tint ret_fw;\n+\n+\tif (hinic_check_ethertype_filter(filter))\n+\t\treturn -EINVAL;\n+\n+\tif (add) {\n+\t\tethertype_filter.pkt_proto = filter->ether_type;\n+\t\tethertype_filter.enable = TRUE;\n+\t\tethertype_filter.qid = (u8)filter->queue;\n+\t\ti = hinic_ethertype_filter_insert(filter_info,\n+\t\t\t\t\t\t ðertype_filter);\n+\t\tif (i < 0)\n+\t\t\treturn -ENOSPC;\n+\n+\t\tret_fw = hinic_set_fdir_filter(nic_dev->hwdev,\n+\t\t\t\tfilter_info->pkt_type, filter_info->qid,\n+\t\t\t\tfilter_info->pkt_filters[i].enable, true);\n+\t\tif (ret_fw) {\n+\t\t\tPMD_DRV_LOG(ERR, \"add ethertype failed, type: 0x%x, qid: 0x%x, enable: 0x%x\",\n+\t\t\t\tfilter_info->pkt_type, filter->queue,\n+\t\t\t\tfilter_info->pkt_filters[i].enable);\n+\n+\t\t\thinic_ethertype_filter_remove(filter_info, i);\n+\t\t\treturn -ENOENT;\n+\t\t}\n+\t\tPMD_DRV_LOG(INFO, \"Add ethertype succeed, type: 0x%x, qid: 0x%x, enable: 0x%x\",\n+\t\t\t\tfilter_info->pkt_type, filter->queue,\n+\t\t\t\tfilter_info->pkt_filters[i].enable);\n+\n+\t\tswitch (ethertype_filter.pkt_proto) {\n+\t\tcase RTE_ETHER_TYPE_SLOW:\n+\t\t\tret_fw = hinic_set_lacp_tcam(nic_dev);\n+\t\t\tif (ret_fw) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Add lacp tcam failed\");\n+\t\t\t\thinic_ethertype_filter_remove(filter_info, i);\n+\t\t\t\treturn -ENOENT;\n+\t\t\t}\n+\n+\t\t\tPMD_DRV_LOG(INFO, \"Add lacp tcam succeed\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\n+\t} else {\n+\t\tethertype_filter.pkt_proto = filter->ether_type;\n+\t\ti = hinic_ethertype_filter_lookup(filter_info,\n+\t\t\t\t\t\tðertype_filter);\n+\n+\t\tif ((filter_info->type_mask & (1 << i))) {\n+\t\t\tfilter_info->pkt_filters[i].enable = FALSE;\n+\t\t\t(void)hinic_set_fdir_filter(nic_dev->hwdev,\n+\t\t\t\t\tfilter_info->pkt_type,\n+\t\t\t\t\tfilter_info->pkt_filters[i].qid,\n+\t\t\t\t\tfilter_info->pkt_filters[i].enable,\n+\t\t\t\t\ttrue);\n+\n+\t\t\tPMD_DRV_LOG(INFO, \"Del ethertype succeed, type: 0x%x, qid: 0x%x, enable: 0x%x\",\n+\t\t\t\t\tfilter_info->pkt_type,\n+\t\t\t\t\tfilter_info->pkt_filters[i].qid,\n+\t\t\t\t\tfilter_info->pkt_filters[i].enable);\n+\n+\t\t\tswitch (ethertype_filter.pkt_proto) {\n+\t\t\tcase RTE_ETHER_TYPE_SLOW:\n+\t\t\t\t(void)hinic_clear_fdir_tcam(nic_dev->hwdev,\n+\t\t\t\t\t\t\t\tTCAM_PKT_LACP);\n+\t\t\t\tPMD_DRV_LOG(INFO,\n+\t\t\t\t\t\"Del lacp tcam succeed\");\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\thinic_ethertype_filter_remove(filter_info, i);\n+\n+\t\t} else {\n+\t\t\tPMD_DRV_LOG(ERR, \"Ethertype doesn't exist, type: 0x%x, qid: 0x%x, enable: 0x%x\",\n+\t\t\t\t\tfilter_info->pkt_type, filter->queue,\n+\t\t\t\t\tfilter_info->pkt_filters[i].enable);\n+\t\t\treturn -ENOENT;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+hinic_fdir_info_init(struct hinic_fdir_rule *rule,\n+\t\t struct hinic_fdir_info *fdir_info)\n+{\n+\tswitch (rule->mask.src_ipv4_mask) {\n+\tcase UINT32_MAX:\n+\t\tfdir_info->fdir_flag = HINIC_ATR_FLOW_TYPE_IPV4_SIP;\n+\t\tfdir_info->qid = rule->queue;\n+\t\tfdir_info->fdir_key = rule->hinic_fdir.src_ip;\n+\t\treturn 0;\n+\n+\tcase 0:\n+\t\tbreak;\n+\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Invalid src_ip mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tswitch (rule->mask.dst_ipv4_mask) {\n+\tcase UINT32_MAX:\n+\t\tfdir_info->fdir_flag = HINIC_ATR_FLOW_TYPE_IPV4_DIP;\n+\t\tfdir_info->qid = rule->queue;\n+\t\tfdir_info->fdir_key = rule->hinic_fdir.dst_ip;\n+\t\treturn 0;\n+\n+\tcase 0:\n+\t\tbreak;\n+\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \"Invalid dst_ip mask.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (fdir_info->fdir_flag == 0) {\n+\t\tPMD_DRV_LOG(ERR, \"All support mask is NULL.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static inline int\n+hinic_add_del_fdir_filter(struct rte_eth_dev *dev,\n+\t\t\t struct hinic_fdir_rule *rule,\n+\t\t\t bool add)\n+{\n+\tstruct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);\n+\tstruct hinic_fdir_info fdir_info;\n+\tint ret;\n+\n+\tmemset(&fdir_info, 0, sizeof(struct hinic_fdir_info));\n+\n+\tret = hinic_fdir_info_init(rule, &fdir_info);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Init hinic fdir info failed!\");\n+\t\treturn ret;\n+\t}\n+\n+\tif (add) {\n+\t\tret = hinic_set_normal_filter(nic_dev->hwdev, fdir_info.qid,\n+\t\t\t\t\t\ttrue, fdir_info.fdir_key,\n+\t\t\t\t\t\ttrue, fdir_info.fdir_flag);\n+\t\tif (ret) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Add fdir filter failed, flag: 0x%x, qid: 0x%x, key: 0x%x\",\n+\t\t\t\t\tfdir_info.fdir_flag, fdir_info.qid,\n+\t\t\t\t\tfdir_info.fdir_key);\n+\t\t\treturn -ENOENT;\n+\t\t}\n+\t\tPMD_DRV_LOG(INFO, \"Add fdir filter succeed, flag: 0x%x, qid: 0x%x, key: 0x%x\",\n+\t\t\t\tfdir_info.fdir_flag, fdir_info.qid,\n+\t\t\t\tfdir_info.fdir_key);\n+\t} else {\n+\t\tret = hinic_set_normal_filter(nic_dev->hwdev, fdir_info.qid,\n+\t\t\t\t\t\tfalse, fdir_info.fdir_key, true,\n+\t\t\t\t\t\tfdir_info.fdir_flag);\n+\t\tif (ret) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Del fdir filter ailed, flag: 0x%x, qid: 0x%x, key: 0x%x\",\n+\t\t\t\tfdir_info.fdir_flag, fdir_info.qid,\n+\t\t\t\tfdir_info.fdir_key);\n+\t\t\treturn -ENOENT;\n+\t\t}\n+\t\tPMD_DRV_LOG(INFO, \"Del fdir filter succeed, flag: 0x%x, qid: 0x%x, key: 0x%x\",\n+\t\t\t\tfdir_info.fdir_flag, fdir_info.qid,\n+\t\t\t\tfdir_info.fdir_key);\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * Create or destroy a flow rule.\n * Theorically one rule can match more than one filters.\n@@ -1736,8 +2042,12 @@ static struct rte_flow *hinic_flow_create(struct rte_eth_dev *dev,\n {\n \tint ret;\n \tstruct rte_eth_ntuple_filter ntuple_filter;\n+\tstruct rte_eth_ethertype_filter ethertype_filter;\n+\tstruct hinic_fdir_rule fdir_rule;\n \tstruct rte_flow *flow = NULL;\n+\tstruct hinic_ethertype_filter_ele *ethertype_filter_ptr;\n \tstruct hinic_ntuple_filter_ele *ntuple_filter_ptr;\n+\tstruct hinic_fdir_rule_ele *fdir_rule_ptr;\n \tstruct hinic_flow_mem *hinic_flow_mem_ptr;\n \tstruct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);\n \n@@ -1759,29 +2069,78 @@ static struct rte_flow *hinic_flow_create(struct rte_eth_dev *dev,\n \tTAILQ_INSERT_TAIL(&nic_dev->hinic_flow_list, hinic_flow_mem_ptr,\n \t\t\t\tentries);\n \n-\t/* add ntuple filter */\n+\t/* Add ntuple filter */\n \tmemset(&ntuple_filter, 0, sizeof(struct rte_eth_ntuple_filter));\n \tret = hinic_parse_ntuple_filter(dev, attr, pattern,\n \t\t\tactions, &ntuple_filter, error);\n-\tif (ret)\n+\tif (!ret) {\n+\t\tret = hinic_add_del_ntuple_filter(dev, &ntuple_filter, TRUE);\n+\t\tif (!ret) {\n+\t\t\tntuple_filter_ptr = rte_zmalloc(\"hinic_ntuple_filter\",\n+\t\t\t\tsizeof(struct hinic_ntuple_filter_ele), 0);\n+\t\t\trte_memcpy(&ntuple_filter_ptr->filter_info,\n+\t\t\t\t &ntuple_filter,\n+\t\t\t\t sizeof(struct rte_eth_ntuple_filter));\n+\t\t\tTAILQ_INSERT_TAIL(&nic_dev->filter_ntuple_list,\n+\t\t\tntuple_filter_ptr, entries);\n+\t\t\tflow->rule = ntuple_filter_ptr;\n+\t\t\tflow->filter_type = RTE_ETH_FILTER_NTUPLE;\n+\n+\t\t\tPMD_DRV_LOG(INFO, \"Create flow ntuple succeed, func_id: 0x%x\",\n+\t\t\thinic_global_func_id(nic_dev->hwdev));\n+\t\t\treturn flow;\n+\t\t}\n+\t\tgoto out;\n+\t}\n+\n+\t/* Add ethertype filter */\n+\tmemset(ðertype_filter, 0, sizeof(struct rte_eth_ethertype_filter));\n+\tret = hinic_parse_ethertype_filter(dev, attr, pattern, actions,\n+\t\t\t\t\tðertype_filter, error);\n+\tif (!ret) {\n+\t\tret = hinic_add_del_ethertype_filter(dev, ðertype_filter,\n+\t\t\t\t\t\t TRUE);\n+\t\tif (!ret) {\n+\t\t\tethertype_filter_ptr =\n+\t\t\t\trte_zmalloc(\"hinic_ethertype_filter\",\n+\t\t\t\tsizeof(struct hinic_ethertype_filter_ele), 0);\n+\t\t\trte_memcpy(ðertype_filter_ptr->filter_info,\n+\t\t\t\tðertype_filter,\n+\t\t\t\tsizeof(struct rte_eth_ethertype_filter));\n+\t\t\tTAILQ_INSERT_TAIL(&nic_dev->filter_ethertype_list,\n+\t\t\t\tethertype_filter_ptr, entries);\n+\t\t\tflow->rule = ethertype_filter_ptr;\n+\t\t\tflow->filter_type = RTE_ETH_FILTER_ETHERTYPE;\n+\n+\t\t\tPMD_DRV_LOG(INFO, \"Create flow ethertype succeed, func_id: 0x%x\",\n+\t\t\t\t\thinic_global_func_id(nic_dev->hwdev));\n+\t\t\treturn flow;\n+\t\t}\n \t\tgoto out;\n+\t}\n \n-\tret = hinic_add_del_ntuple_filter(dev, &ntuple_filter, TRUE);\n-\tif (ret)\n+\t/* Add fdir filter */\n+\tmemset(&fdir_rule, 0, sizeof(struct hinic_fdir_rule));\n+\tret = hinic_parse_fdir_filter(dev, attr, pattern,\n+\t\t\t\t actions, &fdir_rule, error);\n+\tif (!ret) {\n+\t\tret = hinic_add_del_fdir_filter(dev, &fdir_rule, TRUE);\n+\t\tif (!ret) {\n+\t\t\tfdir_rule_ptr = rte_zmalloc(\"hinic_fdir_rule\",\n+\t\t\t\tsizeof(struct hinic_fdir_rule_ele), 0);\n+\t\t\trte_memcpy(&fdir_rule_ptr->filter_info, &fdir_rule,\n+\t\t\t\tsizeof(struct hinic_fdir_rule));\n+\t\t\tTAILQ_INSERT_TAIL(&nic_dev->filter_fdir_rule_list,\n+\t\t\t\tfdir_rule_ptr, entries);\n+\t\t\tflow->rule = fdir_rule_ptr;\n+\t\t\tflow->filter_type = RTE_ETH_FILTER_FDIR;\n+\n+\t\t\tPMD_DRV_LOG(INFO, \"Create flow fdir rule succeed, func_id : 0x%x\",\n+\t\t\t\t\thinic_global_func_id(nic_dev->hwdev));\n+\t\t\treturn flow;\n+\t\t}\n \t\tgoto out;\n-\tntuple_filter_ptr = rte_zmalloc(\"hinic_ntuple_filter\",\n-\t\t\tsizeof(struct hinic_ntuple_filter_ele), 0);\n-\trte_memcpy(&ntuple_filter_ptr->filter_info,\n-\t\t &ntuple_filter,\n-\t\t sizeof(struct rte_eth_ntuple_filter));\n-\tTAILQ_INSERT_TAIL(&nic_dev->filter_ntuple_list,\n-\tntuple_filter_ptr, entries);\n-\tflow->rule = ntuple_filter_ptr;\n-\tflow->filter_type = RTE_ETH_FILTER_NTUPLE;\n-\n-\tPMD_DRV_LOG(INFO, \"Create flow ntuple succeed, func_id: 0x%x\",\n-\thinic_global_func_id(nic_dev->hwdev));\n-\treturn flow;\n+\t}\n \n out:\n \tTAILQ_REMOVE(&nic_dev->hinic_flow_list, hinic_flow_mem_ptr, entries);\n@@ -1802,7 +2161,11 @@ static int hinic_flow_destroy(struct rte_eth_dev *dev,\n \tstruct rte_flow *pmd_flow = flow;\n \tenum rte_filter_type filter_type = pmd_flow->filter_type;\n \tstruct rte_eth_ntuple_filter ntuple_filter;\n+\tstruct rte_eth_ethertype_filter ethertype_filter;\n+\tstruct hinic_fdir_rule fdir_rule;\n \tstruct hinic_ntuple_filter_ele *ntuple_filter_ptr;\n+\tstruct hinic_ethertype_filter_ele *ethertype_filter_ptr;\n+\tstruct hinic_fdir_rule_ele *fdir_rule_ptr;\n \tstruct hinic_flow_mem *hinic_flow_mem_ptr;\n \tstruct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);\n \n@@ -1819,6 +2182,32 @@ static int hinic_flow_destroy(struct rte_eth_dev *dev,\n \t\t\trte_free(ntuple_filter_ptr);\n \t\t}\n \t\tbreak;\n+\tcase RTE_ETH_FILTER_ETHERTYPE:\n+\t\tethertype_filter_ptr = (struct hinic_ethertype_filter_ele *)\n+\t\t\t\t\tpmd_flow->rule;\n+\t\trte_memcpy(ðertype_filter,\n+\t\t\tðertype_filter_ptr->filter_info,\n+\t\t\tsizeof(struct rte_eth_ethertype_filter));\n+\t\tret = hinic_add_del_ethertype_filter(dev,\n+\t\t\t\tðertype_filter, FALSE);\n+\t\tif (!ret) {\n+\t\t\tTAILQ_REMOVE(&nic_dev->filter_ethertype_list,\n+\t\t\t\tethertype_filter_ptr, entries);\n+\t\t\trte_free(ethertype_filter_ptr);\n+\t\t}\n+\t\tbreak;\n+\tcase RTE_ETH_FILTER_FDIR:\n+\t\tfdir_rule_ptr = (struct hinic_fdir_rule_ele *)pmd_flow->rule;\n+\t\trte_memcpy(&fdir_rule,\n+\t\t\t&fdir_rule_ptr->filter_info,\n+\t\t\tsizeof(struct hinic_fdir_rule));\n+\t\tret = hinic_add_del_fdir_filter(dev, &fdir_rule, FALSE);\n+\t\tif (!ret) {\n+\t\t\tTAILQ_REMOVE(&nic_dev->filter_fdir_rule_list,\n+\t\t\t\tfdir_rule_ptr, entries);\n+\t\t\trte_free(fdir_rule_ptr);\n+\t\t}\n+\t\tbreak;\n \tdefault:\n \t\tPMD_DRV_LOG(WARNING, \"Filter type (%d) not supported\",\n \t\t\tfilter_type);\n", "prefixes": [ "v2", "10/17" ] }