Merge branch 'refs/heads/upstream-HEAD' into repo-HEAD

Author: Delphix Engineering

libdrgn/hash_table.h

@@ -1226,15 +1226,15 @@ static inline struct hash_pair hash_pair_from_non_avalanching_hash(size_t hash)
 {
 #if SIZE_MAX == 0xffffffffffffffff
 #ifdef __SSE4_2__
-/* 64-bit with SSE4.2 uses CRC32 */
+	/* 64-bit with SSE4.2 uses CRC32 */
 	size_t c = _mm_crc32_u64(0, hash);
 
 	return (struct hash_pair){
 		.first = hash + c,
 		.second = (c >> 24) | 0x80,
 	};
 #else
-/* 64-bit without SSE4.2 uses a 128-bit multiplication-based mixer */
+	/* 64-bit without SSE4.2 uses a 128-bit multiplication-based mixer */
 	static const uint64_t multiplier = UINT64_C(0xc4ceb9fe1a85ec53);
 	uint64_t hi, lo;
 
@@ -1244,20 +1244,20 @@ static inline struct hash_pair hash_pair_from_non_avalanching_hash(size_t hash)
 	hash *= multiplier;
 	return (struct hash_pair){
 		.first = hash >> 22,
-		.second = (hash >> 15) | 0x80,
+		.second = ((hash >> 15) & 0x7f) | 0x80,
 	};
 #endif
 #elif SIZE_MAX == 0xffffffff
-/* 32-bit with SSE4.2 uses CRC32 */
 #ifdef __SSE4_2__
+	/* 32-bit with SSE4.2 uses CRC32 */
 	size_t c = _mm_crc32_u32(0, hash);
 
 	return (struct hash_pair){
 		.first = hash + c,
 		.second = (uint8_t)(~(c >> 25)),
 	};
 #else
-/* 32-bit without SSE4.2 uses the 32-bit Murmur2 finalizer */
+	/* 32-bit without SSE4.2 uses the 32-bit Murmur2 finalizer */
 	hash ^= hash >> 13;
 	hash *= 0x5bd1e995;
 	hash ^= hash >> 15;

libdrgn/linux_kernel.c

@@ -820,15 +820,19 @@ static struct drgn_error *kmod_index_init(struct kmod_index *index,
 
 static const char *kmod_index_find(struct kmod_index *index, const char *key)
 {
+	static const uint32_t INDEX_NODE_MASK = UINT32_C(0x0fffffff);
+	static const uint32_t INDEX_NODE_CHILDS = UINT32_C(0x20000000);
+	static const uint32_t INDEX_NODE_VALUES = UINT32_C(0x40000000);
+	static const uint32_t INDEX_NODE_PREFIX = UINT32_C(0x80000000);
 	const char *ptr = index->ptr + 8;
 	uint32_t offset;
 
 	for (;;) {
 		if (!read_be32(&ptr, index->end, &offset))
 			return NULL;
-		ptr = index->ptr + (offset & 0x0fffffffU);
+		ptr = index->ptr + (offset & INDEX_NODE_MASK);
 
-		if (offset & 0x80000000U) {
+		if (offset & INDEX_NODE_PREFIX) {
 			const char *prefix;
 			size_t prefix_len;
 
@@ -840,7 +844,7 @@ static const char *kmod_index_find(struct kmod_index *index, const char *key)
 			key += prefix_len;
 		}
 
-		if (offset & 0x20000000U) {
+		if (offset & INDEX_NODE_CHILDS) {
 			uint8_t first, last;
 
 			if (!read_u8(&ptr, index->end, &first) ||
@@ -864,7 +868,7 @@ static const char *kmod_index_find(struct kmod_index *index, const char *key)
 			break;
 		}
 	}
-	if (!(offset & 0x40000000U))
+	if (!(offset & INDEX_NODE_VALUES))
 		return NULL;
 	return ptr;
 }