From patchwork Fri Dec 2 11:53:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 17376 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C9944FA73; Fri, 2 Dec 2016 05:14:21 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 19C57591E for ; Fri, 2 Dec 2016 05:13:30 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 01 Dec 2016 20:13:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,284,1477983600"; d="scan'208";a="907853589" Received: from dpdk9.sh.intel.com ([10.239.129.141]) by orsmga003.jf.intel.com with ESMTP; 01 Dec 2016 20:13:16 -0800 From: Beilei Xing To: jingjing.wu@intel.com, helin.zhang@intel.com Cc: dev@dpdk.org, wenzhuo.lu@intel.com Date: Fri, 2 Dec 2016 06:53:37 -0500 Message-Id: <1480679625-4157-17-git-send-email-beilei.xing@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1480679625-4157-1-git-send-email-beilei.xing@intel.com> References: <1480679625-4157-1-git-send-email-beilei.xing@intel.com> Subject: [dpdk-dev] [PATCH 16/24] net/i40e: add flow create function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds flow create ops. Signed-off-by: Beilei Xing --- drivers/net/i40e/i40e_ethdev.c | 93 ++++++++++++++++++++++++++++++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 3 ++ drivers/net/i40e/i40e_fdir.c | 2 +- 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 12255fa..ac93489 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -512,6 +512,17 @@ static int i40e_flow_validate(__rte_unused struct rte_eth_dev *dev, const struct rte_flow_item *pattern, const struct rte_flow_action *actions, struct rte_flow_error *error); +static struct i40e_flow *i40e_flow_create(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_item *pattern, + const struct rte_flow_action *actions, + struct rte_flow_error *error); + +struct i40e_flow { + enum rte_filter_type filter_type; + void *rule; + struct i40e_vsi *vsi; +}; static const struct rte_pci_id pci_id_i40e_map[] = { { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_XL710) }, @@ -609,6 +620,7 @@ static const struct eth_dev_ops i40e_eth_dev_ops = { static const struct rte_flow_ops i40e_flow_ops = { .validate = i40e_flow_validate, + .create = (void *)i40e_flow_create, }; /* store statistics names and its offset in stats structure */ @@ -11572,3 +11584,84 @@ i40e_flow_validate(__rte_unused struct rte_eth_dev *dev, return ret; } + +static struct i40e_flow * +i40e_flow_create(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_item *pattern, + const struct rte_flow_action *actions, + struct rte_flow_error *error) +{ + struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); + struct rte_eth_ethertype_filter ethertype_filter; + struct rte_eth_fdir_filter fdir_filter; + struct rte_eth_mac_filter macvlan_filter; + struct rte_eth_tunnel_filter_conf tunnel_filter; + struct i40e_flow *flow = NULL; + int ret; + + flow = rte_zmalloc("i40e_flow", sizeof(struct i40e_flow), 0); + if (!flow) { + PMD_DRV_LOG(ERR, "failed to allocate memory"); + return flow; + } + + memset(ðertype_filter, 0, sizeof(struct rte_eth_ethertype_filter)); + ret = cons_parse_ethertype_filter(attr, pattern, actions, + ðertype_filter, error); + if (!ret) { + ret = i40e_ethertype_filter_set(pf, ðertype_filter, 1); + if (ret) + goto free; + flow->filter_type = RTE_ETH_FILTER_ETHERTYPE; + flow->rule = TAILQ_LAST(&pf->ethertype.ethertype_list, + i40e_ethertype_filter_list); + return flow; + } + + memset(&fdir_filter, 0, sizeof(struct rte_eth_fdir_filter)); + ret = i40e_parse_fdir_filter(attr, pattern, actions, + &fdir_filter, error); + if (!ret) { + ret = i40e_add_del_fdir_filter(dev, &fdir_filter, 1); + if (ret) + goto free; + flow->filter_type = RTE_ETH_FILTER_FDIR; + flow->rule = TAILQ_LAST(&pf->fdir.fdir_list, + i40e_fdir_filter_list); + return flow; + } + + memset(&macvlan_filter, 0, sizeof(struct rte_eth_mac_filter)); + ret = i40e_parse_macvlan_filter(attr, pattern, actions, + &macvlan_filter, error); + if (!ret) { + struct i40e_vsi *vsi; + + ret = i40e_vf_mac_filter_set(pf, &macvlan_filter, 1); + if (ret) + goto free; + flow->filter_type = RTE_ETH_FILTER_MACVLAN; + vsi = pf->vfs[macvlan_filter.dst_id].vsi; + flow->vsi = vsi; + flow->rule = TAILQ_LAST(&vsi->mac_list, i40e_mac_filter_list); + return flow; + } + + memset(&tunnel_filter, 0, sizeof(struct rte_eth_tunnel_filter_conf)); + ret = i40e_parse_tunnel_filter(attr, pattern, actions, + &tunnel_filter, error); + if (!ret) { + ret = i40e_dev_tunnel_filter_set(pf, &tunnel_filter, 1); + if (ret) + goto free; + flow->filter_type = RTE_ETH_FILTER_TUNNEL; + flow->rule = TAILQ_LAST(&pf->tunnel.tunnel_list, + i40e_tunnel_filter_list); + return flow; + } + +free: + rte_free(flow); + return NULL; +} diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 35ac6d6..9b60651 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -684,6 +684,9 @@ int i40e_select_filter_input_set(struct i40e_hw *hw, struct rte_eth_input_set_conf *conf, enum rte_filter_type filter); void i40e_fdir_filter_restore(struct i40e_pf *pf); +int i40e_add_del_fdir_filter(struct rte_eth_dev *dev, + const struct rte_eth_fdir_filter *filter, + bool add); int i40e_hash_filter_inset_select(struct i40e_hw *hw, struct rte_eth_input_set_conf *conf); int i40e_fdir_filter_inset_select(struct i40e_pf *pf, diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index e47a949..30fcd5c 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1093,7 +1093,7 @@ i40e_sw_fdir_filter_del(struct i40e_pf *pf, struct i40e_fdir_filter *filter) * @filter: fdir filter entry * @add: 0 - delete, 1 - add */ -static int +int i40e_add_del_fdir_filter(struct rte_eth_dev *dev, const struct rte_eth_fdir_filter *filter, bool add)