From: "Xing, Beilei" <beilei.xing@intel.com>
To: "Yang, Qiming" <qiming.yang@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "Zhao1, Wei" <wei.zhao1@intel.com>
Subject: Re: [dpdk-dev] [PATCH v2 1/3] net/ice: enable switch filter
Date: Mon, 17 Jun 2019 05:27:18 +0000 [thread overview]
Message-ID: <94479800C636CB44BD422CB454846E013CDE5B2E@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <20190612075029.109914-2-qiming.yang@intel.com>
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qiming Yang
> Sent: Wednesday, June 12, 2019 3:50 PM
> To: dev@dpdk.org
> Cc: Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [dpdk-dev] [PATCH v2 1/3] net/ice: enable switch filter
>
> From: wei zhao <wei.zhao1@intel.com>
>
> The patch enables the backend of rte_flow. It transfers rte_flow_xxx to
> device specific data structure and configures packet process engine's binary
> classifier
> (switch) properly.
>
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> ---
> drivers/net/ice/Makefile | 1 +
> drivers/net/ice/ice_ethdev.h | 6 +
> drivers/net/ice/ice_switch_filter.c | 502
> ++++++++++++++++++++++++++++++++++++
> drivers/net/ice/ice_switch_filter.h | 28 ++
> drivers/net/ice/meson.build | 3 +-
> 5 files changed, 539 insertions(+), 1 deletion(-) create mode 100644
> drivers/net/ice/ice_switch_filter.c
> create mode 100644 drivers/net/ice/ice_switch_filter.h
>
> diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile index
> 0e5c55e..b10d826 100644
> --- a/drivers/net/ice/Makefile
> +++ b/drivers/net/ice/Makefile
> @@ -60,6 +60,7 @@ ifeq ($(CONFIG_RTE_ARCH_X86), y)
> SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c endif
>
> +SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c
> ifeq ($(findstring
> RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
> CC_AVX2_SUPPORT=1
> else
> diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> 1385afa..67a358a 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -234,6 +234,12 @@ struct ice_vsi {
> bool offset_loaded;
> };
>
> +/* Struct to store flow created. */
> +struct rte_flow {
> + TAILQ_ENTRY(rte_flow) node;
> +void *rule;
> +};
> +
> struct ice_pf {
> struct ice_adapter *adapter; /* The adapter this PF associate to */
> struct ice_vsi *main_vsi; /* pointer to main VSI structure */ diff --git
> a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
> new file mode 100644
> index 0000000..e679675
> --- /dev/null
> +++ b/drivers/net/ice/ice_switch_filter.c
> @@ -0,0 +1,502 @@
> +#include <sys/queue.h>
> +#include <stdio.h>
> +#include <errno.h>
> +#include <stdint.h>
> +#include <string.h>
> +#include <unistd.h>
> +#include <stdarg.h>
> +
> +#include <rte_debug.h>
> +#include <rte_ether.h>
> +#include <rte_ethdev_driver.h>
> +#include <rte_log.h>
> +#include <rte_malloc.h>
> +#include <rte_eth_ctrl.h>
> +#include <rte_tailq.h>
> +#include <rte_flow_driver.h>
> +
> +#include "ice_logs.h"
> +#include "base/ice_type.h"
> +#include "ice_switch_filter.h"
> +
> +static int
> +ice_parse_switch_filter(
> + const struct rte_flow_item pattern[],
> + const struct rte_flow_action actions[],
> + struct rte_flow_error *error,
> + struct ice_adv_rule_info *rule_info,
> + struct ice_adv_lkup_elem **lkup_list,
> + uint16_t *lkups_num)
> +{
> + const struct rte_flow_item *item = pattern;
> + enum rte_flow_item_type item_type;
> + const struct rte_flow_item_eth *eth_spec, *eth_mask;
> + const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask;
> + const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask;
> + const struct rte_flow_item_tcp *tcp_spec, *tcp_mask;
> + const struct rte_flow_item_udp *udp_spec, *udp_mask;
> + const struct rte_flow_item_sctp *sctp_spec, *sctp_mask;
> + const struct rte_flow_item_nvgre *nvgre_spec, *nvgre_mask;
> + const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask;
> + struct ice_adv_lkup_elem *list;
> + uint16_t i, j, t = 0;
> + uint16_t item_num = 0;
> + enum ice_sw_tunnel_type tun_type = ICE_NON_TUN;
> +
> + for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
> + if (item->type == RTE_FLOW_ITEM_TYPE_ETH ||
> + item->type == RTE_FLOW_ITEM_TYPE_IPV4 ||
> + item->type == RTE_FLOW_ITEM_TYPE_IPV6 ||
> + item->type == RTE_FLOW_ITEM_TYPE_UDP ||
> + item->type == RTE_FLOW_ITEM_TYPE_TCP ||
> + item->type == RTE_FLOW_ITEM_TYPE_SCTP ||
> + item->type == RTE_FLOW_ITEM_TYPE_VXLAN ||
> + item->type == RTE_FLOW_ITEM_TYPE_NVGRE)
> + item_num++;
> + }
I think the pattern is verified in generic flow framework, so how about removing the condition here?
...
> +
> +/* By now ice switch filter action code implement only
> +* supports QUEUE or DROP.
> +*/
> +static int
> +ice_parse_switch_action(struct ice_pf *pf,
> + const struct rte_flow_action *actions,
> + struct rte_flow_error *error,
> + struct ice_adv_rule_info *rule_info) {
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> + struct ice_vsi *vsi = pf->main_vsi;
> + const struct rte_flow_action *act;
> + const struct rte_flow_action_queue *act_q;
> + uint16_t base_queue, index = 0;
> + uint32_t reg;
> +
> + /* Check if the first non-void action is QUEUE or DROP. */
> + NEXT_ITEM_OF_ACTION(act, actions, index);
> + if (act->type != RTE_FLOW_ACTION_TYPE_QUEUE &&
> + act->type != RTE_FLOW_ACTION_TYPE_DROP) {
> + rte_flow_error_set(error, EINVAL,
> RTE_FLOW_ERROR_TYPE_ACTION,
> + act, "Not supported action.");
> + return -rte_errno;
> + }
> + reg = ICE_READ_REG(hw, PFLAN_RX_QALLOC);
> + if (reg & PFLAN_RX_QALLOC_VALID_M) {
> + base_queue = reg & PFLAN_RX_QALLOC_FIRSTQ_M;
> + } else {
> + rte_flow_error_set(error, EINVAL,
> + RTE_FLOW_ERROR_TYPE_ACTION,
> + act, "Invalid queue register");
> + return -rte_errno;
> + }
> + if (act->type == RTE_FLOW_ACTION_TYPE_QUEUE) {
> + act_q = act->conf;
> + rule_info->sw_act.fltr_act = ICE_FWD_TO_Q;
> + rule_info->sw_act.fwd_id.q_id = base_queue + act_q->index;
> + if (act_q->index >= pf->dev_data->nb_rx_queues) {
> + rte_flow_error_set(error, EINVAL,
> + RTE_FLOW_ERROR_TYPE_ACTION,
> + act, "Invalid queue ID for"
> + " switch filter.");
> + return -rte_errno;
> + }
> + } else {
> + rule_info->sw_act.fltr_act = ICE_DROP_PACKET;
> + }
> +
> + rule_info->sw_act.vsi_handle = vsi->idx;
> + rule_info->rx = 1;
> + rule_info->sw_act.src = vsi->idx;
> +
> + /* Check if the next non-void item is END */
> + index++;
> + NEXT_ITEM_OF_ACTION(act, actions, index);
> + if (act->type != RTE_FLOW_ACTION_TYPE_END) {
> + rte_flow_error_set(error, EINVAL,
> RTE_FLOW_ERROR_TYPE_ACTION,
> + act, "Not supported action.");
> + return -rte_errno;
> + }
> +
> + return 0;
> +}
How about use supported array to replace NEXT_ITEM_OF_ACTION? Just like pattern.
> +
> +static int
> +ice_switch_rule_set(struct ice_pf *pf,
> + struct ice_adv_lkup_elem *list,
> + uint16_t lkups_cnt,
> + struct ice_adv_rule_info *rule_info,
> + struct rte_flow *flow)
> +{
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> + int ret;
> + struct ice_rule_query_data rule_added = {0};
> + struct ice_rule_query_data *filter_ptr;
> +
> + if (lkups_cnt > ICE_MAX_CHAIN_WORDS) {
> + PMD_DRV_LOG(ERR, "item number too large for rule");
> + return -ENOTSUP;
> + }
> + if (!list) {
> + PMD_DRV_LOG(ERR, "lookup list should not be NULL");
> + return -ENOTSUP;
> + }
> +
> + ret = ice_add_adv_rule(hw, list, lkups_cnt, rule_info, &rule_added);
> +
> + if (!ret) {
> + filter_ptr = rte_zmalloc("ice_switch_filter",
> + sizeof(struct ice_rule_query_data), 0);
> + if (!filter_ptr) {
> + PMD_DRV_LOG(ERR, "failed to allocate memory");
> + return -EINVAL;
> + }
> + flow->rule = filter_ptr;
> + rte_memcpy(filter_ptr,
> + &rule_added,
> + sizeof(struct ice_rule_query_data));
> + }
> +
> + return ret;
> +}
> +
> +int
> +ice_create_switch_filter(struct ice_pf *pf,
> + const struct rte_flow_item pattern[],
> + const struct rte_flow_action actions[],
> + struct rte_flow *flow,
> + struct rte_flow_error *error)
> +{
> + int ret = 0;
> + struct ice_adv_rule_info rule_info = {0};
> + struct ice_adv_lkup_elem *list = NULL;
> + uint16_t lkups_num = 0;
> +
> + ret = ice_parse_switch_filter(pattern, actions, error,
> + &rule_info, &list, &lkups_num);
> + if (ret)
> + goto out;
> +
> + ret = ice_parse_switch_action(pf, actions, error, &rule_info);
> + if (ret)
> + goto out;
> +
> + ret = ice_switch_rule_set(pf, list, lkups_num, &rule_info, flow);
> + if (ret)
> + goto out;
> +
> + rte_free(list);
Why allocate list is not in the function?
> + return 0;
> +
> +out:
> + rte_free(list);
> +
> + return -rte_errno;
> +}
> +
> +int
> +ice_destroy_switch_filter(struct ice_pf *pf,
> + struct rte_flow *flow)
> +{
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> + int ret;
> + struct ice_rule_query_data *filter_ptr;
> + struct ice_rule_query_data rule_added;
> +
> + filter_ptr = (struct ice_rule_query_data *)
> + flow->rule;
> + rte_memcpy(&rule_added, filter_ptr,
> + sizeof(struct ice_rule_query_data));
> +
> + if (!filter_ptr) {
> + PMD_DRV_LOG(ERR, "no such flow"
> + " create by switch filter");
> + return -EINVAL;
> + }
How about add struct rte_flow_error *error as the parameter, and use rte_flow_error_set here?
> +
> + ret = ice_rem_adv_rule_by_id(hw, &rule_added);
> +
> + rte_free(filter_ptr);
> +
> + return ret;
> +}
> +
> +void
> +ice_free_switch_filter_rule(void *rule) {
> + struct ice_rule_query_data *filter_ptr;
> +
> + filter_ptr = (struct ice_rule_query_data *)rule;
> +
> + rte_free(filter_ptr);
> +}
> diff --git a/drivers/net/ice/ice_switch_filter.h
> b/drivers/net/ice/ice_switch_filter.h
> new file mode 100644
> index 0000000..957d0d1
> --- /dev/null
> +++ b/drivers/net/ice/ice_switch_filter.h
> @@ -0,0 +1,28 @@
> +#ifndef _ICE_SWITCH_FILTER_H_
> +#define _ICE_SWITCH_FILTER_H_
> +
> +#include "base/ice_switch.h"
> +#include "base/ice_type.h"
> +#include "ice_ethdev.h"
> +
> +#define NEXT_ITEM_OF_ACTION(act, actions, index) \
> + do { \
> + act = actions + index; \
> + while (act->type == RTE_FLOW_ACTION_TYPE_VOID) { \
> + index++; \
> + act = actions + index; \
> + } \
> + } while (0)
> +
> +int
> +ice_create_switch_filter(struct ice_pf *pf,
> + const struct rte_flow_item pattern[],
> + const struct rte_flow_action actions[],
> + struct rte_flow *flow,
> + struct rte_flow_error *error);
> +int
> +ice_destroy_switch_filter(struct ice_pf *pf,
> + struct rte_flow *flow);
> +void
> +ice_free_switch_filter_rule(void *rule); #endif /*
> +_ICE_SWITCH_FILTER_H_ */
> diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build index
> 2bec688..8697676 100644
> --- a/drivers/net/ice/meson.build
> +++ b/drivers/net/ice/meson.build
> @@ -6,7 +6,8 @@ objs = [base_objs]
>
> sources = files(
> 'ice_ethdev.c',
> - 'ice_rxtx.c'
> + 'ice_rxtx.c',
> + 'ice_switch_filter.c'
> )
>
> deps += ['hash']
> --
> 2.9.5
next prev parent reply other threads:[~2019-06-17 5:27 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 9:05 [dpdk-dev] [PATCH 0/2] Enable rte_flow API in ice driver Qiming Yang
2019-06-03 9:05 ` [dpdk-dev] [PATCH 1/2] net/ice: enable switch filter Qiming Yang
2019-06-03 17:07 ` Aaron Conole
2019-06-04 2:02 ` Zhao1, Wei
2019-06-03 9:05 ` [dpdk-dev] [PATCH 2/2] net/ice: add generic flow API Qiming Yang
2019-06-12 7:50 ` [dpdk-dev] [PATCH v2 0/3] Enable rte_flow API in ice driver Qiming Yang
2019-06-12 7:50 ` [dpdk-dev] [PATCH v2 1/3] net/ice: enable switch filter Qiming Yang
2019-06-13 8:23 ` Wang, Xiao W
2019-06-14 9:46 ` Zhao1, Wei
2019-06-17 8:28 ` Wang, Xiao W
2019-06-18 1:57 ` Zhao1, Wei
2019-06-17 5:27 ` Xing, Beilei [this message]
2019-06-17 8:23 ` Zhao1, Wei
2019-06-17 8:51 ` Zhao1, Wei
2019-06-18 1:50 ` Xing, Beilei
2019-06-18 9:40 ` Ye Xiaolong
2019-06-19 3:06 ` Zhao1, Wei
2019-06-12 7:50 ` [dpdk-dev] [PATCH v2 2/3] net/ice: add generic flow API Qiming Yang
2019-06-17 5:50 ` Xing, Beilei
2019-06-17 6:02 ` Xing, Beilei
2019-06-17 9:19 ` Wang, Xiao W
2019-06-12 7:50 ` [dpdk-dev] [PATCH v2 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-20 5:34 ` [dpdk-dev] [PATCH v3 0/3] Enable rte_flow API in ice driver Qiming Yang
2019-06-20 5:34 ` [dpdk-dev] [PATCH v3 1/3] net/ice: enable switch filter Qiming Yang
2019-06-20 9:01 ` Wang, Xiao W
2019-06-20 9:12 ` Zhao1, Wei
2019-06-20 5:34 ` [dpdk-dev] [PATCH v3 2/3] net/ice: add generic flow API Qiming Yang
2019-06-20 9:32 ` Wang, Xiao W
2019-06-21 5:47 ` Yang, Qiming
2019-06-20 10:21 ` Wang, Xiao W
2019-06-20 13:33 ` Aaron Conole
2019-06-21 2:18 ` Yang, Qiming
2019-06-20 5:34 ` [dpdk-dev] [PATCH v3 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-21 6:13 ` [dpdk-dev] [PATCH v4 0/3] Enable rte_flow API in ice driver Qiming Yang
2019-06-21 6:13 ` [dpdk-dev] [PATCH v4 1/3] net/ice: enable switch filter Qiming Yang
2019-06-21 6:13 ` [dpdk-dev] [PATCH v4 2/3] net/ice: add generic flow API Qiming Yang
2019-06-21 6:13 ` [dpdk-dev] [PATCH v4 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-21 9:21 ` [dpdk-dev] [PATCH v5 0/3] Enable rte_flow API in ice driver Qiming Yang
2019-06-21 9:21 ` [dpdk-dev] [PATCH v5 1/3] net/ice: enable switch filter Qiming Yang
2019-06-21 9:21 ` [dpdk-dev] [PATCH v5 2/3] net/ice: add generic flow API Qiming Yang
2019-06-21 9:21 ` [dpdk-dev] [PATCH v5 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-21 14:46 ` [dpdk-dev] [PATCH v5 0/3] Enable rte_flow API in ice driver Aaron Conole
2019-06-24 6:15 ` [dpdk-dev] [PATCH v6 " Qiming Yang
2019-06-24 6:15 ` [dpdk-dev] [PATCH v6 1/3] net/ice: enable switch filter Qiming Yang
2019-06-24 6:15 ` [dpdk-dev] [PATCH v6 2/3] net/ice: add generic flow API Qiming Yang
2019-06-24 6:15 ` [dpdk-dev] [PATCH v6 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-25 6:48 ` [dpdk-dev] [PATCH v7 0/3] Enable rte_flow API in ice driver Qiming Yang
2019-06-25 6:48 ` [dpdk-dev] [PATCH v7 1/3] net/ice: enable switch filter Qiming Yang
2019-06-25 6:48 ` [dpdk-dev] [PATCH v7 2/3] net/ice: add generic flow API Qiming Yang
2019-06-25 6:48 ` [dpdk-dev] [PATCH v7 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-26 7:07 ` Xing, Beilei
2019-06-25 14:58 ` [dpdk-dev] [PATCH v7 0/3] Enable rte_flow API in ice driver Aaron Conole
2019-06-26 1:52 ` Yang, Qiming
2019-06-26 7:42 ` Ferruh Yigit
2019-06-26 8:26 ` Yang, Qiming
2019-06-26 15:52 ` Ye Xiaolong
2019-06-26 8:03 ` [dpdk-dev] [PATCH v8 " Qiming Yang
2019-06-26 8:03 ` [dpdk-dev] [PATCH v8 1/3] net/ice: enable switch filter Qiming Yang
2019-06-26 8:03 ` [dpdk-dev] [PATCH v8 2/3] net/ice: add generic flow API Qiming Yang
2019-06-26 8:03 ` [dpdk-dev] [PATCH v8 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-06-26 8:58 ` [dpdk-dev] [PATCH v8 0/4] Enable rte_flow API in ice driver Qiming Yang
2019-06-26 8:58 ` [dpdk-dev] [PATCH v8 1/4] net/ice: enable switch filter Qiming Yang
2019-06-26 8:58 ` [dpdk-dev] [PATCH v8 2/4] net/ice: add generic flow API Qiming Yang
2019-06-26 8:58 ` [dpdk-dev] [PATCH v8 3/4] net/ice: add UDP tunnel port support Qiming Yang
2019-06-26 8:58 ` [dpdk-dev] [PATCH v8 4/4] doc: add release note for generic flow Qiming Yang
2019-06-26 21:27 ` Thomas Monjalon
2019-06-27 2:04 ` Yang, Qiming
2019-06-26 13:25 ` [dpdk-dev] [PATCH v8 0/4] Enable rte_flow API in ice driver Xing, Beilei
2019-07-01 8:32 ` [dpdk-dev] [PATCH v9 0/3] " Qiming Yang
2019-07-01 8:32 ` [dpdk-dev] [PATCH v9 1/3] net/ice: enable switch filter Qiming Yang
2019-07-01 8:32 ` [dpdk-dev] [PATCH v9 2/3] net/ice: add generic flow API Qiming Yang
2019-07-01 8:32 ` [dpdk-dev] [PATCH v9 3/3] net/ice: add UDP tunnel port support Qiming Yang
2019-07-01 11:38 ` [dpdk-dev] [PATCH v9 0/3] Enable rte_flow API in ice driver Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94479800C636CB44BD422CB454846E013CDE5B2E@SHSMSX101.ccr.corp.intel.com \
--to=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=qiming.yang@intel.com \
--cc=wei.zhao1@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).