net/mlx5: optimize performance for IPv4/IPv6
v2 cover net/mlx5: optimize performance for IPv4/IPv6
The HW is optimized for IPv4/IPv6. For such cases avoid matching on ethertype, and use ip_version field instead.
Eli Britstein (2):
net/mlx5: introduce a helper to set IP version match net/mlx5: optimize performance for IPv4/IPv6 ethertype
drivers/net/mlx5/mlx5_flow_dv.c | 91 +++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 22 deletions(-)
Signature · 1 line
2.14.5
PATCH v2 1/2 net/mlx5: introduce a helper to set IP version match
Introduce a heler function to set the ip_version match.
--- drivers/net/mlx5/mlx5_flow_dv.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-)
drivers/net/mlx5/mlx5_flow_dv.c +28 -10
@@ -5449,6 +5449,32 @@ flow_dv_check_valid_spec(void *match_mask, void *match_value) }#endif +/** +* Add match of ip_version. +* +* @param[in] group +* Flow group. +* @param[in] headers_v +* Values header pointer. +* @param[in] headers_m +* Masks header pointer. +* @param[in] ip_version +* The IP version to set. +*/ +static inline void +flow_dv_set_match_ip_version (uint32_t group, +void *headers_v, +void *headers_m, +uint8_t ip_version) +{ +if (group ==0 ) +MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version,0xf ); +else +MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version, + ip_version); +MLX5_SET (fte_match_set_lyr_2_4, headers_v, ip_version, ip_version); +} +/** * Add Ethernet item to matcher and to the value. *
@@ -5635,11 +5661,7 @@ flow_dv_translate_item_ipv4(void *matcher, void *key, outer_headers); headers_v =MLX5_ADDR_OF (fte_match_param, key, outer_headers); } -if (group ==0 ) -MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version,0xf ); -else -MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version,0x4 ); -MLX5_SET (fte_match_set_lyr_2_4, headers_v, ip_version,4 ); +flow_dv_set_match_ip_version (group, headers_v, headers_m,4 );/* * On outer header (which must contains L2), or inner header with L2, * set cvlan_tag mask bit to mark this packet as untagged.
@@ -5737,11 +5759,7 @@ flow_dv_translate_item_ipv6(void *matcher, void *key, outer_headers); headers_v =MLX5_ADDR_OF (fte_match_param, key, outer_headers); } -if (group ==0 ) -MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version,0xf ); -else -MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version,0x6 ); -MLX5_SET (fte_match_set_lyr_2_4, headers_v, ip_version,6 ); +flow_dv_set_match_ip_version (group, headers_v, headers_m,6 );/* * On outer header (which must contains L2), or inner header with L2, * set cvlan_tag mask bit to mark this packet as untagged.
Signature · 1 line
2.14.5
PATCH v2 2/2 net/mlx5: optimize performance for IPv4/IPv6 ethertype
In reply to Eli BritsteinThe HW is optimized for IPv4/IPv6. For such cases avoid matching on ethertype, and use ip_version field instead.
--- drivers/net/mlx5/mlx5_flow_dv.c | 53 +++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 12 deletions(-)
drivers/net/mlx5/mlx5_flow_dv.c +41 -12
@@ -5473,6 +5473,8 @@ flow_dv_set_match_ip_version(uint32_t group,MLX5_SET (fte_match_set_lyr_2_4, headers_m, ip_version, ip_version);MLX5_SET (fte_match_set_lyr_2_4, headers_v, ip_version, ip_version); +MLX5_SET (fte_match_set_lyr_2_4, headers_v, ethertype,0 ); +MLX5_SET (fte_match_set_lyr_2_4, headers_m, ethertype,0 ); }/**
@@ -5489,7 +5491,8 @@ flow_dv_set_match_ip_version(uint32_t group,*/ static void flow_dv_translate_item_eth (void *matcher,void *key, -const struct rte_flow_item *item,int inner) +const struct rte_flow_item *item,int inner, +uint32_t group) {const struct rte_flow_item_eth *eth_m = item->mask;const struct rte_flow_item_eth *eth_v = item->spec;
@@ -5544,11 +5547,22 @@ flow_dv_translate_item_eth(void *matcher, void *key,* HW supports match on one Ethertype, the Ethertype following the last * VLAN tag of the packet (see PRM). * Set match on ethertype only if ETH header is not followed by VLAN. +* HW is optimized for IPv4/IPv6. In such cases, avoid setting +* ethertype, and use ip_version field instead. */ -MLX5_SET (fte_match_set_lyr_2_4, headers_m, ethertype, -rte_be_to_cpu_16 (eth_m->type)); - l24_v =MLX5_ADDR_OF (fte_match_set_lyr_2_4, headers_v, ethertype); - *(uint16_t *)(l24_v) = eth_m->type & eth_v->type; +if (eth_v->type ==RTE_BE16 (RTE_ETHER_TYPE_IPV4 ) && + eth_m->type ==0xFFFF ) { +flow_dv_set_match_ip_version (group, headers_v, headers_m,4 ); + }else if (eth_v->type ==RTE_BE16 (RTE_ETHER_TYPE_IPV6 ) && + eth_m->type ==0xFFFF ) { +flow_dv_set_match_ip_version (group, headers_v, headers_m,6 ); + }else { +MLX5_SET (fte_match_set_lyr_2_4, headers_m, ethertype, +rte_be_to_cpu_16 (eth_m->type)); + l24_v =MLX5_ADDR_OF (fte_match_set_lyr_2_4, headers_v, + ethertype); + *(uint16_t *)(l24_v) = eth_m->type & eth_v->type; + } }/**
@@ -5569,7 +5583,7 @@ static void flow_dv_translate_item_vlan(struct mlx5_flow *dev_flow, void *matcher, void *key, const struct rte_flow_item *item, - int inner) + int inner, uint32_t group) { const struct rte_flow_item_vlan *vlan_m = item->mask;const struct rte_flow_item_vlan *vlan_v = item->spec;
@@ -5607,10 +5621,23 @@ flow_dv_translate_item_vlan(struct mlx5_flow *dev_flow,MLX5_SET (fte_match_set_lyr_2_4, headers_v, first_cfi, tci_v >>12 );MLX5_SET (fte_match_set_lyr_2_4, headers_m, first_prio, tci_m >>13 );MLX5_SET (fte_match_set_lyr_2_4, headers_v, first_prio, tci_v >>13 ); -MLX5_SET (fte_match_set_lyr_2_4, headers_m, ethertype, -rte_be_to_cpu_16 (vlan_m->inner_type)); -MLX5_SET (fte_match_set_lyr_2_4, headers_v, ethertype, -rte_be_to_cpu_16 (vlan_m->inner_type & vlan_v->inner_type)); +/* +* HW is optimized for IPv4/IPv6. In such cases, avoid setting +* ethertype, and use ip_version field instead. +*/ +if (vlan_v->inner_type ==RTE_BE16 (RTE_ETHER_TYPE_IPV4 ) && + vlan_m->inner_type ==0xFFFF ) { +flow_dv_set_match_ip_version (group, headers_v, headers_m,4 ); + }else if (vlan_v->inner_type ==RTE_BE16 (RTE_ETHER_TYPE_IPV6 ) && + vlan_m->inner_type ==0xFFFF ) { +flow_dv_set_match_ip_version (group, headers_v, headers_m,6 ); + }else { +MLX5_SET (fte_match_set_lyr_2_4, headers_m, ethertype, +rte_be_to_cpu_16 (vlan_m->inner_type)); +MLX5_SET (fte_match_set_lyr_2_4, headers_v, ethertype, +rte_be_to_cpu_16 (vlan_m->inner_type & + vlan_v->inner_type)); + } }/**
@@ -7944,7 +7971,8 @@ __flow_dv_translate(struct rte_eth_dev *dev,break ;case RTE_FLOW_ITEM_TYPE_ETH :flow_dv_translate_item_eth (match_mask, match_value, - items, tunnel); + items, tunnel, + dev_flow->dv.group); matcher.priority =MLX5_PRIORITY_MAP_L2 ; last_item = tunnel ?MLX5_FLOW_LAYER_INNER_L2 :MLX5_FLOW_LAYER_OUTER_L2 ;
@@ -7952,7 +7980,8 @@ __flow_dv_translate(struct rte_eth_dev *dev,case RTE_FLOW_ITEM_TYPE_VLAN :flow_dv_translate_item_vlan (dev_flow, match_mask, match_value, - items, tunnel); + items, tunnel, + dev_flow->dv.group); matcher.priority =MLX5_PRIORITY_MAP_L2 ; last_item = tunnel ? (MLX5_FLOW_LAYER_INNER_L2 | MLX5_FLOW_LAYER_INNER_VLAN) :
Signature · 1 line
2.14.5
From: Eli Britstein <[email protected]>
Quoted 6 lines
The HW is optimized for IPv4/IPv6. For such cases avoid matching on ethertype, and use
ip_versionfield instead.Eli Britstein (2):
net/mlx5: introduce a helper to set IP version match net/mlx5: optimize performance for IPv4/IPv6 ethertype
Quoted 6 lines
drivers/net/mlx5/mlx5_flow_dv.c | 91 +++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 22 deletions(-)--
2.14.5
Hi,
Quoted 16 lines
-----Original Message-----
From: Eli Britstein <[email protected]>
Sent: Sunday, May 3, 2020 1:48 PM
To: [email protected]
Cc: Matan Azrad <[email protected]>; Raslan Darawsheh <[email protected]>; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; Eli Britstein <[email protected]>
Subject: [PATCH V2 0/2] net/mlx5: optimize performance for IPv4/IPv6The HW is optimized for IPv4/IPv6. For such cases avoid matching on ethertype, and use
ip_versionfield instead.Eli Britstein (2):
net/mlx5: introduce a helper to set IP version match net/mlx5: optimize performance for IPv4/IPv6 ethertype
Quoted 6 lines
drivers/net/mlx5/mlx5_flow_dv.c | 91 +++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 22 deletions(-)--
2.14.5
Series applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh