From 2857b14e22088c430753d108786748e3dc7a56fc Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 11 May 2018 11:06:23 -0700 Subject: bond: performance harvesting [VPP-1298] - hash is great. But it is a bit too slow for the DP. Use direct array indexing to quickly retrieve the slave interface. - the algorithm used by flow hash is great. But it is a bit too slow for the DP. Use l2_hash_hash() extracted from lb_hash.h which ECMP is using. It makes use of intrinsic crc32 instruction set. - shortcut modulo arithmetic when the operand is 2**x (where x up to 4) to avoid division instruction. - special case for link count == 1 in bond_tx_fn() - use clib_mem_unaligned to access data for the packet to avoid alignment error - Fix some typos for packet tracing. Change-Id: I8eae3ad497061c5473aa675ba894ee0211120d25 Signed-off-by: Steven (cherry picked from commit 0d88301a576191a0e330e539cf1dcb3837ee1bf6) --- src/vppinfra/crc32.h | 2 ++ src/vppinfra/lb_hash_hash.h | 69 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/vppinfra/lb_hash_hash.h (limited to 'src/vppinfra') diff --git a/src/vppinfra/crc32.h b/src/vppinfra/crc32.h index 340b539558e..7361129ed55 100644 --- a/src/vppinfra/crc32.h +++ b/src/vppinfra/crc32.h @@ -23,6 +23,7 @@ #include #define crc32_u64 _mm_crc32_u64 +#define crc32_u32 _mm_crc32_u32 static_always_inline u32 clib_crc32c (u8 * s, int len) @@ -56,6 +57,7 @@ clib_crc32c (u8 * s, int len) #define crc32_u64 __crc32cd +#define crc32_u32 __crc32cw static_always_inline u32 clib_crc32c (u8 * s, int len) diff --git a/src/vppinfra/lb_hash_hash.h b/src/vppinfra/lb_hash_hash.h new file mode 100644 index 00000000000..fb251591eeb --- /dev/null +++ b/src/vppinfra/lb_hash_hash.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __included_lb_hash_hash_h__ +#define __included_lb_hash_hash_h__ + +#include +#include + +#if defined(clib_crc32c_uses_intrinsics) && !defined (__i386__) +static_always_inline u32 +lb_hash_hash (u64 k0, u64 k1, u64 k2, u64 k3, u64 k4) +{ + u64 val = 0; + val = crc32_u64 (val, k0); + val = crc32_u64 (val, k1); + val = crc32_u64 (val, k2); + val = crc32_u64 (val, k3); + val = crc32_u64 (val, k4); + return (u32) val; +} + +/* Note: k0 is u64 and k1 is u32 */ +static_always_inline u32 +lb_hash_hash_2_tuples (u64 k0, u32 k1) +{ + u64 val = 0; + val = crc32_u64 (val, k0); + val = crc32_u32 (val, k1); + return (u32) val; +} +#else +static_always_inline u32 +lb_hash_hash (u64 k0, u64 k1, u64 k2, u64 k3, u64 k4) +{ + u64 tmp = k0 ^ k1 ^ k2 ^ k3 ^ k4; + return (u32) clib_xxhash (tmp); +} + +/* Note: k0 is u64 and k1 is u32 */ +static_always_inline u32 +lb_hash_hash_2_tuples (u64 k0, u32 k1) +{ + u64 tmp = k0 ^ k1; + return (u32) clib_xxhash (tmp); +} +#endif + +#endif /* __included_lb_hash_hash_h__ */ + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg