Hi Beilei, <snip> > > > > > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Beilei Xing > > > > > Sent: Friday, March 3, 2017 9:44 AM > > > > > To: Wu, Jingjing <jingjing...@intel.com> > > > > > Cc: Zhang, Helin <helin.zh...@intel.com>; dev@dpdk.org > > > > > Subject: [dpdk-dev] [PATCH 3/3] net/i40e: enable cloud filter > > > > > for MPLS > > > > > > > > > > This patch enables MPLSoUDP and MPLSoGRE cloud filter with > > > > > replace cloud filter. > > > > > > > > > > Signed-off-by: Beilei Xing <beilei.x...@intel.com> > > > > > --- > > > > > drivers/net/i40e/i40e_ethdev.c | 44 +++++++++++++++-- > > > > > drivers/net/i40e/i40e_ethdev.h | 9 +++- > > > > > drivers/net/i40e/i40e_flow.c | 108 > > > > > +++++++++++++++++++++++++++++++++++++---- > > > > > 3 files changed, 144 insertions(+), 17 deletions(-) > > > > > > > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > > > > b/drivers/net/i40e/i40e_ethdev.c index 91bfd73..6044daf 100644 > > > > > --- a/drivers/net/i40e/i40e_ethdev.c > > > > > +++ b/drivers/net/i40e/i40e_ethdev.c > > > > > @@ -1286,6 +1286,9 @@ eth_i40e_dev_init(struct rte_eth_dev > *dev) > > > > > if (ret < 0) > > > > > goto err_init_fdir_filter_list; > > > > > > > > > > + i40e_replace_mpls_l1_filter(pf); > > > > > + i40e_replace_mpls_cloud_filter(pf); > > > > > + > > > > > return 0; > > > > > > > > > > err_init_fdir_filter_list: > > > > > @@ -6941,6 +6944,7 @@ > > > > > i40e_dev_consistent_tunnel_filter_set(struct > > > > > i40e_pf *pf, > > > > > struct i40e_tunnel_rule *tunnel_rule = &pf->tunnel; > > > > > struct i40e_tunnel_filter *tunnel, *node; > > > > > struct i40e_tunnel_filter check_filter; /* Check if filter > > > > > exists */ > > > > > + uint32_t teid_le; > > > > > bool big_buffer = 0; > > > > > > > > > > cld_filter = rte_zmalloc("tunnel_filter", @@ -6989,6 +6993,28 > > > > > @@ i40e_dev_consistent_tunnel_filter_set(struct i40e_pf *pf, > > > > > case I40E_TUNNEL_TYPE_IP_IN_GRE: > > > > > tun_type = I40E_AQC_ADD_CLOUD_TNL_TYPE_IP; > > > > > break; > > > > > + case I40E_TUNNEL_TYPE_MPLSoUDP: > > > > > + teid_le = rte_cpu_to_le_32(tunnel_filter- > >tenant_id); > > > > > + pfilter- > > > > > >general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = > > > > > + teid_le >> 4; > > > > > + pfilter- > > > > > >general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = > > > > > + (teid_le & 0xF) << 12; > > > > > + pfilter- > > > > > >general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = > > > > > + 0x40; > > > > > + big_buffer = 1; > > > > > + tun_type = > I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoUDP; > > > > > + break; > > > > > + case I40E_TUNNEL_TYPE_MPLSoGRE: > > > > > + teid_le = rte_cpu_to_le_32(tunnel_filter- > >tenant_id); > > > > > + pfilter- > > > > > >general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0] = > > > > > + teid_le >> 4; > > > > > + pfilter- > > > > > >general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1] = > > > > > + (teid_le & 0xF) << 12; > > > > > + pfilter- > > > > > >general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2] = > > > > > + 0x0; > > > > > + big_buffer = 1; > > > > > + tun_type = > I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoGRE; > > > > > + break; > > > > > default: > > > > > /* Other tunnel types is not supported. */ > > > > > PMD_DRV_LOG(ERR, "tunnel type is not > supported."); @@ - > > > > > 6996,11 +7022,19 @@ i40e_dev_consistent_tunnel_filter_set(struct > > > > > i40e_pf *pf, > > > > > return -EINVAL; > > > > > } > > > > > > > > > > - val = i40e_dev_get_filter_type(tunnel_filter->filter_type, > > > > > - &pfilter->element.flags); > > > > > - if (val < 0) { > > > > > - rte_free(cld_filter); > > > > > - return -EINVAL; > > > > > + if (tunnel_filter->tunnel_type == > I40E_TUNNEL_TYPE_MPLSoUDP) > > > > > + pfilter->element.flags = > > > > > + > I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoUDP; > > > > > + else if (tunnel_filter->tunnel_type == > > > > > I40E_TUNNEL_TYPE_MPLSoGRE) > > > > > + pfilter->element.flags = > > > > > + > I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoGRE; > > > > > + else { > > > > > + val = i40e_dev_get_filter_type(tunnel_filter- > >filter_type, > > > > > + &pfilter- > >element.flags); > > > > > + if (val < 0) { > > > > > + rte_free(cld_filter); > > > > > + return -EINVAL; > > > > > + } > > > > > } > > > > > > > > > > pfilter->element.flags |= rte_cpu_to_le_16( diff --git > > > > > a/drivers/net/i40e/i40e_ethdev.h > > > > > b/drivers/net/i40e/i40e_ethdev.h index dd9d709..f305baa 100644 > > > > > --- a/drivers/net/i40e/i40e_ethdev.h > > > > > +++ b/drivers/net/i40e/i40e_ethdev.h > > > > > @@ -499,8 +499,11 @@ struct i40e_ethertype_rule { > > > > > /* Tunnel filter number HW supports */ #define > > > > > I40E_MAX_TUNNEL_FILTER_NUM 400 > > > > > > > > > > -#define I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoUDP 0x11 - > #define > > > > > I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoGRE 0x12 > > > > > +#define I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoUDP 8 #define > > > > > +I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoGRE 9 #define > > > > > +I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoUDP 0x11 #define > > > > > +I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoGRE 0x12 #define > > > > > +I40E_AQC_ADD_L1_FILTER_TEID_MPLS 0x11 > > > > > > > > > > enum i40e_tunnel_iptype { > > > > > I40E_TUNNEL_IPTYPE_IPV4, > > > > > @@ -963,6 +966,8 @@ enum i40e_status_code > > > > > i40e_aq_remove_cloud_filters_big_buffer( > > > > > enum i40e_status_code i40e_aq_replace_cloud_filters(struct > > > > > i40e_hw > > > > *hw, > > > > > struct i40e_aqc_replace_cloud_filters_cmd *filters, > > > > > struct i40e_aqc_replace_cloud_filters_cmd_buf > > > > > *cmd_buf); > > > > > +int i40e_replace_mpls_l1_filter(struct i40e_pf *pf); int > > > > > +i40e_replace_mpls_cloud_filter(struct i40e_pf *pf); > > > > > > > > > > #define I40E_DEV_TO_PCI(eth_dev) \ > > > > > RTE_DEV_TO_PCI((eth_dev)->device) diff --git > > > > > a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c > > > > > index 9ca3189..6bb2046 100644 > > > > > --- a/drivers/net/i40e/i40e_flow.c > > > > > +++ b/drivers/net/i40e/i40e_flow.c > > > > > @@ -1953,16 +1953,10 @@ i40e_flow_destroy_tunnel_filter(struct > > > > > i40e_pf *pf, > > > > > filter->input.general_fields, > > > > > sizeof(cld_filter.general_fields)); > > > > > > > > > > - if (((filter->input.flags & > > > > > - (I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoUDP << > > > > > - I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT)) == > > > > > - (I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoUDP << > > > > > - I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT)) || > > > > > - ((filter->input.flags & > > > > > - (I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoGRE << > > > > > - I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT)) == > > > > > - (I40E_AQC_ADD_CLOUD_TNL_TYPE_MPLSoGRE << > > > > > - I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT))) > > > > > + if ((filter->input.flags & > > > > > I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoUDP) == > > > > > + I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoUDP || > > > > > + (filter->input.flags & > > > > > I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoGRE) == > > > > > + I40E_AQC_ADD_CLOUD_FILTER_TEID_MPLSoGRE) > > > > > big_buffer = 1; > > > > > > > > > > if (big_buffer) > > > > > @@ -2255,3 +2249,97 @@ i40e_status_code > > > > > i40e_aq_replace_cloud_filters(struct i40e_hw *hw, > > > > > > > > > > return status; > > > > > } > > > > > + > > > > > +int > > > > > +i40e_replace_mpls_l1_filter(struct i40e_pf *pf) { > > > > > + struct i40e_aqc_replace_cloud_filters_cmd filter_replace; > > > > > + struct i40e_aqc_replace_cloud_filters_cmd_buf > filter_replace_buf; > > > > > + struct i40e_hw *hw = I40E_PF_TO_HW(pf); > > > > > + int ret; > > > > > + > > > > > + memset(&filter_replace, 0, > > > > > + sizeof(struct i40e_aqc_replace_cloud_filters_cmd)); > > > > > + memset(&filter_replace_buf, 0, > > > > > + sizeof(struct i40e_aqc_replace_cloud_filters_cmd_buf)); > > > > > + > > > > > + /* create L1 filter */ > > > > > + filter_replace.old_filter_type = > > > > > + > I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC; > > > > > > > > I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC = 12 (0x0C) > Should > > > the > > > > old_filter_type macro be I40E_AQC_ADD_CLOUD_FILTER_IIP = 0x0C ? > > > > > > No, I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC is L1 filter, but > > the > > > I40E_AQC_ADD_CLOUD_FILTER_IIP is cloud filter. > > > We should replace L1 filter here. > > > > The I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC macro (value 12) > is an > > index into the Field Vector, it is not a filter type macro. > > Should a filter type macro be used to set filter_replace.old_filter_type ? > > I think we can check with firmware guy for the detail. > > Beilei
I have checked with firmware, the patch is correct. Regards, Bernard.
