2009-07-08 13:19:16 -07:00
|
|
|
|
/*
|
2016-01-18 22:52:48 -08:00
|
|
|
|
* Copyright (c) 2008, 2009, 2010, 2012, 2013, 2014, 2016 Nicira, Inc.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* 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:
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*
|
2009-06-15 15:11:30 -07:00
|
|
|
|
* 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.
|
2009-07-08 13:19:16 -07:00
|
|
|
|
*/
|
|
|
|
|
#ifndef HASH_H
|
|
|
|
|
#define HASH_H 1
|
|
|
|
|
|
2009-11-04 15:01:00 -08:00
|
|
|
|
#include <stdbool.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#include <stddef.h>
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
#include <string.h>
|
2009-10-14 17:03:55 -07:00
|
|
|
|
#include "util.h"
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2011-08-04 16:18:59 -07:00
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-01-18 11:29:57 -08:00
|
|
|
|
static inline uint32_t
|
|
|
|
|
hash_rot(uint32_t x, int k)
|
|
|
|
|
{
|
|
|
|
|
return (x << k) | (x >> (32 - k));
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
uint32_t hash_bytes(const void *, size_t n_bytes, uint32_t basis);
|
2015-02-27 09:07:18 -08:00
|
|
|
|
/* The hash input must be a word larger than 128 bits. */
|
2014-08-12 11:12:12 +12:00
|
|
|
|
void hash_bytes128(const void *_, size_t n_bytes, uint32_t basis,
|
|
|
|
|
ovs_u128 *out);
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_int(uint32_t x, uint32_t basis);
|
|
|
|
|
static inline uint32_t hash_2words(uint32_t, uint32_t);
|
2014-09-09 14:16:16 -07:00
|
|
|
|
static inline uint32_t hash_uint64(const uint64_t);
|
|
|
|
|
static inline uint32_t hash_uint64_basis(const uint64_t x,
|
|
|
|
|
const uint32_t basis);
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
uint32_t hash_3words(uint32_t, uint32_t, uint32_t);
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_boolean(bool x, uint32_t basis);
|
|
|
|
|
uint32_t hash_double(double, uint32_t basis);
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_pointer(const void *, uint32_t basis);
|
|
|
|
|
static inline uint32_t hash_string(const char *, uint32_t basis);
|
|
|
|
|
|
|
|
|
|
/* Murmurhash by Austin Appleby,
|
2016-12-21 16:39:16 +00:00
|
|
|
|
* from https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
*
|
|
|
|
|
* The upstream license there says:
|
|
|
|
|
*
|
2019-01-23 12:09:46 -08:00
|
|
|
|
* MurmurHash3 was written by Austin Appleby, and is placed in the public
|
|
|
|
|
* domain. The author hereby disclaims copyright to this source code.
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
*
|
|
|
|
|
* See hash_words() for sample usage. */
|
|
|
|
|
|
|
|
|
|
static inline uint32_t mhash_add__(uint32_t hash, uint32_t data)
|
2012-01-18 11:29:57 -08:00
|
|
|
|
{
|
2016-10-14 15:37:07 +01:00
|
|
|
|
/* zero-valued 'data' will not change the 'hash' value */
|
|
|
|
|
if (!data) {
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
data *= 0xcc9e2d51;
|
|
|
|
|
data = hash_rot(data, 15);
|
|
|
|
|
data *= 0x1b873593;
|
|
|
|
|
return hash ^ data;
|
2012-01-18 11:29:57 -08:00
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
static inline uint32_t mhash_add(uint32_t hash, uint32_t data)
|
2012-01-18 11:29:57 -08:00
|
|
|
|
{
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
hash = mhash_add__(hash, data);
|
|
|
|
|
hash = hash_rot(hash, 13);
|
|
|
|
|
return hash * 5 + 0xe6546b64;
|
2012-01-18 11:29:57 -08:00
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2014-08-12 11:12:12 +12:00
|
|
|
|
static inline uint32_t mhash_finish(uint32_t hash)
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
{
|
|
|
|
|
hash ^= hash >> 16;
|
|
|
|
|
hash *= 0x85ebca6b;
|
|
|
|
|
hash ^= hash >> 13;
|
|
|
|
|
hash *= 0xc2b2ae35;
|
|
|
|
|
hash ^= hash >> 16;
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
2017-06-09 15:30:42 -07:00
|
|
|
|
static inline uint32_t hash_add(uint32_t hash, uint32_t data);
|
|
|
|
|
static inline uint32_t hash_add64(uint32_t hash, uint64_t data);
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_add_words(uint32_t, const uint32_t *, size_t);
|
|
|
|
|
static inline uint32_t hash_add_words64(uint32_t, const uint64_t *, size_t);
|
|
|
|
|
static inline uint32_t hash_add_bytes32(uint32_t, const uint32_t *, size_t);
|
|
|
|
|
static inline uint32_t hash_add_bytes64(uint32_t, const uint64_t *, size_t);
|
|
|
|
|
|
2019-01-25 11:28:01 +00:00
|
|
|
|
#if (defined(__ARM_FEATURE_CRC32) && defined(__aarch64__))
|
|
|
|
|
#include "hash-aarch64.h"
|
|
|
|
|
|
|
|
|
|
#elif !(defined(__SSE4_2__) && defined(__x86_64__))
|
2014-08-12 11:12:12 +12:00
|
|
|
|
/* Mhash-based implementation. */
|
2014-07-11 05:57:11 -07:00
|
|
|
|
|
2014-07-04 07:57:18 -07:00
|
|
|
|
static inline uint32_t hash_add(uint32_t hash, uint32_t data)
|
|
|
|
|
{
|
|
|
|
|
return mhash_add(hash, data);
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
static inline uint32_t hash_add64(uint32_t hash, uint64_t data)
|
|
|
|
|
{
|
|
|
|
|
return hash_add(hash_add(hash, data), data >> 32);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-04 07:57:18 -07:00
|
|
|
|
static inline uint32_t hash_finish(uint32_t hash, uint32_t final)
|
|
|
|
|
{
|
2014-08-12 11:12:12 +12:00
|
|
|
|
return mhash_finish(hash ^ final);
|
2014-07-04 07:57:18 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-11 05:57:11 -07:00
|
|
|
|
/* Returns the hash of the 'n' 32-bit words at 'p', starting from 'basis'.
|
|
|
|
|
* 'p' must be properly aligned.
|
|
|
|
|
*
|
|
|
|
|
* This is inlined for the compiler to have access to the 'n_words', which
|
|
|
|
|
* in many cases is a constant. */
|
|
|
|
|
static inline uint32_t
|
2017-06-09 15:30:42 -07:00
|
|
|
|
hash_words_inline(const uint32_t *p, size_t n_words, uint32_t basis)
|
2009-07-08 13:19:16 -07:00
|
|
|
|
{
|
2017-06-09 15:30:42 -07:00
|
|
|
|
return hash_finish(hash_add_words(basis, p, n_words), n_words * 4);
|
2009-07-08 13:19:16 -07:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-11 05:57:11 -07:00
|
|
|
|
static inline uint32_t
|
2017-06-09 15:30:42 -07:00
|
|
|
|
hash_words64_inline(const uint64_t *p, size_t n_words, uint32_t basis)
|
2009-11-04 15:01:00 -08:00
|
|
|
|
{
|
2017-06-09 15:30:42 -07:00
|
|
|
|
return hash_finish(hash_add_words64(basis, p, n_words), n_words * 8);
|
2009-11-04 15:01:00 -08:00
|
|
|
|
}
|
|
|
|
|
|
2009-11-04 15:00:28 -08:00
|
|
|
|
static inline uint32_t hash_pointer(const void *p, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
/* Often pointers are hashed simply by casting to integer type, but that
|
|
|
|
|
* has pitfalls since the lower bits of a pointer are often all 0 for
|
|
|
|
|
* alignment reasons. It's hard to guess where the entropy really is, so
|
|
|
|
|
* we give up here and just use a high-quality hash function.
|
|
|
|
|
*
|
|
|
|
|
* The double cast suppresses a warning on 64-bit systems about casting to
|
|
|
|
|
* an integer to different size. That's OK in this case, since most of the
|
|
|
|
|
* entropy in the pointer is almost certainly in the lower 32 bits. */
|
|
|
|
|
return hash_int((uint32_t) (uintptr_t) p, basis);
|
|
|
|
|
}
|
|
|
|
|
|
hash: Replace primary hash functions by murmurhash.
murmurhash is faster than Jenkins and slightly higher quality, so switch to
it for hashing words.
The best timings I got for hashing for data lengths of the following
numbers of 32-bit words, in seconds per 1,000,000,000 hashes, were:
words murmurhash Jenkins hash
----- ---------- ------------
1 8.4 10.4
2 10.3 10.3
3 11.2 10.7
4 12.6 18.0
5 13.9 18.3
6 15.2 18.7
In other words, murmurhash outperforms Jenkins for all input lengths other
than exactly 3 32-bit words (12 bytes). (It's understandable that Jenkins
would have a best case at 12 bytes, because Jenkins works in 12-byte
chunks.) Even in the case where Jenkins is faster, it's only by 5%. On
average within this data set, murmurhash is 15% faster, and for 4-word
input it is 30% faster.
We retain Jenkins for flow_hash_symmetric_l4() and flow_hash_fields(),
which are cases where the hash value is exposed externally.
This commit appears to improve "ovs-benchmark rate" results slightly by
a few hundred connections per second (under 1%), when used with an NVP
controller.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
2013-01-16 16:14:42 -08:00
|
|
|
|
static inline uint32_t hash_2words(uint32_t x, uint32_t y)
|
2012-08-21 14:26:23 -07:00
|
|
|
|
{
|
2014-07-04 07:57:18 -07:00
|
|
|
|
return hash_finish(hash_add(hash_add(x, 0), y), 8);
|
2012-08-21 14:26:23 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
static inline uint32_t hash_uint64_basis(const uint64_t x,
|
|
|
|
|
const uint32_t basis)
|
2014-03-27 19:38:04 -07:00
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
return hash_finish(hash_add64(basis, x), 8);
|
2014-03-27 19:38:04 -07:00
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
static inline uint32_t hash_uint64(const uint64_t x)
|
2014-03-27 20:22:37 -07:00
|
|
|
|
{
|
2015-01-06 11:10:42 -08:00
|
|
|
|
return hash_uint64_basis(x, 0);
|
2014-03-27 20:22:37 -07:00
|
|
|
|
}
|
2014-07-11 05:57:11 -07:00
|
|
|
|
|
|
|
|
|
#else /* __SSE4_2__ && __x86_64__ */
|
|
|
|
|
#include <smmintrin.h>
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_add(uint32_t hash, uint32_t data)
|
|
|
|
|
{
|
|
|
|
|
return _mm_crc32_u32(hash, data);
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-06 11:10:42 -08:00
|
|
|
|
/* Add the halves of 'data' in the memory order. */
|
|
|
|
|
static inline uint32_t hash_add64(uint32_t hash, uint64_t data)
|
|
|
|
|
{
|
|
|
|
|
return _mm_crc32_u64(hash, data);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-11 05:57:11 -07:00
|
|
|
|
static inline uint32_t hash_finish(uint64_t hash, uint64_t final)
|
|
|
|
|
{
|
|
|
|
|
/* The finishing multiplier 0x805204f3 has been experimentally
|
|
|
|
|
* derived to pass the testsuite hash tests. */
|
|
|
|
|
hash = _mm_crc32_u64(hash, final) * 0x805204f3;
|
|
|
|
|
return hash ^ (uint32_t)hash >> 16; /* Increase entropy in LSBs. */
|
|
|
|
|
}
|
|
|
|
|
|
2023-01-30 17:04:17 -05:00
|
|
|
|
static inline uint32_t
|
|
|
|
|
hash_finish32(uint64_t hash, uint32_t final, uint32_t semifinal)
|
|
|
|
|
{
|
|
|
|
|
/* The finishing multiplier 0x805204f3 has been experimentally
|
|
|
|
|
* derived to pass the testsuite hash tests. */
|
|
|
|
|
hash = _mm_crc32_u32(hash, semifinal);
|
2024-08-28 15:28:38 +02:00
|
|
|
|
hash = _mm_crc32_u32(hash, final) * 0x805204f3ULL;
|
2023-01-30 17:04:17 -05:00
|
|
|
|
return hash ^ ((uint32_t) hash >> 16); /* Increase entropy in LSBs. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
2023-09-16 15:28:54 +08:00
|
|
|
|
hash_words_32aligned(const uint32_t *p, size_t n_words, uint32_t basis)
|
2023-01-30 17:04:17 -05:00
|
|
|
|
{
|
|
|
|
|
uint32_t hash1 = basis;
|
|
|
|
|
uint32_t hash2 = 0;
|
|
|
|
|
uint32_t hash3 = n_words;
|
|
|
|
|
const uint32_t *endp = (const uint32_t *) p + n_words;
|
|
|
|
|
const uint32_t *limit = p + n_words - 6;
|
|
|
|
|
|
|
|
|
|
while (p <= limit) {
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[0]);
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[1]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[2]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[3]);
|
|
|
|
|
hash3 = _mm_crc32_u32(hash3, p[4]);
|
|
|
|
|
hash3 = _mm_crc32_u32(hash3, p[5]);
|
|
|
|
|
p += 6;
|
|
|
|
|
}
|
|
|
|
|
switch (endp - (const uint32_t *) p) {
|
|
|
|
|
case 1:
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[0]);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[0]);
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[1]);
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[0]);
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[1]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[2]);
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[0]);
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[1]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[2]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[3]);
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[0]);
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, p[1]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[2]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, p[3]);
|
|
|
|
|
hash3 = _mm_crc32_u32(hash3, p[4]);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return hash_finish32(hash1, hash2, hash3);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-11 05:57:11 -07:00
|
|
|
|
/* Returns the hash of the 'n' 32-bit words at 'p_', starting from 'basis'.
|
|
|
|
|
* We access 'p_' as a uint64_t pointer, which is fine for __SSE_4_2__.
|
|
|
|
|
*
|
|
|
|
|
* This is inlined for the compiler to have access to the 'n_words', which
|
|
|
|
|
* in many cases is a constant. */
|
|
|
|
|
static inline uint32_t
|
2023-01-30 17:04:17 -05:00
|
|
|
|
hash_words_inline(const uint32_t *p_, size_t n_words, uint32_t basis)
|
2014-07-11 05:57:11 -07:00
|
|
|
|
{
|
2023-09-16 15:28:54 +08:00
|
|
|
|
const uint64_t *p = ALIGNED_CAST(const uint64_t *, p_);
|
2014-07-11 05:57:11 -07:00
|
|
|
|
uint64_t hash1 = basis;
|
|
|
|
|
uint64_t hash2 = 0;
|
|
|
|
|
uint64_t hash3 = n_words;
|
|
|
|
|
const uint32_t *endp = (const uint32_t *)p + n_words;
|
|
|
|
|
const uint64_t *limit = p + n_words / 2 - 3;
|
|
|
|
|
|
2023-01-30 17:04:17 -05:00
|
|
|
|
if (OVS_UNLIKELY(((intptr_t) p & ((sizeof(uint64_t)) - 1)) != 0)) {
|
|
|
|
|
return hash_words_32aligned(p_, n_words, basis);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-11 05:57:11 -07:00
|
|
|
|
while (p <= limit) {
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
hash2 = _mm_crc32_u64(hash2, p[1]);
|
|
|
|
|
hash3 = _mm_crc32_u64(hash3, p[2]);
|
|
|
|
|
p += 3;
|
|
|
|
|
}
|
|
|
|
|
switch (endp - (const uint32_t *)p) {
|
|
|
|
|
case 1:
|
|
|
|
|
hash1 = _mm_crc32_u32(hash1, *(const uint32_t *)&p[0]);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
hash2 = _mm_crc32_u32(hash2, *(const uint32_t *)&p[1]);
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
hash2 = _mm_crc32_u64(hash2, p[1]);
|
|
|
|
|
break;
|
|
|
|
|
case 5:
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
hash2 = _mm_crc32_u64(hash2, p[1]);
|
|
|
|
|
hash3 = _mm_crc32_u32(hash3, *(const uint32_t *)&p[2]);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return hash_finish(hash1, hash2 << 32 | hash3);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A simpler version for 64-bit data.
|
|
|
|
|
* 'n_words' is the count of 64-bit words, basis is 64 bits. */
|
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_words64_inline(const uint64_t *p, size_t n_words, uint32_t basis)
|
2014-07-11 05:57:11 -07:00
|
|
|
|
{
|
2015-01-06 13:48:54 -08:00
|
|
|
|
uint64_t hash1 = basis;
|
|
|
|
|
uint64_t hash2 = 0;
|
2014-07-11 05:57:11 -07:00
|
|
|
|
uint64_t hash3 = n_words;
|
|
|
|
|
const uint64_t *endp = p + n_words;
|
|
|
|
|
const uint64_t *limit = endp - 3;
|
|
|
|
|
|
|
|
|
|
while (p <= limit) {
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
hash2 = _mm_crc32_u64(hash2, p[1]);
|
|
|
|
|
hash3 = _mm_crc32_u64(hash3, p[2]);
|
|
|
|
|
p += 3;
|
|
|
|
|
}
|
|
|
|
|
switch (endp - p) {
|
|
|
|
|
case 1:
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
hash1 = _mm_crc32_u64(hash1, p[0]);
|
|
|
|
|
hash2 = _mm_crc32_u64(hash2, p[1]);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return hash_finish(hash1, hash2 << 32 | hash3);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_uint64_basis(const uint64_t x,
|
|
|
|
|
const uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
/* '23' chosen to mix bits enough for the test-hash to pass. */
|
2015-01-06 11:10:42 -08:00
|
|
|
|
return hash_finish(hash_add64(basis, x), 23);
|
2014-07-11 05:57:11 -07:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_uint64(const uint64_t x)
|
|
|
|
|
{
|
|
|
|
|
return hash_uint64_basis(x, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_2words(uint32_t x, uint32_t y)
|
|
|
|
|
{
|
|
|
|
|
return hash_uint64((uint64_t)y << 32 | x);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_pointer(const void *p, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
return hash_uint64_basis((uint64_t) (uintptr_t) p, basis);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
uint32_t hash_words__(const uint32_t *p, size_t n_words, uint32_t basis);
|
|
|
|
|
uint32_t hash_words64__(const uint64_t *p, size_t n_words, uint32_t basis);
|
2014-07-11 05:57:11 -07:00
|
|
|
|
|
|
|
|
|
/* Inline the larger hash functions only when 'n_words' is known to be
|
|
|
|
|
* compile-time constant. */
|
|
|
|
|
#if __GNUC__ >= 4
|
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_words(const uint32_t *p, size_t n_words, uint32_t basis)
|
2014-07-11 05:57:11 -07:00
|
|
|
|
{
|
|
|
|
|
if (__builtin_constant_p(n_words)) {
|
|
|
|
|
return hash_words_inline(p, n_words, basis);
|
|
|
|
|
} else {
|
|
|
|
|
return hash_words__(p, n_words, basis);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_words64(const uint64_t *p, size_t n_words, uint32_t basis)
|
2014-07-11 05:57:11 -07:00
|
|
|
|
{
|
|
|
|
|
if (__builtin_constant_p(n_words)) {
|
|
|
|
|
return hash_words64_inline(p, n_words, basis);
|
|
|
|
|
} else {
|
|
|
|
|
return hash_words64__(p, n_words, basis);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_words(const uint32_t *p, size_t n_words, uint32_t basis)
|
2014-07-11 05:57:11 -07:00
|
|
|
|
{
|
|
|
|
|
return hash_words__(p, n_words, basis);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_words64(const uint64_t *p, size_t n_words, uint32_t basis)
|
2014-07-11 05:57:11 -07:00
|
|
|
|
{
|
|
|
|
|
return hash_words64__(p, n_words, basis);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-01-18 22:52:48 -08:00
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_bytes32(const uint32_t *p, size_t n_bytes, uint32_t basis)
|
2016-01-18 22:52:48 -08:00
|
|
|
|
{
|
|
|
|
|
return hash_words(p, n_bytes / 4, basis);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
hash: Fix compilation error on Fedora 34 with GCC 11 and -O0.
With newest version of GCC, OVS fails to compile with -O0 due to
false-positive overread detection in hash-related functions. Those
function declares "const uint32_t p[]" as argument and it throws off
the compiler into thinking that it reads from memory region of size 0.
To fix that behavior, a change in argument declaration needs to be made:
instead of using "[]" notation for a pointer, simply use "*".
The reported error in question:
lib/conntrack.c: In function ‘conn_key_hash’:
lib/conntrack.c:2154:12: error: ‘hash_words’ reading 4 bytes \
from a region of size 0 [-Werror=stringop-overread]
2154| return hash_words((uint32_t *) (&key->dst + 1),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2155| (uint32_t *) (key + 1) - (uint32_t *) (&key->dst + 1),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2156| hash);
| ~~~~~
lib/conntrack.c:2154:12: note: referencing argument 1 \
of type ‘const uint32_t *’ {aka ‘const unsigned int *’}
In file included from lib/packets.h:31,
from lib/ct-dpif.h:21,
from lib/conntrack.h:23,
from lib/conntrack.c:26:
lib/hash.h:294:1: note: in a call to function ‘hash_words’
294 | hash_words(const uint32_t p[], size_t n_words, uint32_t basis)
| ^~~~~~~~~~
Signed-off-by: Guzowski Adrian <adrian.guzowski@exatel.pl>
Tested-by: Numan Siddique <numans@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
2021-07-28 12:03:29 +00:00
|
|
|
|
hash_bytes64(const uint64_t *p, size_t n_bytes, uint32_t basis)
|
2016-01-18 22:52:48 -08:00
|
|
|
|
{
|
|
|
|
|
return hash_words64(p, n_bytes / 8, basis);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-11 05:57:11 -07:00
|
|
|
|
static inline uint32_t hash_string(const char *s, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
return hash_bytes(s, strlen(s), basis);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t hash_int(uint32_t x, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
return hash_2words(x, basis);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An attempt at a useful 1-bit hash function. Has not been analyzed for
|
|
|
|
|
* quality. */
|
|
|
|
|
static inline uint32_t hash_boolean(bool x, uint32_t basis)
|
|
|
|
|
{
|
|
|
|
|
const uint32_t P0 = 0xc2b73583; /* This is hash_int(1, 0). */
|
|
|
|
|
const uint32_t P1 = 0xe90f1258; /* This is hash_int(2, 0). */
|
|
|
|
|
return (x ? P0 : P1) ^ hash_rot(basis, 1);
|
|
|
|
|
}
|
2017-06-09 15:30:42 -07:00
|
|
|
|
|
|
|
|
|
/* Helper functions for calling hash_add() for several 32- or 64-bit words in a
|
|
|
|
|
* buffer. These are not hash functions by themselves, since they need
|
|
|
|
|
* hash_finish() to be called, so if you are looking for a full hash function
|
|
|
|
|
* see hash_words(), etc. */
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
|
|
|
|
hash_add_words(uint32_t hash, const uint32_t *p, size_t n_words)
|
|
|
|
|
{
|
|
|
|
|
for (size_t i = 0; i < n_words; i++) {
|
|
|
|
|
hash = hash_add(hash, p[i]);
|
|
|
|
|
}
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
|
|
|
|
hash_add_words64(uint32_t hash, const uint64_t *p, size_t n_words)
|
|
|
|
|
{
|
|
|
|
|
for (size_t i = 0; i < n_words; i++) {
|
|
|
|
|
hash = hash_add64(hash, p[i]);
|
|
|
|
|
}
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
|
|
|
|
hash_add_bytes32(uint32_t hash, const uint32_t *p, size_t n_bytes)
|
|
|
|
|
{
|
|
|
|
|
return hash_add_words(hash, p, n_bytes / 4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t
|
|
|
|
|
hash_add_bytes64(uint32_t hash, const uint64_t *p, size_t n_bytes)
|
|
|
|
|
{
|
|
|
|
|
return hash_add_words64(hash, p, n_bytes / 8);
|
|
|
|
|
}
|
2014-07-11 05:57:11 -07:00
|
|
|
|
|
2011-08-04 16:18:59 -07:00
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-07-08 13:19:16 -07:00
|
|
|
|
#endif /* hash.h */
|