From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D30D7A0547; Fri, 12 Mar 2021 10:31:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D2A71607ED; Fri, 12 Mar 2021 10:31:50 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 340E24067E for ; Fri, 12 Mar 2021 10:31:49 +0100 (CET) Received: from localhost.localdomain (unknown [188.242.7.54]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id C8BF07F530; Fri, 12 Mar 2021 12:31:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru C8BF07F530 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1615541508; bh=lcLB1YnvdclFFkeJB0nSQzYMYyUi/Hj0+//nve4jL3w=; h=From:To:Cc:Subject:Date; b=WfRzMOu0JzNjcJp2urFGwyv2bH3eRbCxYOcHcQZerpXv4aO8fw4ucHSbplyA0gfC7 k3dqUbe6jhVYEDNkfhIIlNf6R7zcqYMzDwU6bomW4NckVwg9/PejqTYx1XffV2brYr j+mhcRYvKEo4WohhBFXHr5px0Vb2zjydTJ2Meaq4= From: Ivan Malov To: dev@dpdk.org Cc: Andrew Rybchenko , Andy Moreton , Ori Kam , Thomas Monjalon , Ferruh Yigit Date: Fri, 12 Mar 2021 12:31:34 +0300 Message-Id: <20210312093143.28186-1-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 01/10] ethdev: reuse header definition in flow pattern item ETH X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" One ought to reuse existing header structs in flow items. This particular item contains non-header fields, so it's important to keep the header fields in a separate struct. Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- lib/librte_ethdev/rte_flow.h | 44 ++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index 669e677e9..96fd93ee1 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -728,22 +728,32 @@ static const struct rte_flow_item_raw rte_flow_item_raw_mask = { * * Matches an Ethernet header. * - * The @p type field either stands for "EtherType" or "TPID" when followed - * by so-called layer 2.5 pattern items such as RTE_FLOW_ITEM_TYPE_VLAN. In - * the latter case, @p type refers to that of the outer header, with the - * inner EtherType/TPID provided by the subsequent pattern item. This is the - * same order as on the wire. - * If the @p type field contains a TPID value, then only tagged packets with the - * specified TPID will match the pattern. - * The field @p has_vlan can be used to match any type of tagged packets, - * instead of using the @p type field. - * If the @p type and @p has_vlan fields are not specified, then both tagged - * and untagged packets will match the pattern. + * Inside @p hdr field, the sub-field @p ether_type stands either for EtherType + * or TPID, depending on whether the item is followed by a VLAN item or not. If + * two VLAN items follow, the sub-field refers to the outer one, which, in turn, + * contains the inner TPID in the similar header field. The innermost VLAN item + * contains a layer-3 EtherType. All of that follows the order seen on the wire. + * + * If the field in question contains a TPID value, only tagged packets with the + * specified TPID will match the pattern. Alternatively, it's possible to match + * any type of tagged packets by means of the field @p has_vlan rather than use + * the EtherType/TPID field. Also, it's possible to leave the two fields unused. + * If this is the case, both tagged and untagged packets will match the pattern. */ +RTE_STD_C11 struct rte_flow_item_eth { - struct rte_ether_addr dst; /**< Destination MAC. */ - struct rte_ether_addr src; /**< Source MAC. */ - rte_be16_t type; /**< EtherType or TPID. */ + union { + struct { + /* + * These fields are retained for compatibility. + * Please switch to the new header field below. + */ + struct rte_ether_addr dst; /**< Destination MAC. */ + struct rte_ether_addr src; /**< Source MAC. */ + rte_be16_t type; /**< EtherType or TPID. */ + }; + struct rte_ether_hdr hdr; + }; uint32_t has_vlan:1; /**< Packet header contains at least one VLAN. */ uint32_t reserved:31; /**< Reserved, must be zero. */ }; @@ -751,9 +761,9 @@ struct rte_flow_item_eth { /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */ #ifndef __cplusplus static const struct rte_flow_item_eth rte_flow_item_eth_mask = { - .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .src.addr_bytes = "\xff\xff\xff\xff\xff\xff", - .type = RTE_BE16(0x0000), + .hdr.d_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.s_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .hdr.ether_type = RTE_BE16(0x0000), }; #endif -- 2.20.1