From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <wei.zhao1@intel.com>
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
by dpdk.org (Postfix) with ESMTP id 49DDDD4E0
for <dev@dpdk.org>; Wed, 11 Jan 2017 09:28:08 +0100 (CET)
Received: from orsmga004.jf.intel.com ([10.7.209.38])
by fmsmga105.fm.intel.com with ESMTP; 11 Jan 2017 00:28:07 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.33,345,1477983600"; d="scan'208";a="47739485"
Received: from pgsmsx101.gar.corp.intel.com ([10.221.44.78])
by orsmga004.jf.intel.com with ESMTP; 11 Jan 2017 00:28:00 -0800
Received: from pgsmsx103.gar.corp.intel.com ([169.254.2.52]) by
PGSMSX101.gar.corp.intel.com ([169.254.1.119]) with mapi id 14.03.0248.002;
Wed, 11 Jan 2017 16:27:58 +0800
From: "Zhao1, Wei" <wei.zhao1@intel.com>
To: "Yigit, Ferruh" <ferruh.yigit@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
CC: "Lu, Wenzhuo" <wenzhuo.lu@intel.com>
Thread-Topic: [dpdk-dev] [PATCH v2 11/18] net/ixgbe: parse n-tuple filter
Thread-Index: AQHSYnKAKyMXPWESV06jteQemzYDcqErMH6AgAfS6KA=
Date: Wed, 11 Jan 2017 08:27:57 +0000
Message-ID: <A2573D2ACFCADC41BB3BE09C6DE313CA0201EB38@PGSMSX103.gar.corp.intel.com>
References: <1483084390-53159-1-git-send-email-wei.zhao1@intel.com>
<1483084390-53159-12-git-send-email-wei.zhao1@intel.com>
<0d561a9d-82e0-bc2b-5dbe-64cc6a9c8e32@intel.com>
In-Reply-To: <0d561a9d-82e0-bc2b-5dbe-64cc6a9c8e32@intel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-originating-ip: [172.30.20.205]
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Subject: Re: [dpdk-dev] [PATCH v2 11/18] net/ixgbe: parse n-tuple filter
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 08:28:09 -0000
Hi, yigit
> -----Original Message-----
> From: Yigit, Ferruh
> Sent: Saturday, January 7, 2017 12:56 AM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>
> Subject: Re: [dpdk-dev] [PATCH v2 11/18] net/ixgbe: parse n-tuple filter
>=20
> On 12/30/2016 7:53 AM, Wei Zhao wrote:
> > Add rule validate function and check if the rule is a n-tuple rule,
> > and get the n-tuple info.
> >
> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> > Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
> >
> > ---
> >
> > v2:add new error set function
> > ---
> > drivers/net/ixgbe/ixgbe_ethdev.c | 414
> > ++++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 409 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> > b/drivers/net/ixgbe/ixgbe_ethdev.c
> > index 0de1318..198cc4b 100644
> > --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> > @@ -388,6 +388,24 @@ static int ixgbe_dev_udp_tunnel_port_del(struct
> rte_eth_dev *dev,
> > struct rte_eth_udp_tunnel
> *udp_tunnel);
>=20
> <...>
>=20
> > +
> > +/**
> > + * Parse the rule to see if it is a n-tuple rule.
> > + * And get the n-tuple filter info BTW.
> > + */
>=20
> It would be nice to comment here valid/expected pattern values
> (spec/mask/last). Otherwise it is hard to decode from code also it is goo=
d to
> document intention, so makes easy if there is any defect.
>=20
I will do as your suggestion in v3.
> Also valid actions.
>=20
> > +static int
> > +cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
> > + const struct rte_flow_item pattern[],
> > + const struct rte_flow_action actions[],
> > + struct rte_eth_ntuple_filter *filter,
> > + struct rte_flow_error *error)
> > +{
> > + const struct rte_flow_item *item;
> > + const struct rte_flow_action *act;
> > + const struct rte_flow_item_ipv4 *ipv4_spec;
> > + const struct rte_flow_item_ipv4 *ipv4_mask;
> > + const struct rte_flow_item_tcp *tcp_spec;
> > + const struct rte_flow_item_tcp *tcp_mask;
> > + const struct rte_flow_item_udp *udp_spec;
> > + const struct rte_flow_item_udp *udp_mask;
> > + uint32_t index;
> > +
> > + if (!pattern) {
> > + rte_flow_error_set(error, EINVAL,
> RTE_FLOW_ERROR_TYPE_ITEM_NUM,
> > + NULL, "NULL pattern.");
> > + return -rte_errno;
> > + }
> > +
> > + /* parse pattern */
> > + index =3D 0;
> > +
> > + /* the first not void item can be MAC or IPv4 */
> > + NEXT_ITEM_OF_PATTERN(item, pattern, index);
> > +
> > + if (item->type !=3D RTE_FLOW_ITEM_TYPE_ETH &&
> > + item->type !=3D RTE_FLOW_ITEM_TYPE_IPV4) {
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > + /* Skip Ethernet */
> > + if (item->type =3D=3D RTE_FLOW_ITEM_TYPE_ETH) {
> > + /*Not supported last point for range*/
> > + if (item->last) {
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> > + item, "Not supported last point for range");
> > + return -rte_errno;
> > +
> > + }
> > + /* if the first item is MAC, the content should be NULL */
> > + if (item->spec || item->mask) {
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > + /* check if the next not void item is IPv4 */
> > + index++;
> > + NEXT_ITEM_OF_PATTERN(item, pattern, index);
> > + if (item->type !=3D RTE_FLOW_ITEM_TYPE_IPV4) {
> > + rte_flow_error_set(error,
> > + EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
>=20
> Wrong indentation.
I will do as your suggestion in v3.
>=20
> > + return -rte_errno;
> > + }
> > + }
> > +
> > + /* get the IPv4 info */
> > + if (!item->spec || !item->mask) {
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Invalid ntuple mask");
> > + return -rte_errno;
> > + }
> > + /*Not supported last point for range*/
> > + if (item->last) {
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> > + item, "Not supported last point for range");
> > + return -rte_errno;
> > +
> > + }
> > +
> > + ipv4_mask =3D (const struct rte_flow_item_ipv4 *)item->mask;
> > + /**
> > + * Only support src & dst addresses, protocol,
> > + * others should be masked.
> > + */
> > + if (ipv4_mask->hdr.version_ihl ||
> > + ipv4_mask->hdr.type_of_service ||
> > + ipv4_mask->hdr.total_length ||
> > + ipv4_mask->hdr.packet_id ||
> > + ipv4_mask->hdr.fragment_offset ||
> > + ipv4_mask->hdr.time_to_live ||
> > + ipv4_mask->hdr.hdr_checksum) {
> > + rte_flow_error_set(error,
> > + EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > +
> > + filter->dst_ip_mask =3D ipv4_mask->hdr.dst_addr;
> > + filter->src_ip_mask =3D ipv4_mask->hdr.src_addr;
> > + filter->proto_mask =3D ipv4_mask->hdr.next_proto_id;
> > +
> > + ipv4_spec =3D (const struct rte_flow_item_ipv4 *)item->spec;
> > + filter->dst_ip =3D ipv4_spec->hdr.dst_addr;
> > + filter->src_ip =3D ipv4_spec->hdr.src_addr;
> > + filter->proto =3D ipv4_spec->hdr.next_proto_id;
> > +
> > + /* check if the next not void item is TCP or UDP */
> > + index++;
> > + NEXT_ITEM_OF_PATTERN(item, pattern, index);
> > + if (item->type !=3D RTE_FLOW_ITEM_TYPE_TCP &&
> > + item->type !=3D RTE_FLOW_ITEM_TYPE_UDP) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
>=20
> Sometimes meset filter before return from error, sometimes not. Is memset
> required at all?
Not all necessary, at the beginning ,filter is not config any value, so it =
do not need to memset .
>=20
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > +
> > + /* get the TCP/UDP info */
> > + if (!item->spec || !item->mask) {
>=20
> For example there is no memset here for filter ..
>=20
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Invalid ntuple mask");
> > + return -rte_errno;
> > + }
> > +
> > + /*Not supported last point for range*/
> > + if (item->last) {
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> > + item, "Not supported last point for range");
> > + return -rte_errno;
> > +
> > + }
> > +
> > + if (item->type =3D=3D RTE_FLOW_ITEM_TYPE_TCP) {
> > + tcp_mask =3D (const struct rte_flow_item_tcp *)item->mask;
> > +
> > + /**
> > + * Only support src & dst ports, tcp flags,
> > + * others should be masked.
> > + */
> > + if (tcp_mask->hdr.sent_seq ||
> > + tcp_mask->hdr.recv_ack ||
> > + tcp_mask->hdr.data_off ||
> > + tcp_mask->hdr.rx_win ||
> > + tcp_mask->hdr.cksum ||
> > + tcp_mask->hdr.tcp_urp) {
> > + memset(filter, 0, sizeof(struct
> rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > +
> > + filter->dst_port_mask =3D tcp_mask->hdr.dst_port;
> > + filter->src_port_mask =3D tcp_mask->hdr.src_port;
> > + if (tcp_mask->hdr.tcp_flags =3D=3D 0xFF) {
> > + filter->flags |=3D RTE_NTUPLE_FLAGS_TCP_FLAG;
> > + } else if (!tcp_mask->hdr.tcp_flags) {
> > + filter->flags &=3D ~RTE_NTUPLE_FLAGS_TCP_FLAG;
> > + } else {
> > + memset(filter, 0, sizeof(struct
> rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > +
> > + tcp_spec =3D (const struct rte_flow_item_tcp *)item->spec;
> > + filter->dst_port =3D tcp_spec->hdr.dst_port;
> > + filter->src_port =3D tcp_spec->hdr.src_port;
> > + filter->tcp_flags =3D tcp_spec->hdr.tcp_flags;
> > + } else {
> > + udp_mask =3D (const struct rte_flow_item_udp *)item->mask;
> > +
> > + /**
> > + * Only support src & dst ports,
> > + * others should be masked.
> > + */
> > + if (udp_mask->hdr.dgram_len ||
> > + udp_mask->hdr.dgram_cksum) {
> > + memset(filter, 0, sizeof(struct
> rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > +
> > + filter->dst_port_mask =3D udp_mask->hdr.dst_port;
> > + filter->src_port_mask =3D udp_mask->hdr.src_port;
> > +
> > + udp_spec =3D (const struct rte_flow_item_udp *)item->spec;
> > + filter->dst_port =3D udp_spec->hdr.dst_port;
> > + filter->src_port =3D udp_spec->hdr.src_port;
> > + }
> > +
> > + /* check if the next not void item is END */
> > + index++;
> > + NEXT_ITEM_OF_PATTERN(item, pattern, index);
> > + if (item->type !=3D RTE_FLOW_ITEM_TYPE_END) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ITEM,
> > + item, "Not supported by ntuple filter");
> > + return -rte_errno;
> > + }
> > +
> > + /* parse action */
> > + index =3D 0;
> > +
> > + if (!actions) {
>=20
> Although there is no harm, I would do input check at the beginning of the
> function, to not do extra work if we hit this case.
I will do as your suggestion in v3.
>=20
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ACTION_NUM,
> > + NULL, "NULL action.");
> > + return -rte_errno;
> > + }
> > +
> > + /**
> > + * n-tuple only supports forwarding,
> > + * check if the first not void action is QUEUE.
> > + */
> > + NEXT_ITEM_OF_ACTION(act, actions, index);
> > + if (act->type !=3D RTE_FLOW_ACTION_TYPE_QUEUE) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ACTION,
> > + item, "Not supported action.");
> > + return -rte_errno;
> > + }
> > + filter->queue =3D
> > + ((const struct rte_flow_action_queue *)act->conf)->index;
> > +
> > + /* check if the next not void item is END */
> > + index++;
> > + NEXT_ITEM_OF_ACTION(act, actions, index);
> > + if (act->type !=3D RTE_FLOW_ACTION_TYPE_END) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ACTION,
> > + act, "Not supported action.");
> > + return -rte_errno;
> > + }
> > +
> > + /* parse attr */
> > + /* must be input direction */
>=20
> May be good idea to check if attr is NULL.
I will do as your suggestion in v3. Add it at the beginning of function.
>=20
> > + if (!attr->ingress) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
> > + attr, "Only support ingress.");
> > + return -rte_errno;
> > + }
> > +
> > + /* not supported */
> > + if (attr->egress) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
> > + attr, "Not support egress.");
> > + return -rte_errno;
> > + }
> > +
> > + if (attr->priority > 0xFFFF) {
> > + memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
> > + rte_flow_error_set(error, EINVAL,
> > + RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
> > + attr, "Error priority.");
> > + return -rte_errno;
> > + }
> > + filter->priority =3D (uint16_t)attr->priority;
>=20
> Should check attr->group? Do we support groups?
No , we do not.
>=20
> > +
> > + return 0;
> > +}
> > +
>=20
> <...>