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 1147841D30; Tue, 21 Feb 2023 17:47:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABD914320C; Tue, 21 Feb 2023 17:47:45 +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 17D7F40E0F for ; Tue, 21 Feb 2023 17:47:44 +0100 (CET) Received: by mail-pj1-f42.google.com with SMTP id co23-20020a17090afe9700b002341fadc370so5539868pjb.1 for ; Tue, 21 Feb 2023 08:47:44 -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=r97XuwUSuijJZvGmpV9ats7JhRzcnFAGXPYanq0F0Do=; b=lscFCNCc2leMu3zMZpEhjldeQaAGjYSKf44In7gFGGsxL9VPV60r/zBa7DC6YMjF19 0zcdEsPXuEdUWe5GDqE7XcqBA2xEm6TQUo33RBVBLk7cyZ1W7WhEv1qgbjlev2DC9eAP qExLEspCPoClrhIFSyPkso4cPo06t/RiBTK8KEc6ywayx9gzvVpUxViaZAHnix7AxUgD 7/DR+z9Ha+vLsH/fFdXXABQ0wvFpjXDsUmFS5b6kGy4YmUJkmnP2Le1rtVPrdMeUOI8G kVUua5O/OF2D7xmiqgptwVvEzYKUP/4j37xmJXViYeUt7u4yNFHa311h2DwANdcNUiJ7 sNeQ== 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=r97XuwUSuijJZvGmpV9ats7JhRzcnFAGXPYanq0F0Do=; b=RsHi4nEz54IVyWHvK2KoO3dYBefIYJCb/txxoxiDdmwVhSZJdLxiU5kTb5Vn9C+rm4 LBU6fhY4IbNMcw/s+L5NXC5DhJlZf+XCbNvyGReLaQrpjCs9zCNmufLgRc/LYWGFM8Wr LmBB7K/+GdSGvMhabXUkPWL5isxjrdFAEBZxMZGruES7FvBBTMCUGuJXHMi5N5f+WJaT R81QQulctDZ+t9eYch4cq+onKlIeti5g1KR9KdQEIz/VyCw2zhmj2hWIH6M/48xEjEEn MwfrbSwSgJbQYyb2BrZ0xumuRdHrD90kLhslNsjbRSkfGaRQTDbOlicThmxs7+vllBb2 YiYQ== X-Gm-Message-State: AO0yUKUme21OJyhZnpnacs4+QSLur21RCMoOqjmyW1GoLhVTDpO13kJA FQyH93FRY9FFrLWlChzc+fWefRmJyys= X-Google-Smtp-Source: AK7set/6R4YzY/aahD2sCE1zZ22cI9uLlJt4PESZQCoe4xTnMbtUMTng1GY03hTyB4jP2/91a7idCA== X-Received: by 2002:a17:903:2304:b0:19a:a673:4ee2 with SMTP id d4-20020a170903230400b0019aa6734ee2mr4160510plh.31.1676998063090; Tue, 21 Feb 2023 08:47:43 -0800 (PST) Received: from e1f40fda85e4.corp.google.com (56.4.82.34.bc.googleusercontent.com. [34.82.4.56]) by smtp.gmail.com with ESMTPSA id g8-20020a170902740800b001964c8164aasm318198pll.129.2023.02.21.08.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 08:47:42 -0800 (PST) From: Bili Dong To: vladimir.medvedkin@intel.com Cc: dev@dpdk.org, cristian.dumitrescu@intel.com, Bili Dong Subject: [PATCH v4] hash: add XOR32 hash function Date: Tue, 21 Feb 2023 16:47:31 +0000 Message-Id: <20230221164731.632143-1-qobilidop@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230215110630.3885175-1-qobilidop@gmail.com> References: <20230215110630.3885175-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 | 76 ++++++++++++++++++++++++++++++++++ 3 files changed, 107 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..df8c14d7c5 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_xor32}; 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_xor32) + return "rte_hash_xor32"; + return "UnknownHash"; } @@ -173,6 +190,16 @@ verify_precalculated_hash_func_tests(void) hash_values_crc[j][i], hash); return -1; } + + hash = rte_hash_xor32(key, hashtest_key_lens[i], + hashtest_initvals[j]); + if (hash != hash_values_xor[j][i]) { + printf("XOR32 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..0b5a7bef09 --- /dev/null +++ b/lib/hash/rte_hash_xor.h @@ -0,0 +1,76 @@ +/* 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 + +/** + * 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_xor32(const void *data, uint32_t data_len, uint32_t init_val) +{ + /* Operate in big endian from here on. */ + /* So we don't need to convert byte orders in the loop. */ + + uint64_t hash64 = rte_cpu_to_be_32(init_val); + const uint8_t *data8 = data; + + uint32_t i; + for (i = 0; i < data_len / 8; i++) { + hash64 ^= *(const uint64_t *)data8; + data8 += 8; + } + + if (data_len & 0x4) { + hash64 ^= *(const uint32_t *)data8; + data8 += 4; + } + + /* Operate in host endian from here on. */ + /* Because bit shifts only make sense in host endian. */ + + uint32_t hash32 = rte_be_to_cpu_32(hash64 ^ (hash64 >> 32)); + uint8_t offset = 0; + + if (data_len & 0x2) { + hash32 ^= (uint32_t)rte_be_to_cpu_16(*(const uint16_t *)data8) << 16; + data8 += 2; + offset += 2; + } + + if (data_len & 0x1) + hash32 ^= (uint32_t)(*(const uint8_t *)data8) << (8 * (3 - offset)); + + return hash32; +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_HASH_XOR_H_ */ -- 2.34.1