From: "Iremonger, Bernard" <bernard.iremonger@intel.com>
To: "Xing, Beilei" <beilei.xing@intel.com>,
"Wu, Jingjing" <jingjing.wu@intel.com>
Cc: "Zhang, Helin" <helin.zhang@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [PATCH 3/3] net/i40e: enable cloud filter for MPLS
Date: Thu, 9 Mar 2017 11:53:58 +0000 [thread overview]
Message-ID: <8CEF83825BEC744B83065625E567D7C224D33038@IRSMSX108.ger.corp.intel.com> (raw)
In-Reply-To: <94479800C636CB44BD422CB454846E01315A813C@SHSMSX101.ccr.corp.intel.com>
Hi Beilei,
<snip>
> > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Beilei Xing
> > > Sent: Friday, March 3, 2017 9:44 AM
> > > To: Wu, Jingjing <jingjing.wu@intel.com>
> > > Cc: Zhang, Helin <helin.zhang@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.xing@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 ?
Regards,
Bernard
<snip>
next prev parent reply other threads:[~2017-03-09 11:54 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 9:43 [PATCH 0/3] enable MPLS cloud filter Beilei Xing
2017-03-03 9:43 ` [PATCH 1/3] app/testpmd: support MPLS for generic filter Beilei Xing
2017-03-03 11:09 ` Adrien Mazarguil
2017-03-06 2:39 ` Xing, Beilei
2017-03-03 9:43 ` [PATCH 2/3] net/i40e: add MPLS parsing function Beilei Xing
2017-03-03 9:43 ` [PATCH 3/3] net/i40e: enable cloud filter for MPLS Beilei Xing
2017-03-08 16:05 ` Ferruh Yigit
2017-03-09 3:57 ` Xing, Beilei
2017-03-09 11:13 ` Iremonger, Bernard
2017-03-09 11:39 ` Xing, Beilei
2017-03-09 11:53 ` Iremonger, Bernard [this message]
2017-03-09 12:06 ` Xing, Beilei
2017-03-09 13:48 ` Iremonger, Bernard
2017-03-23 10:57 ` [PATCH v2 0/3] add support for MPLS tunnel filter Beilei Xing
2017-03-23 10:57 ` [PATCH v2 1/3] app/testpmd: add support for MPLS and GRE items Beilei Xing
2017-03-23 19:39 ` Adrien Mazarguil
2017-03-24 2:17 ` Xing, Beilei
2017-03-24 10:00 ` Adrien Mazarguil
2017-03-23 10:57 ` [PATCH v2 2/3] net/i40e: add MPLS parsing function Beilei Xing
2017-03-23 10:57 ` [PATCH v2 3/3] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-28 6:40 ` [PATCH v3 0/4] add support for MPLS tunnel filter Beilei Xing
2017-03-28 6:40 ` [PATCH v3 1/4] ethdev: add MPLS and GRE items Beilei Xing
2017-03-28 12:28 ` Adrien Mazarguil
2017-03-28 6:40 ` [PATCH v3 2/4] app/testpmd: add MPLS and GRE fields to flow command Beilei Xing
2017-03-28 12:29 ` Adrien Mazarguil
2017-03-28 6:40 ` [PATCH v3 3/4] net/i40e: add MPLS parsing function Beilei Xing
2017-03-28 6:40 ` [PATCH v3 4/4] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-30 4:07 ` [PATCH v4 0/4] add support for MPLS tunnel filter Beilei Xing
2017-03-30 4:07 ` [PATCH v4 1/4] ethdev: add MPLS and GRE items Beilei Xing
2017-03-30 4:07 ` [PATCH v4 2/4] app/testpmd: add MPLS and GRE fields to flow command Beilei Xing
2017-03-30 4:07 ` [PATCH v4 3/4] net/i40e: add MPLS parsing function Beilei Xing
2017-03-30 6:04 ` Wu, Jingjing
2017-03-30 6:35 ` Xing, Beilei
2017-03-30 4:07 ` [PATCH v4 4/4] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-30 6:16 ` Wu, Jingjing
2017-03-30 6:20 ` Xing, Beilei
2017-03-30 6:56 ` [PATCH v5 0/4] add support for MPLS tunnel filter Beilei Xing
2017-03-30 6:56 ` [PATCH v5 1/4] ethdev: add MPLS and GRE items Beilei Xing
2017-03-30 6:56 ` [PATCH v5 2/4] app/testpmd: add MPLS and GRE fields to flow command Beilei Xing
2017-03-30 6:56 ` [PATCH v5 3/4] net/i40e: add MPLS parsing function Beilei Xing
2017-03-30 8:22 ` Wu, Jingjing
2017-03-30 6:56 ` [PATCH v5 4/4] net/i40e: enable tunnel filter for MPLS Beilei Xing
2017-03-30 8:22 ` Wu, Jingjing
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=8CEF83825BEC744B83065625E567D7C224D33038@IRSMSX108.ger.corp.intel.com \
--to=bernard.iremonger@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=jingjing.wu@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.