From: Thomas Monjalon <tho...@monjalon.net>
As announced in the deprecation notice, flow item structures
should re-use the protocol header definitions from the directory lib/net/.
The protocol struct is added in an unnamed union, keeping old field names.
The ARP header struct members are used in testpmd
instead of the redundant fields in the flow items.
Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
---
app/test-pmd/cmdline_flow.c | 8 +++---
doc/guides/prog_guide/rte_flow.rst | 10 +-------
doc/guides/rel_notes/deprecation.rst | 1 -
lib/ethdev/rte_flow.h | 37 ++++++++++++++++++----------
4 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index dd6da9d98d9b..1d337a96199d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -4226,7 +4226,7 @@ static const struct token token_list[] = {
.next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_MAC_ADDR),
item_param),
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
- sha)),
+ hdr.arp_data.arp_sha)),
},
[ITEM_ARP_ETH_IPV4_SPA] = {
.name = "spa",
@@ -4234,7 +4234,7 @@ static const struct token token_list[] = {
.next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_IPV4_ADDR),
item_param),
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
- spa)),
+ hdr.arp_data.arp_sip)),
},
[ITEM_ARP_ETH_IPV4_THA] = {
.name = "tha",
@@ -4242,7 +4242,7 @@ static const struct token token_list[] = {
.next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_MAC_ADDR),
item_param),
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
- tha)),
+ hdr.arp_data.arp_tha)),
},
[ITEM_ARP_ETH_IPV4_TPA] = {
.name = "tpa",
@@ -4250,7 +4250,7 @@ static const struct token token_list[] = {
.next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_IPV4_ADDR),
item_param),
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
- tpa)),
+ hdr.arp_data.arp_tip)),
},
[ITEM_IPV6_EXT] = {
.name = "ipv6_ext",
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index ec2e335fac3d..8bf85df2f611 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1100,15 +1100,7 @@ Item: ``ARP_ETH_IPV4``
Matches an ARP header for Ethernet/IPv4.
-- ``hdr``: hardware type, normally 1.
-- ``pro``: protocol type, normally 0x0800.
-- ``hln``: hardware address length, normally 6.
-- ``pln``: protocol address length, normally 4.
-- ``op``: opcode (1 for request, 2 for reply).
-- ``sha``: sender hardware address.
-- ``spa``: sender IPv4 address.
-- ``tha``: target hardware address.
-- ``tpa``: target IPv4 address.
+- ``hdr``: header definition (``rte_arp.h``).
- Default ``mask`` matches SHA, SPA, THA and TPA.
Item: ``IPV6_EXT``
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index b89450b239ef..8e3683990117 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -64,7 +64,6 @@ Deprecation Notices
These items are not compliant (not including struct from lib/net/):
- ``rte_flow_item_ah``
- - ``rte_flow_item_arp_eth_ipv4``
- ``rte_flow_item_e_tag``
- ``rte_flow_item_geneve``
- ``rte_flow_item_geneve_opt``
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index 85ca73d1dc04..a215daa83640 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -20,6 +20,7 @@
#include <rte_compat.h>
#include <rte_common.h>
#include <rte_ether.h>
+#include <rte_arp.h>
#include <rte_icmp.h>
#include <rte_ip.h>
#include <rte_sctp.h>
@@ -1255,26 +1256,36 @@ static const struct rte_flow_item_vxlan_gpe
rte_flow_item_vxlan_gpe_mask = {
*
* Matches an ARP header for Ethernet/IPv4.
*/
+RTE_STD_C11
struct rte_flow_item_arp_eth_ipv4 {
- rte_be16_t hrd; /**< Hardware type, normally 1. */
- rte_be16_t pro; /**< Protocol type, normally 0x0800. */
- uint8_t hln; /**< Hardware address length, normally 6. */
- uint8_t pln; /**< Protocol address length, normally 4. */
- rte_be16_t op; /**< Opcode (1 for request, 2 for reply). */
- struct rte_ether_addr sha; /**< Sender hardware address. */
- rte_be32_t spa; /**< Sender IPv4 address. */
- struct rte_ether_addr tha; /**< Target hardware address. */
- rte_be32_t tpa; /**< Target IPv4 address. */
+ union {
+ struct {
+ /*
+ * These are old fields kept for compatibility.
+ * Please prefer hdr field below.
+ */
+ rte_be16_t hrd; /**< Hardware type, normally 1. */
+ rte_be16_t pro; /**< Protocol type, normally 0x0800. */
+ uint8_t hln; /**< Hardware address length, normally 6.
*/
+ uint8_t pln; /**< Protocol address length, normally 4.
*/
+ rte_be16_t op; /**< Opcode (1 for request, 2 for
reply). */
+ struct rte_ether_addr sha; /**< Sender hardware
address. */
+ rte_be32_t spa; /**< Sender IPv4 address. */
+ struct rte_ether_addr tha; /**< Target hardware
address. */
+ rte_be32_t tpa; /**< Target IPv4 address. */
+ };
+ struct rte_arp_hdr hdr; /**< ARP header definition. */
+ };
};
/** Default mask for RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4. */
#ifndef __cplusplus
static const struct rte_flow_item_arp_eth_ipv4
rte_flow_item_arp_eth_ipv4_mask = {
- .sha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .spa = RTE_BE32(0xffffffff),
- .tha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
- .tpa = RTE_BE32(0xffffffff),
+ .hdr.arp_data.arp_sha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .hdr.arp_data.arp_sip = RTE_BE32(UINT32_MAX),
+ .hdr.arp_data.arp_tha.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .hdr.arp_data.arp_tip = RTE_BE32(UINT32_MAX),
};
#endif
--
2.25.1
