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 3F3A941CA5; Wed, 15 Feb 2023 12:06:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22EB9410DD; Wed, 15 Feb 2023 12:06:48 +0100 (CET) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mails.dpdk.org (Postfix) with ESMTP id 26F6840EE3 for ; Wed, 15 Feb 2023 12:06:47 +0100 (CET) Received: by mail-pj1-f42.google.com with SMTP id o13so17850497pjg.2 for ; Wed, 15 Feb 2023 03:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C9CDnwV2jB9dJyKl4aE/bBwnOWcySKWo244pfLyNIic=; b=FpQyunPC7hr/LS49b1zol5oewnxakB8LcLtyA5LB8tCQsA0IWbpbtOPnfnZJaIEbi6 zjMPeb182xa0OQ3meydtJr5MgCIAxvcvnsvkgct4UbADmNsU9uhllevD0zdYn2KmvtLo hBp340wzTkEGY2+KnS6PKWl1s3HZIB41Cfo55e0R0cp9SoNZ2hDCR7LHu1VgI7UTMoVI Q6gahQWd7JhmGUT95Ho00mL93WmP8m/3qyz1f5KQWS4IxmFm/2EHP7IYQ2n/2BAOp9Qz NwYP0pkr+EKZzpinjNimu0VgiDIR9eCbe5K03itk7Fzb51bmQXUEl7BimHvI/w3PJKna wEvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C9CDnwV2jB9dJyKl4aE/bBwnOWcySKWo244pfLyNIic=; b=jqMwVw7Wf8wP6v/CpwdF3SRKDnivyeksU2bZo37DR17SZKLYR2ZIJaTRPK063ZqHf2 WvvRw2NE2J5y3bDxc/z4BSLp9XC+QKv9RLgqL/7x33MLKFT4QsWAaswENIjrEEqlPjLj Vwy8rmltkuJGFziw3MhXGRibJdG4wUqY58CnAgrD+dco0SNc6K66lhxjtN1ZGgyQeEET bmF0azysBvKLyMbh0tU3kbO7QqXn/yS7wtWyHmaiSouPFQwuAPaEGsawCv4++TAXhDSq DlAZiI+k09UkI1+1c2TNmukDYQMflp15eq2JqbdQ6DrXLWszJ7ZoJTZDGKG1k0fFk63F V8KQ== X-Gm-Message-State: AO0yUKX7EAhjcQv+qbOL6fbUDNrnuoH/t49iwXa0dGo8pkvEU18zf0GE 0GAp50xvjozEPR5gjK5xj3Q= X-Google-Smtp-Source: AK7set+y13YbT9w576zzIHElY46YuaK2uY0LazFTRrxLw/VRO13hOdqvYFvaAjkz+mJzGhPG/CXJwQ== X-Received: by 2002:a17:90b:4a8b:b0:232:edb6:9710 with SMTP id lp11-20020a17090b4a8b00b00232edb69710mr2428865pjb.17.1676459206156; Wed, 15 Feb 2023 03:06:46 -0800 (PST) Received: from bilid.c.googlers.com.com (56.4.82.34.bc.googleusercontent.com. [34.82.4.56]) by smtp.gmail.com with ESMTPSA id v4-20020a17090a00c400b0022c9eddaf9dsm1239237pjd.0.2023.02.15.03.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 03:06:45 -0800 (PST) From: Bili Dong To: yipeng1.wang@intel.com Cc: dev@dpdk.org, cristian.dumitrescu@intel.com, Bili Dong Subject: [PATCH v3] hash: add XOR32 hash function Date: Wed, 15 Feb 2023 11:06:30 +0000 Message-Id: <20230215110630.3885175-1-qobilidop@gmail.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog In-Reply-To: <20230215105442.3878441-1-qobilidop@gmail.com> References: <20230215105442.3878441-1-qobilidop@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 An XOR32 hash is needed in the Software Switch (SWX) Pipeline for its use case in P4. We implement it in this patch so it could be easily registered in the pipeline later. Signed-off-by: Bili Dong --- .mailmap | 1 + app/test/test_hash_functions.c | 33 +++++++++++++++-- lib/hash/rte_hash_xor.h | 65 ++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 lib/hash/rte_hash_xor.h diff --git a/.mailmap b/.mailmap index 5015494210..176dd93b66 100644 --- a/.mailmap +++ b/.mailmap @@ -159,6 +159,7 @@ Bernard Iremonger Bert van Leeuwen Bhagyada Modali Bharat Mota +Bili Dong Bill Hong Billy McFall Billy O'Mahony diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c index 76d51b6e71..14d69d90c4 100644 --- a/app/test/test_hash_functions.c +++ b/app/test/test_hash_functions.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "test.h" @@ -22,8 +23,8 @@ * Hash values calculated for key sizes from array "hashtest_key_lens" * and for initial values from array "hashtest_initvals. * Each key will be formed by increasing each byte by 1: - * e.g.: key size = 4, key = 0x03020100 - * key size = 8, key = 0x0706050403020100 + * e.g.: key size = 4, key = 0x00010203 + * key size = 8, key = 0x0001020304050607 */ static uint32_t hash_values_jhash[2][12] = {{ 0x8ba9414b, 0xdf0d39c9, @@ -51,6 +52,19 @@ static uint32_t hash_values_crc[2][12] = {{ 0x789c104f, 0x53028d3e } }; +static uint32_t hash_values_xor[2][12] = {{ + 0x00000000, 0x00010000, + 0x00010203, 0x04040404, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0c040404, 0x000d0e0f, + 0x04212223, 0x04040404 +}, +{ + 0xdeadbeef, 0xdeacbeef, + 0xdeacbcec, 0xdaa9baeb, 0xdeadbeef, 0xdeadbeef, + 0xdeadbeef, 0xdeadbeef, 0xd2a9baeb, 0xdea0b0e0, + 0xda8c9ccc, 0xdaa9baeb +} +}; /******************************************************************************* * Hash function performance test configuration section. Each performance test @@ -61,7 +75,7 @@ static uint32_t hash_values_crc[2][12] = {{ */ #define HASHTEST_ITERATIONS 1000000 #define MAX_KEYSIZE 64 -static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc}; +static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc, rte_hash_xor}; static uint32_t hashtest_initvals[] = {0, 0xdeadbeef}; static uint32_t hashtest_key_lens[] = { 1, 2, /* Unusual key sizes */ @@ -85,6 +99,9 @@ get_hash_name(rte_hash_function f) if (f == rte_hash_crc) return "rte_hash_crc"; + if (f == rte_hash_xor) + return "rte_hash_xor"; + return "UnknownHash"; } @@ -173,6 +190,16 @@ verify_precalculated_hash_func_tests(void) hash_values_crc[j][i], hash); return -1; } + + hash = rte_hash_xor(key, hashtest_key_lens[i], + hashtest_initvals[j]); + if (hash != hash_values_xor[j][i]) { + printf("XOR for %u bytes with initial value 0x%x." + "Expected 0x%x, but got 0x%x\n", + hashtest_key_lens[i], hashtest_initvals[j], + hash_values_xor[j][i], hash); + return -1; + } } } diff --git a/lib/hash/rte_hash_xor.h b/lib/hash/rte_hash_xor.h new file mode 100644 index 0000000000..7004f83ec2 --- /dev/null +++ b/lib/hash/rte_hash_xor.h @@ -0,0 +1,65 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2023 Intel Corporation + */ + +#ifndef _RTE_HASH_XOR_H_ +#define _RTE_HASH_XOR_H_ + +/** + * @file + * + * RTE XOR Hash + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include + +#define LEFT8b_MASK rte_cpu_to_be_32(0xff000000) +#define LEFT16b_MASK rte_cpu_to_be_32(0xffff0000) + +/** + * Calculate XOR32 hash on user-supplied byte array. + * + * @param data + * Data to perform hash on. + * @param data_len + * How many bytes to use to calculate hash value. + * @param init_val + * Value to initialise hash generator. + * @return + * 32bit calculated hash value. + */ +static inline uint32_t +rte_hash_xor(const void *data, uint32_t data_len, uint32_t init_val) +{ + uint32_t i; + uintptr_t pd = (uintptr_t) data; + init_val = rte_cpu_to_be_32(init_val); + + for (i = 0; i < data_len / 4; i++) { + init_val ^= *(const uint32_t *)pd; + pd += 4; + } + + if (data_len & 0x2) { + init_val ^= *(const uint32_t *)pd & LEFT16b_MASK; + pd += 2; + } + + if (data_len & 0x1) + init_val ^= *(const uint32_t *)pd & LEFT8b_MASK; + + init_val = rte_be_to_cpu_32(init_val); + return init_val; +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_HASH_XOR_H_ */ -- 2.34.1