Message ID | 1499158630-75260-19-git-send-email-longpeng2@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jul 04, 2017 at 04:57:10PM +0800, Longpeng(Mike) wrote: > This patch add a hmac speed benchmark, it helps us to > measure the performance by using "make check-speed" or > using "./tests/benchmark-crypto-hmac" directly. > > Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> > --- > tests/Makefile.include | 2 + > tests/benchmark-crypto-hmac.c | 94 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 96 insertions(+) > create mode 100644 tests/benchmark-crypto-hmac.c > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index e83eb6b..258bcbc 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -99,6 +99,7 @@ gcov-files-test-write-threshold-y = block/write-threshold.c > check-unit-y += tests/test-crypto-hash$(EXESUF) > check-speed-y += tests/benchmark-crypto-hash$(EXESUF) > check-unit-y += tests/test-crypto-hmac$(EXESUF) > +check-speed-y += tests/benchmark-crypto-hmac$(EXESUF) > check-unit-y += tests/test-crypto-cipher$(EXESUF) > check-speed-y += tests/benchmark-crypto-cipher$(EXESUF) > check-unit-y += tests/test-crypto-secret$(EXESUF) > @@ -637,6 +638,7 @@ tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) > tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y) > tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test-crypto-obj-y) > tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-obj-y) > +tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test-crypto-obj-y) > tests/test-crypto-cipher$(EXESUF): tests/test-crypto-cipher.o $(test-crypto-obj-y) > tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(test-crypto-obj-y) > tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypto-obj-y) > diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c > new file mode 100644 > index 0000000..05b02a5 > --- /dev/null > +++ b/tests/benchmark-crypto-hmac.c > @@ -0,0 +1,94 @@ > +/* > + * QEMU Crypto hmac speed benchmark > + * > + * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD. > + * > + * Authors: > + * Longpeng(Mike) <longpeng2@huawei.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > + * (at your option) any later version. See the COPYING file in the > + * top-level directory. > + */ > +#include "qemu/osdep.h" > +#include "crypto/init.h" > +#include "crypto/hmac.h" > + > +#define KEY "monkey monkey monkey monkey" > + > +static void test_hmac_speed(const void *opaque) > +{ > + size_t chunk_size = (size_t)opaque; > + QCryptoHmac *hmac = NULL; > + uint8_t *in = NULL, *out = NULL; > + size_t out_len = 0; > + double total = 0.0; > + struct iovec iov; > + Error *err = NULL; > + int ret; > + > + if (!qcrypto_hmac_supports(QCRYPTO_HASH_ALG_SHA256)) { > + return; > + } > + > + hmac = qcrypto_hmac_new(QCRYPTO_HASH_ALG_SHA256, (const uint8_t *)KEY, > + strlen(KEY), &err); > + g_assert(err == NULL); > + g_assert(hmac != NULL); Just push these lines down into the start of the while loop > + > + in = g_new0(uint8_t, chunk_size); > + memset(in, g_test_rand_int(), chunk_size); > + > + iov.iov_base = (char *)in; > + iov.iov_len = chunk_size; > + > + g_test_timer_start(); > + do { > + ret = qcrypto_hmac_bytesv(hmac, &iov, 1, &out, &out_len, &err); > + g_assert(ret == 0); > + g_assert(err == NULL); > + > +#if !defined(CONFIG_NETTLE) && !defined(CONFIG_GCRYPT) > + /* > + * qcrypto_hmac_bytesv() uses g_checksum_get_digest() to get the > + * digest. Once this function has been called, the #GChecksum is > + * closed and can no longer be updated with g_checksum_update(). > + * So...we must free glib-backend hmac object and renew one here. > + */ > + qcrypto_hmac_free(hmac); > + hmac = qcrypto_hmac_new(QCRYPTO_HASH_ALG_SHA256, (const uint8_t *)KEY, > + strlen(KEY), &err); > + g_assert(err == NULL); > + g_assert(hmac != NULL); > +#endif And get rid of this - just have an unconditional qcrypto_hmac_free call. > + total += chunk_size; > + } while (g_test_timer_elapsed() < 5.0); > + > + total /= 1024 * 1024; /* to MB */ > + > + g_print("hmac(sha256): "); > + g_print("Testing chunk_size %ld bytes ", chunk_size); > + g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); > + g_print("%.2f MB/sec\n", total / g_test_timer_last()); > + > + qcrypto_hmac_free(hmac); So this won't be needed either. > + g_free(out); > + g_free(in); > +} > + > +int main(int argc, char **argv) > +{ > + size_t i; > + char name[64]; > + > + g_test_init(&argc, &argv, NULL); > + g_assert(qcrypto_init(NULL) == 0); > + > + for (i = 512; i <= (64 * 1204); i *= 2) { > + memset(name, 0 , sizeof(name)); > + snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i); > + g_test_add_data_func(name, (void *)i, test_hmac_speed); > + } > + > + return g_test_run(); > +} > -- > 1.8.3.1 > > Regards, Daniel
diff --git a/tests/Makefile.include b/tests/Makefile.include index e83eb6b..258bcbc 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -99,6 +99,7 @@ gcov-files-test-write-threshold-y = block/write-threshold.c check-unit-y += tests/test-crypto-hash$(EXESUF) check-speed-y += tests/benchmark-crypto-hash$(EXESUF) check-unit-y += tests/test-crypto-hmac$(EXESUF) +check-speed-y += tests/benchmark-crypto-hmac$(EXESUF) check-unit-y += tests/test-crypto-cipher$(EXESUF) check-speed-y += tests/benchmark-crypto-cipher$(EXESUF) check-unit-y += tests/test-crypto-secret$(EXESUF) @@ -637,6 +638,7 @@ tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-obj-y) tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test-crypto-obj-y) tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-obj-y) +tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test-crypto-obj-y) tests/test-crypto-cipher$(EXESUF): tests/test-crypto-cipher.o $(test-crypto-obj-y) tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(test-crypto-obj-y) tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypto-obj-y) diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c new file mode 100644 index 0000000..05b02a5 --- /dev/null +++ b/tests/benchmark-crypto-hmac.c @@ -0,0 +1,94 @@ +/* + * QEMU Crypto hmac speed benchmark + * + * Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD. + * + * Authors: + * Longpeng(Mike) <longpeng2@huawei.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * (at your option) any later version. See the COPYING file in the + * top-level directory. + */ +#include "qemu/osdep.h" +#include "crypto/init.h" +#include "crypto/hmac.h" + +#define KEY "monkey monkey monkey monkey" + +static void test_hmac_speed(const void *opaque) +{ + size_t chunk_size = (size_t)opaque; + QCryptoHmac *hmac = NULL; + uint8_t *in = NULL, *out = NULL; + size_t out_len = 0; + double total = 0.0; + struct iovec iov; + Error *err = NULL; + int ret; + + if (!qcrypto_hmac_supports(QCRYPTO_HASH_ALG_SHA256)) { + return; + } + + hmac = qcrypto_hmac_new(QCRYPTO_HASH_ALG_SHA256, (const uint8_t *)KEY, + strlen(KEY), &err); + g_assert(err == NULL); + g_assert(hmac != NULL); + + in = g_new0(uint8_t, chunk_size); + memset(in, g_test_rand_int(), chunk_size); + + iov.iov_base = (char *)in; + iov.iov_len = chunk_size; + + g_test_timer_start(); + do { + ret = qcrypto_hmac_bytesv(hmac, &iov, 1, &out, &out_len, &err); + g_assert(ret == 0); + g_assert(err == NULL); + +#if !defined(CONFIG_NETTLE) && !defined(CONFIG_GCRYPT) + /* + * qcrypto_hmac_bytesv() uses g_checksum_get_digest() to get the + * digest. Once this function has been called, the #GChecksum is + * closed and can no longer be updated with g_checksum_update(). + * So...we must free glib-backend hmac object and renew one here. + */ + qcrypto_hmac_free(hmac); + hmac = qcrypto_hmac_new(QCRYPTO_HASH_ALG_SHA256, (const uint8_t *)KEY, + strlen(KEY), &err); + g_assert(err == NULL); + g_assert(hmac != NULL); +#endif + total += chunk_size; + } while (g_test_timer_elapsed() < 5.0); + + total /= 1024 * 1024; /* to MB */ + + g_print("hmac(sha256): "); + g_print("Testing chunk_size %ld bytes ", chunk_size); + g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); + g_print("%.2f MB/sec\n", total / g_test_timer_last()); + + qcrypto_hmac_free(hmac); + g_free(out); + g_free(in); +} + +int main(int argc, char **argv) +{ + size_t i; + char name[64]; + + g_test_init(&argc, &argv, NULL); + g_assert(qcrypto_init(NULL) == 0); + + for (i = 512; i <= (64 * 1204); i *= 2) { + memset(name, 0 , sizeof(name)); + snprintf(name, sizeof(name), "/crypto/hmac/speed-%lu", i); + g_test_add_data_func(name, (void *)i, test_hmac_speed); + } + + return g_test_run(); +}
This patch add a hmac speed benchmark, it helps us to measure the performance by using "make check-speed" or using "./tests/benchmark-crypto-hmac" directly. Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com> --- tests/Makefile.include | 2 + tests/benchmark-crypto-hmac.c | 94 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 tests/benchmark-crypto-hmac.c