From: Albert Esteve <aesteve@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@gmail.com, "Michael S. Tsirkin" <mst@redhat.com>,
kraxel@redhat.com, Fam Zheng <fam@euphon.net>,
Albert Esteve <aesteve@redhat.com>,
cohuck@redhat.com
Subject: [PATCH v2 1/4] uuid: add hash_func and equal_func
Date: Thu, 18 May 2023 14:02:55 +0200 [thread overview]
Message-ID: <20230518120258.1394135-2-aesteve@redhat.com> (raw)
In-Reply-To: <20230518120258.1394135-1-aesteve@redhat.com>
Add hash and an equal function to uuid module.
Add a couple simple unit tests for new functions,
checking collisions for similar UUIDs in the case
of the hash function, and comparing generated UUIDs
for the equal function.
Signed-off-by: Albert Esteve <aesteve@redhat.com>
---
include/qemu/uuid.h | 4 ++++
tests/unit/test-uuid.c | 46 ++++++++++++++++++++++++++++++++++++++++++
util/uuid.c | 38 ++++++++++++++++++++++++++++++++++
3 files changed, 88 insertions(+)
diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
index dc40ee1fc9..136df682c9 100644
--- a/include/qemu/uuid.h
+++ b/include/qemu/uuid.h
@@ -96,4 +96,8 @@ int qemu_uuid_parse(const char *str, QemuUUID *uuid);
QemuUUID qemu_uuid_bswap(QemuUUID uuid);
+uint32_t qemu_uuid_hash(const void *uuid);
+
+int qemu_uuid_equal(const void *lhv, const void *rhv);
+
#endif
diff --git a/tests/unit/test-uuid.c b/tests/unit/test-uuid.c
index c111de5fc1..8c865869d5 100644
--- a/tests/unit/test-uuid.c
+++ b/tests/unit/test-uuid.c
@@ -171,6 +171,50 @@ static void test_uuid_unparse_strdup(void)
}
}
+static void test_uuid_hash(void)
+{
+ QemuUUID uuid;
+ int i;
+
+ for (i = 0; i < 100; i++) {
+ qemu_uuid_generate(&uuid);
+ /* Obtain the UUID hash */
+ uint32_t hash_a = qemu_uuid_hash(&uuid);
+ int data_idx = g_random_int_range(0, 15);
+ /* Change a single random byte of the UUID */
+ if (uuid.data[data_idx] < 0xFF) {
+ uuid.data[data_idx]++;
+ } else {
+ uuid.data[data_idx]--;
+ }
+ /* Obtain the UUID hash again */
+ uint32_t hash_b = qemu_uuid_hash(&uuid);
+ /*
+ * Both hashes shall be different (avoid collision)
+ * for any change in the UUID fields
+ */
+ g_assert_cmpint(hash_a, !=, hash_b);
+ }
+}
+
+static void test_uuid_equal(void)
+{
+ QemuUUID uuid_a, uuid_b, uuid_c;
+ int i;
+
+ for (i = 0; i < 100; i++) {
+ qemu_uuid_generate(&uuid_a);
+ qemu_uuid_generate(&uuid_b);
+ memcpy(&uuid_c, &uuid_a, sizeof(uuid_a));
+
+ g_assert(qemu_uuid_equal(&uuid_a, &uuid_a));
+ g_assert(qemu_uuid_equal(&uuid_b, &uuid_b));
+ g_assert(qemu_uuid_equal(&uuid_a, &uuid_c));
+ g_assert_false(qemu_uuid_equal(&uuid_a, &uuid_b));
+ g_assert_false(qemu_uuid_equal(NULL, NULL));
+ }
+}
+
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
@@ -179,6 +223,8 @@ int main(int argc, char **argv)
g_test_add_func("/uuid/parse", test_uuid_parse);
g_test_add_func("/uuid/unparse", test_uuid_unparse);
g_test_add_func("/uuid/unparse_strdup", test_uuid_unparse_strdup);
+ g_test_add_func("/uuid/hash", test_uuid_hash);
+ g_test_add_func("/uuid/equal", test_uuid_equal);
return g_test_run();
}
diff --git a/util/uuid.c b/util/uuid.c
index b1108dde78..efa9b0a0e4 100644
--- a/util/uuid.c
+++ b/util/uuid.c
@@ -16,6 +16,7 @@
#include "qemu/osdep.h"
#include "qemu/uuid.h"
#include "qemu/bswap.h"
+#include "qemu/xxhash.h"
void qemu_uuid_generate(QemuUUID *uuid)
{
@@ -116,3 +117,40 @@ QemuUUID qemu_uuid_bswap(QemuUUID uuid)
bswap16s(&uuid.fields.time_high_and_version);
return uuid;
}
+
+uint32_t qemu_uuid_hash(const void *uuid)
+{
+ QemuUUID *id = (QemuUUID *) uuid;
+ uint64_t ab = (id->fields.time_low) |
+ (((uint64_t) id->fields.time_mid) << 32) |
+ (((uint64_t) id->fields.time_high_and_version) << 48);
+ uint64_t cd = (id->fields.clock_seq_and_reserved) |
+ (id->fields.clock_seq_low << 8);
+ int i = 0, shift = 8;
+
+ for (; i < 6; i++) {
+ shift += 8;
+ cd |= ((uint64_t) id->fields.node[i]) << shift;
+ }
+
+ return qemu_xxhash4(ab, cd);
+}
+
+int qemu_uuid_equal(const void *lhv, const void *rhv)
+{
+ int i;
+ QemuUUID *lid = (QemuUUID *) lhv;
+ QemuUUID *rid = (QemuUUID *) rhv;
+ if (lid == NULL || rid == NULL) {
+ return 0;
+ }
+ if (lid == rid) {
+ return 1;
+ }
+ for (i = 0; i < 16; i++) {
+ if (lid->data[i] != rid->data[i]) {
+ return 0;
+ }
+ }
+ return 1;
+}
--
2.40.0
next prev parent reply other threads:[~2023-05-18 12:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 12:02 [PATCH v2 0/4] Virtio shared dma-buf Albert Esteve
2023-05-18 12:02 ` Albert Esteve [this message]
2023-05-20 7:23 ` [PATCH v2 1/4] uuid: add hash_func and equal_func Marc-André Lureau
2023-05-22 13:13 ` Albert Esteve
2023-05-22 13:41 ` Albert Esteve
2023-05-22 13:42 ` Marc-André Lureau
2023-05-18 12:02 ` [PATCH v2 2/4] virtio-dmabuf: introduce virtio-dmabuf Albert Esteve
2023-05-18 12:02 ` [PATCH v2 3/4] vhost-user: add shared_object msg Albert Esteve
2023-05-18 12:02 ` [PATCH v2 4/4] vhost-user: refactor send_resp code Albert Esteve
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230518120258.1394135-2-aesteve@redhat.com \
--to=aesteve@redhat.com \
--cc=cohuck@redhat.com \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).