feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

update RSA keygen benchmark and test with asynccrypt

Browse Source
This commit is contained in:
Jacob Barthelmeh
2018-09-26 13:10:05 -06:00
parent 27aaedf37c
commit d0abc10fe9
2 changed files with 91 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
wolfcrypt/benchmark/benchmark.c
View File

@ -1369,12 +1369,22 @@ static void* benchmarks_do(void* args)
#ifdef WOLFSSL_KEY_GEN #ifdef WOLFSSL_KEY_GEN
if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) { if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) {
#ifndef NO_SW_BENCH #ifndef NO_SW_BENCH
bench_rsaKeyGen(0); if (bench_asym_algs & BENCH_RSA_SZ) {
bench_rsaKeyGen_size(0, bench_size);
}
else {
bench_rsaKeyGen(0);
}
#endif #endif
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA) #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA)
/* async supported in simulator only */ /* async supported in simulator only */
#ifdef WOLFSSL_ASYNC_CRYPT_TEST #ifdef WOLFSSL_ASYNC_CRYPT_TEST
if (bench_asym_algs & BENCH_RSA_SZ) {
bench_rsaKeyGen_size(1, bench_size);
}
else {
bench_rsaKeyGen(1); bench_rsaKeyGen(1);
}
#endif #endif
#endif #endif
} }
@ -1390,7 +1400,12 @@ static void* benchmarks_do(void* args)
#ifdef WOLFSSL_KEY_GEN #ifdef WOLFSSL_KEY_GEN
if (bench_asym_algs & BENCH_RSA_SZ) { if (bench_asym_algs & BENCH_RSA_SZ) {
#ifndef NO_SW_BENCH
bench_rsa_key(0, bench_size); bench_rsa_key(0, bench_size);
#endif
#if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA)
bench_rsa_key(1, bench_size);
#endif
} }
#endif #endif
#endif #endif
@ -3696,59 +3711,66 @@ void bench_hmac_sha512(int doAsync)
#ifndef NO_RSA #ifndef NO_RSA
#if defined(WOLFSSL_KEY_GEN) #if defined(WOLFSSL_KEY_GEN)
void bench_rsaKeyGen(int doAsync) static void bench_rsaKeyGen_helper(int doAsync, int keySz)
{ {
RsaKey genKey[BENCH_MAX_PENDING]; RsaKey genKey[BENCH_MAX_PENDING];
double start; double start;
int ret = 0, i, count = 0, times, pending = 0; int ret = 0, i, count = 0, times, pending = 0;
int k, keySz;
const int keySizes[2] = {1024, 2048};
const long rsa_e_val = WC_RSA_EXPONENT; const long rsa_e_val = WC_RSA_EXPONENT;
/* clear for done cleanup */ /* clear for done cleanup */
XMEMSET(genKey, 0, sizeof(genKey)); XMEMSET(genKey, 0, sizeof(genKey));
for (k = 0; k < (int)(sizeof(keySizes)/sizeof(int)); k++) { bench_stats_start(&count, &start);
keySz = keySizes[k]; do {
/* while free pending slots in queue, submit ops */
for (times = 0; times < genTimes || pending > 0; ) {
bench_async_poll(&pending);
bench_stats_start(&count, &start); for (i = 0; i < BENCH_MAX_PENDING; i++) {
do { if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, genTimes, &pending)) {
/* while free pending slots in queue, submit ops */
for (times = 0; times < genTimes || pending > 0; ) {
bench_async_poll(&pending);
for (i = 0; i < BENCH_MAX_PENDING; i++) { wc_FreeRsaKey(&genKey[i]);
if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, genTimes, &pending)) { ret = wc_InitRsaKey_ex(&genKey[i], HEAP_HINT,
doAsync ? devId : INVALID_DEVID);
wc_FreeRsaKey(&genKey[i]); if (ret < 0) {
ret = wc_InitRsaKey_ex(&genKey[i], HEAP_HINT, goto exit;
doAsync ? devId : INVALID_DEVID);
if (ret < 0) {
goto exit;
}
ret = wc_MakeRsaKey(&genKey[i], keySz, rsa_e_val, &rng);
if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, &pending)) {
goto exit;
}
} }
} /* for i */
} /* for times */
count += times;
} while (bench_stats_sym_check(start));
exit:
bench_stats_asym_finish("RSA", keySz, "key gen", doAsync, count, start, ret);
if (ret < 0) { ret = wc_MakeRsaKey(&genKey[i], keySz, rsa_e_val, &rng);
break; if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, &pending)) {
} goto exit;
} }
}
} /* for i */
} /* for times */
count += times;
} while (bench_stats_sym_check(start));
exit:
bench_stats_asym_finish("RSA", keySz, "key gen", doAsync, count, start, ret);
/* cleanup */ /* cleanup */
for (i = 0; i < BENCH_MAX_PENDING; i++) { for (i = 0; i < BENCH_MAX_PENDING; i++) {
wc_FreeRsaKey(&genKey[i]); wc_FreeRsaKey(&genKey[i]);
} }
} }
void bench_rsaKeyGen(int doAsync)
{
int k, keySz;
const int keySizes[2] = {1024, 2048};
for (k = 0; k < (int)(sizeof(keySizes)/sizeof(int)); k++) {
keySz = keySizes[k];
bench_rsaKeyGen_helper(doAsync, keySz);
}
}
void bench_rsaKeyGen_size(int doAsync, int keySz)
{
bench_rsaKeyGen_helper(doAsync, keySz);
}
#endif /* WOLFSSL_KEY_GEN */ #endif /* WOLFSSL_KEY_GEN */
#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \ #if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \
@ -3970,32 +3992,46 @@ exit_bench_rsa:
/* bench any size of RSA key */ /* bench any size of RSA key */
void bench_rsa_key(int doAsync, int rsaKeySz) void bench_rsa_key(int doAsync, int rsaKeySz)
{ {
int ret = 0, i; int ret = 0, i, pending = 0;
RsaKey rsaKey[BENCH_MAX_PENDING]; RsaKey rsaKey[BENCH_MAX_PENDING];
int isPending[BENCH_MAX_PENDING];
int exp = 65537;
/* clear for done cleanup */ /* clear for done cleanup */
XMEMSET(rsaKey, 0, sizeof(rsaKey)); XMEMSET(rsaKey, 0, sizeof(rsaKey));
XMEMSET(isPending, 0, sizeof(isPending));
/* init keys */ /* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) { do {
/* setup an async context for each key */ pending = 0;
if ((ret = wc_InitRsaKey_ex(&rsaKey[i], HEAP_HINT, for (i = 0; i < BENCH_MAX_PENDING; i++) {
doAsync ? devId : INVALID_DEVID)) < 0) { if (!isPending[i]) { /* if making the key is pending then just call
goto exit_bench_rsa_key; * wc_MakeRsaKey again */
} /* setup an async context for each key */
if ((ret = wc_InitRsaKey_ex(&rsaKey[i], HEAP_HINT,
doAsync ? devId : INVALID_DEVID)) < 0) {
goto exit_bench_rsa_key;
}
#ifdef WC_RSA_BLINDING #ifdef WC_RSA_BLINDING
ret = wc_RsaSetRNG(&rsaKey[i], &rng); ret = wc_RsaSetRNG(&rsaKey[i], &rng);
if (ret != 0) if (ret != 0)
goto exit_bench_rsa_key; goto exit_bench_rsa_key;
#endif #endif
}
/* create the RSA key */ /* create the RSA key */
if ((ret = wc_MakeRsaKey(&rsaKey[i], rsaKeySz, 65537, &rng)) != 0) { ret = wc_MakeRsaKey(&rsaKey[i], rsaKeySz, exp, &rng);
printf("wc_MakeRsaKey failed! %d\n", ret); if (ret == WC_PENDING_E) {
goto exit_bench_rsa_key; isPending[i] = 1;
} pending = 1;
} }
else if (ret != 0) {
printf("wc_MakeRsaKey failed! %d\n", ret);
goto exit_bench_rsa_key;
}
} /* for i */
} while (pending > 0);
bench_rsa_helper(doAsync, rsaKey, rsaKeySz); bench_rsa_helper(doAsync, rsaKey, rsaKeySz);
exit_bench_rsa_key: exit_bench_rsa_key:

1
wolfcrypt/benchmark/benchmark.h
View File

@ -76,6 +76,7 @@ void bench_hmac_sha256(int);
void bench_hmac_sha384(int); void bench_hmac_sha384(int);
void bench_hmac_sha512(int); void bench_hmac_sha512(int);
void bench_rsaKeyGen(int); void bench_rsaKeyGen(int);
void bench_rsaKeyGen_size(int, int);
void bench_rsa(int); void bench_rsa(int);
void bench_rsa_key(int, int); void bench_rsa_key(int, int);
void bench_dh(int); void bench_dh(int);