> -----Original Message-----
> From: Guo, Junfeng <junfeng....@intel.com>
> Sent: Monday, November 1, 2021 4:36 PM
> To: Zhang, Qi Z <qi.z.zh...@intel.com>; Wu, Jingjing <jingjing...@intel.com>;
> Xing, Beilei <beilei.x...@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yi...@intel.com>; Xu, Ting
> <ting...@intel.com>; Guo, Junfeng <junfeng....@intel.com>
> Subject: [PATCH v8 4/4] net/ice: enable protocol agnostic flow offloading in
> FDIR
>
> Protocol agnostic flow offloading in Flow Director is enabled by this patch
> based on the Parser Library, using existing rte_flow raw API.
>
> Note that the raw flow requires:
> 1. byte string of raw target packet bits.
> 2. byte string of mask of target packet.
>
> Here is an example:
> FDIR matching ipv4 dst addr with 1.2.3.4 and redirect to queue 3:
>
> flow create 0 ingress pattern raw \
> pattern spec \
> 0000000000000000000000000800450000140000400040100000000000000
> 1020304 \ pattern mask \
> 000000000000000000000000000000000000000000000000000000000000ff
> ffffff \ / end actions queue index 3 / mark id 3 / end
>
> Note that mask of some key bits (e.g., 0x0800 to indicate ipv4 proto) is
> optional in our cases. To avoid redundancy, we just omit the mask of 0x0800
> (with 0xFFFF) in the mask byte string example. The prefix '0x' for the spec
> and
> mask byte (hex) strings are also omitted here.
>
> Signed-off-by: Junfeng Guo <junfeng....@intel.com>
> ---
> doc/guides/rel_notes/release_21_11.rst | 1 +
> drivers/net/ice/ice_ethdev.h | 14 ++
> drivers/net/ice/ice_fdir_filter.c | 235 +++++++++++++++++++++++++
> drivers/net/ice/ice_generic_flow.c | 7 +
> drivers/net/ice/ice_generic_flow.h | 3 +
> 5 files changed, 260 insertions(+)
>
> diff --git a/doc/guides/rel_notes/release_21_11.rst
> b/doc/guides/rel_notes/release_21_11.rst
> index 98d50a160b..36fdee0a98 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -167,6 +167,7 @@ New Features
>
> * **Updated Intel ice driver.**
>
> + * Added protocol agnostic flow offloading support in Flow Director.
> * Added 1PPS out support by a devargs.
> * Added IPv4 and L4 (TCP/UDP/SCTP) checksum hash support in RSS flow.
> * Added DEV_RX_OFFLOAD_TIMESTAMP support.
> diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> 0e42c4c063..bbfeb0cc23 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -318,6 +318,11 @@ struct ice_fdir_filter_conf {
> uint64_t input_set_o; /* used for non-tunnel or tunnel outer fields */
> uint64_t input_set_i; /* only for tunnel inner fields */
> uint32_t mark_flag;
> +
> + struct ice_parser_profile *prof;
> + const u8 *pkt_buf;
> + bool parser_ena;
> + u8 pkt_len;
> };
>
> #define ICE_MAX_FDIR_FILTER_NUM (1024 * 16)
> @@ -487,6 +492,14 @@ struct ice_devargs {
> uint8_t pps_out_ena;
> };
>
> +/**
> + * Structure to store fdir fv entry.
> + */
> +struct ice_fdir_prof_info {
> + struct ice_parser_profile prof;
> + u64 fdir_actived_cnt;
> +};
> +
> /**
> * Structure to store private data for each PF/VF instance.
> */
> @@ -510,6 +523,7 @@ struct ice_adapter {
> struct rte_timecounter tx_tstamp_tc;
> bool ptp_ena;
> uint64_t time_hw;
> + struct ice_fdir_prof_info fdir_prof_info[ICE_MAX_PTGS];
> #ifdef RTE_ARCH_X86
> bool rx_use_avx2;
> bool rx_use_avx512;
> diff --git a/drivers/net/ice/ice_fdir_filter.c
> b/drivers/net/ice/ice_fdir_filter.c
> index bd627e3aa8..888f0dea6d 100644
> --- a/drivers/net/ice/ice_fdir_filter.c
> +++ b/drivers/net/ice/ice_fdir_filter.c
> @@ -107,6 +107,7 @@
> ICE_INSET_NAT_T_ESP_SPI)
>
> static struct ice_pattern_match_item ice_fdir_pattern_list[] = {
> + {pattern_raw, ICE_INSET_NONE,
> ICE_INSET_NONE, ICE_INSET_NONE},
> {pattern_ethertype, ICE_FDIR_INSET_ETH,
> ICE_INSET_NONE, ICE_INSET_NONE},
> {pattern_eth_ipv4, ICE_FDIR_INSET_ETH_IPV4,
> ICE_INSET_NONE, ICE_INSET_NONE},
> {pattern_eth_ipv4_udp,
> ICE_FDIR_INSET_ETH_IPV4_UDP,
> ICE_INSET_NONE, ICE_INSET_NONE},
> @@ -1188,6 +1189,24 @@ ice_fdir_is_tunnel_profile(enum
> ice_fdir_tunnel_type tunnel_type)
> return 0;
> }
>
> +static int
> +ice_fdir_add_del_raw(struct ice_pf *pf,
> + struct ice_fdir_filter_conf *filter,
> + bool add)
> +{
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> +
> + unsigned char *pkt = (unsigned char *)pf->fdir.prg_pkt;
> + rte_memcpy(pkt, filter->pkt_buf, filter->pkt_len);
> +
> + struct ice_fltr_desc desc;
> + memset(&desc, 0, sizeof(desc));
> + filter->input.comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW;
> + ice_fdir_get_prgm_desc(hw, &filter->input, &desc, add);
> +
> + return ice_fdir_programming(pf, &desc); }
> +
> static int
> ice_fdir_add_del_filter(struct ice_pf *pf,
> struct ice_fdir_filter_conf *filter, @@ -1303,6
> +1322,72 @@
> ice_fdir_create_filter(struct ice_adapter *ad,
> struct ice_fdir_fltr_pattern key;
> bool is_tun;
> int ret;
> + int i;
> +
> + if (filter->parser_ena) {
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> +
> + int id = ice_find_first_bit(filter->prof->ptypes, UINT16_MAX);
> + int ptg = hw->blk[ICE_BLK_FD].xlt1.t[id];
> + u16 ctrl_vsi = pf->fdir.fdir_vsi->idx;
> + u16 main_vsi = pf->main_vsi->idx;
> + bool fv_found = false;
> +
> + struct ice_fdir_prof_info *pi = &ad->fdir_prof_info[ptg];
> + if (pi->fdir_actived_cnt != 0) {
> + for (i = 0; i < ICE_MAX_FV_WORDS; i++)
> + if (pi->prof.fv[i].proto_id !=
> + filter->prof->fv[i].proto_id ||
> + pi->prof.fv[i].offset !=
> + filter->prof->fv[i].offset ||
> + pi->prof.fv[i].msk !=
> + filter->prof->fv[i].msk)
> + break;
> + if (i == ICE_MAX_FV_WORDS) {
> + fv_found = true;
> + pi->fdir_actived_cnt++;
> + }
> + }
> +
> + if (!fv_found) {
> + ret = ice_flow_set_hw_prof(hw, main_vsi, ctrl_vsi,
> + filter->prof, ICE_BLK_FD);
> + if (ret)
> + return -rte_errno;
> + }
> +
> + ret = ice_fdir_add_del_raw(pf, filter, true);
> + if (ret)
> + return -rte_errno;
> +
> + if (!fv_found) {
> + for (i = 0; i < filter->prof->fv_num; i++) {
> + pi->prof.fv[i].proto_id =
> + filter->prof->fv[i].proto_id;
> + pi->prof.fv[i].offset =
> + filter->prof->fv[i].offset;
> + pi->prof.fv[i].spec = filter->prof->fv[i].spec;
> + pi->prof.fv[i].msk = filter->prof->fv[i].msk;
> + }
> + pi->fdir_actived_cnt = 1;
> + }
> +
> + if (filter->mark_flag == 1)
> + ice_fdir_rx_parsing_enable(ad, 1);
> +
> + entry = rte_zmalloc("fdir_entry", sizeof(*entry), 0);
> + if (!entry)
> + return -rte_errno;
> +
> + rte_memcpy(entry, filter, sizeof(*filter));
> +
> + filter->prof = NULL;
> + filter->pkt_buf = NULL;
Should we free filter here? as a copy of it already be assigned to flow->rule.
Actually the filter is assigned by meta, and it is created during
parse_pattern_action, and assume to be freed in create_filter.
Or we can assign meta to flow->rule directly, then we only need to free it
during destroy.
> +
> + flow->rule = entry;
> +
> + return 0;
> + }
>
> ice_fdir_extract_fltr_key(&key, filter);
> node = ice_fdir_entry_lookup(fdir_info, &key); @@ -1397,6 +1482,49
> @@ ice_fdir_destroy_filter(struct ice_adapter *ad,
>
> filter = (struct ice_fdir_filter_conf *)flow->rule;
>
> + if (filter->parser_ena) {
> + struct ice_hw *hw = ICE_PF_TO_HW(pf);
> +
> + int id = ice_find_first_bit(filter->prof->ptypes, UINT16_MAX);
> + int ptg = hw->blk[ICE_BLK_FD].xlt1.t[id];
> + u16 ctrl_vsi = pf->fdir.fdir_vsi->idx;
> + u16 main_vsi = pf->main_vsi->idx;
> + u16 vsi_num;
> +
> + ret = ice_fdir_add_del_raw(pf, filter, false);
> + if (ret)
> + return -rte_errno;
> +
> + struct ice_fdir_prof_info *pi = &ad->fdir_prof_info[ptg];
> + if (pi->fdir_actived_cnt != 0) {
> + pi->fdir_actived_cnt--;
> + if (!pi->fdir_actived_cnt) {
> + vsi_num = ice_get_hw_vsi_num(hw, ctrl_vsi);
> + ret = ice_rem_prof_id_flow(hw, ICE_BLK_FD,
> + vsi_num, id);
> + if (ret)
> + return -rte_errno;
> +
> + vsi_num = ice_get_hw_vsi_num(hw, main_vsi);
> + ret = ice_rem_prof_id_flow(hw, ICE_BLK_FD,
> + vsi_num, id);
> + if (ret)
> + return -rte_errno;
> + }
> + }
> +
> + if (filter->mark_flag == 1)
> + ice_fdir_rx_parsing_enable(ad, 0);
> +
> + flow->rule = NULL;
> + filter->prof = NULL;
> + filter->pkt_buf = NULL;
Should we free the pkt_buf and prof before assign them to NULL.
They are created during parse_pattern but never be freed before.
> +
> + rte_free(filter);
> +
> + return 0;
> + }
> +
