mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 07:15:17 +00:00
Code Issues Releases Wiki Activity

dpif-netdev/mfex: Add ipv6 profile based hashing.

Browse Source 
For packets which don't already have a hash calculated,
miniflow_hash_5tuple() calculates the hash of a packet
using the previously built miniflow.

This commit adds IPv6 profile specific hashing which
uses fixed offsets into the packet to improve hashing
performance.

Signed-off-by: Kumar Amber <kumar.amber@intel.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
This commit is contained in:
Kumar Amber
2022-07-01 17:58:38 +05:30
committed by Ian Stokes
parent 8cab30a9d2
commit b80f58cde2
3 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/dp-packet.h
View File

@@ -1117,6 +1117,49 @@ dp_packet_update_rss_hash_ipv4_tcp_udp(struct dp_packet *packet)
dp_packet_set_rss_hash(packet, hash);
}
static inline void ALWAYS_INLINE
dp_packet_update_rss_hash_ipv6_tcp_udp(struct dp_packet *packet)
{
if (dp_packet_rss_valid(packet)) {
return;
}
const uint8_t *pkt = dp_packet_data(packet);
const uint16_t l3_ofs = packet->l3_ofs;
uint32_t ipv6_src_off = offsetof(struct ovs_16aligned_ip6_hdr, ip6_src);
uint32_t ipv6_dst_off = offsetof(struct ovs_16aligned_ip6_hdr, ip6_dst);
uint32_t ipv6_proto_off = offsetof(struct ovs_16aligned_ip6_hdr,
ip6_ctlun.ip6_un1.ip6_un1_nxt);
const void *ipv6_src_l = &pkt[l3_ofs + ipv6_src_off];
const void *ipv6_src_h = &pkt[l3_ofs + ipv6_src_off + 8];
const void *ipv6_dst_l = &pkt[l3_ofs + ipv6_dst_off];
const void *ipv6_dst_h = &pkt[l3_ofs + ipv6_dst_off + 8];
const void *l4_ports = &pkt[packet->l4_ofs];
uint64_t ipv6_src_lo, ipv6_src_hi;
uint64_t ipv6_dst_lo, ipv6_dst_hi;
uint32_t ports;
uint32_t hash = 0;
memcpy(&ipv6_src_lo, ipv6_src_l, sizeof ipv6_src_lo);
memcpy(&ipv6_src_hi, ipv6_src_h, sizeof ipv6_src_hi);
memcpy(&ipv6_dst_lo, ipv6_dst_l, sizeof ipv6_dst_lo);
memcpy(&ipv6_dst_hi, ipv6_dst_h, sizeof ipv6_dst_hi);
memcpy(&ports, l4_ports, sizeof ports);
/* IPv6 Src and Dst. */
hash = hash_add64(hash, ipv6_src_lo);
hash = hash_add64(hash, ipv6_src_hi);
hash = hash_add64(hash, ipv6_dst_lo);
hash = hash_add64(hash, ipv6_dst_hi);
/* IPv6 proto. */
hash = hash_add(hash, pkt[l3_ofs + ipv6_proto_off]);
/* L4 ports. */
hash = hash_add(hash, ports);
hash = hash_finish(hash, 42);
dp_packet_set_rss_hash(packet, hash);
}
#ifdef __cplusplus
}
#endif

8
lib/dpif-netdev-extract-avx512.c
View File

@@ -887,7 +887,7 @@ mfex_avx512_process(struct dp_packet_batch *packets,
/* Process UDP header. */
mfex_handle_ipv6_l4((void *)&pkt[54], &blocks[9]);
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
} break;
case PROFILE_ETH_IPV6_TCP: {
@@ -910,7 +910,7 @@ mfex_avx512_process(struct dp_packet_batch *packets,
continue;
}
mfex_handle_tcp_flags(tcp, &blocks[9]);
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
} break;
case PROFILE_ETH_VLAN_IPV6_TCP: {
@@ -936,7 +936,7 @@ mfex_avx512_process(struct dp_packet_batch *packets,
continue;
}
mfex_handle_tcp_flags(tcp, &blocks[10]);
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
} break;
case PROFILE_ETH_VLAN_IPV6_UDP: {
@@ -957,7 +957,7 @@ mfex_avx512_process(struct dp_packet_batch *packets,
/* Process UDP header. */
mfex_handle_ipv6_l4((void *)&pkt[58], &blocks[10]);
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
} break;
default:
break;

4
lib/flow.c
View File

@@ -1019,6 +1019,8 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
if (dl_type == htons(ETH_TYPE_IP)) {
dp_packet_update_rss_hash_ipv4_tcp_udp(packet);
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
}
}
}
@@ -1032,6 +1034,8 @@ miniflow_extract(struct dp_packet *packet, struct miniflow *dst)
miniflow_push_be16(mf, ct_tp_dst, ct_tp_dst);
if (dl_type == htons(ETH_TYPE_IP)) {
dp_packet_update_rss_hash_ipv4_tcp_udp(packet);
} else if (dl_type == htons(ETH_TYPE_IPV6)) {
dp_packet_update_rss_hash_ipv6_tcp_udp(packet);
}
}
} else if (OVS_LIKELY(nw_proto == IPPROTO_SCTP)) {