Skip to content

Commit bd09e90

Browse files
authored
Merge pull request wolfSSL#8 from wolfSSL/sym_ctx_cache
Enhancement to allow re-use of the symmetric context for ciphers
2 parents 6ae784b + 0b05923 commit bd09e90

2 files changed

Lines changed: 56 additions & 62 deletions

File tree

‎wolfcrypt/src/port/intel/quickassist.c‎

Lines changed: 55 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static pthread_mutex_t g_Hwlock = PTHREAD_MUTEX_INITIALIZER;
9999

100100

101101
#if defined(QAT_ENABLE_CRYPTO) || defined(QAT_ENABLE_HASH)
102-
static int IntelQaSymClose(WC_ASYNC_DEV* dev);
102+
static int IntelQaSymClose(WC_ASYNC_DEV* dev, int doFree);
103103
#endif
104104
static int IntelQaDrbgClose(WC_ASYNC_DEV* dev);
105105

@@ -118,7 +118,7 @@ static void* IntelQaPollingThread(void* context)
118118
printf("Polling Thread Start\n");
119119
#endif
120120
while (dev->qat.pollingCy) {
121-
icp_sal_CyPollInstance(dev->qat.handle, 0);
121+
icp_sal_CyPollInstance(dev->qat.handle, 8); /* max 8 callbacks */
122122
wc_AsyncSleep(10);
123123
}
124124
#ifdef QAT_DEBUG
@@ -562,7 +562,7 @@ void IntelQaClose(WC_ASYNC_DEV* dev)
562562
#if defined(QAT_ENABLE_CRYPTO) || defined(QAT_ENABLE_HASH)
563563
if (IntelQaDevIsSym(dev)) {
564564
/* close any active session */
565-
IntelQaSymClose(dev);
565+
IntelQaSymClose(dev, 1);
566566
}
567567
#endif
568568
if (dev->marker == WOLFSSL_ASYNC_MARKER_RNG) {
@@ -705,7 +705,7 @@ static int IntelQaPollBlockRet(WC_ASYNC_DEV* dev, int ret_wait)
705705
if (dev->event.ret != ret_wait) {
706706
break;
707707
}
708-
//wc_AsyncThreadYield();
708+
wc_AsyncThreadYield();
709709
} while (1);
710710
ret = dev->event.ret;
711711

@@ -779,8 +779,6 @@ static void IntelQaRsaPrivateFree(WC_ASYNC_DEV* dev,
779779
/* clear temp pointers */
780780
dev->qat.out = NULL;
781781
dev->qat.outLenPtr = NULL;
782-
783-
(void)dev;
784782
}
785783

786784
static void IntelQaRsaPrivateCallback(void *pCallbackTag,
@@ -1034,8 +1032,6 @@ static void IntelQaRsaPublicFree(WC_ASYNC_DEV* dev,
10341032
/* clear temp pointers */
10351033
dev->qat.out = NULL;
10361034
dev->qat.outLenPtr = NULL;
1037-
1038-
(void)dev;
10391035
}
10401036

10411037
static void IntelQaRsaPublicCallback(void *pCallbackTag,
@@ -1181,8 +1177,6 @@ static void IntelQaRsaModExpFree(WC_ASYNC_DEV* dev,
11811177
/* clear temp pointers */
11821178
dev->qat.out = NULL;
11831179
dev->qat.outLenPtr = NULL;
1184-
1185-
(void)dev;
11861180
}
11871181

11881182
static void IntelQaRsaModExpCallback(void *pCallbackTag,
@@ -1317,24 +1311,27 @@ static int IntelQaSymOpen(WC_ASYNC_DEV* dev, CpaCySymSessionSetupData* setup,
13171311

13181312
ctx = IntelQaGetSymCtx(dev);
13191313

1320-
#ifdef QAT_DEBUG
1321-
/* check to make sure ctx is initalized to zero */
1322-
if (ctx->symCtx != NULL) {
1323-
return BAD_FUNC_ARG;
1324-
}
1325-
#endif
1326-
13271314
/* Determine size of session context to allocate */
13281315
#if 1
13291316
status = cpaCySymSessionCtxGetDynamicSize(dev->qat.handle, setup, &sessionCtxSize);
13301317
#else
13311318
status = cpaCySymSessionCtxGetSize(dev->qat.handle, setup, &sessionCtxSize);
13321319
#endif
13331320

1334-
/* Allocate session context */
1335-
ctx->symCtx = XMALLOC(sessionCtxSize, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA64);
1321+
/* make sure sym ctx will fit */
1322+
if (ctx->symCtx != NULL && ctx->symCtxSize < sessionCtxSize) {
1323+
XFREE(ctx->symCtx, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA64);
1324+
ctx->symCtx = NULL;
1325+
ctx->symCtxSize = 0;
1326+
}
1327+
1328+
/* make sure session context is allocated */
13361329
if (ctx->symCtx == NULL) {
1337-
return MEMORY_E;
1330+
/* Allocate session context */
1331+
ctx->symCtx = XMALLOC(sessionCtxSize, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA64);
1332+
if (ctx->symCtx == NULL) {
1333+
return MEMORY_E;
1334+
}
13381335
}
13391336
ctx->symCtxSize = sessionCtxSize;
13401337

@@ -1344,10 +1341,11 @@ static int IntelQaSymOpen(WC_ASYNC_DEV* dev, CpaCySymSessionSetupData* setup,
13441341
printf("cpaCySymInitSession failed! dev %p, status %d\n", dev, status);
13451342
XFREE(ctx->symCtx, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA64);
13461343
ctx->symCtx = NULL;
1347-
ctx->symCtxSize = 0;
1348-
ret = ASYNC_INIT_E;
1344+
return ASYNC_INIT_E;
13491345
}
13501346

1347+
ctx->isOpen = 1;
1348+
13511349
if (ctx->symCtxOpen) {
13521350
/* override memory with original (open) */
13531351
byte* symCtxDst = (byte*)ctx->symCtx;
@@ -1373,7 +1371,7 @@ static int IntelQaSymOpen(WC_ASYNC_DEV* dev, CpaCySymSessionSetupData* setup,
13731371
return ret;
13741372
}
13751373

1376-
static int IntelQaSymClose(WC_ASYNC_DEV* dev)
1374+
static int IntelQaSymClose(WC_ASYNC_DEV* dev, int doFree)
13771375
{
13781376
int ret = 0;
13791377
CpaStatus status = CPA_STATUS_SUCCESS;
@@ -1389,31 +1387,38 @@ static int IntelQaSymClose(WC_ASYNC_DEV* dev)
13891387
ctx = IntelQaGetSymCtx(dev);
13901388

13911389
#ifdef QAT_DEBUG
1392-
printf("IntelQaSymClose: dev %p, symCtx %p (open %p), symCtxSize %d\n",
1393-
dev, ctx->symCtx, ctx->symCtxOpen, ctx->symCtxSize);
1390+
printf("IntelQaSymClose: dev %p, symCtx %p (open %p), symCtxSize %d, free %d\n",
1391+
dev, ctx->symCtx, ctx->symCtxOpen, ctx->symCtxSize, doFree);
13941392
#endif
13951393

13961394
if (ctx->symCtx) {
1397-
CpaCySymSessionCtx* symCtx = ctx->symCtx;
13981395

1399-
/* if we aren't a copy then clear open var */
1400-
if (ctx->symCtx == ctx->symCtxOpen)
1401-
ctx->symCtxOpen = NULL;
1396+
if (ctx->isOpen) {
1397+
ctx->isOpen = 0;
1398+
status = cpaCySymRemoveSession(dev->qat.handle, ctx->symCtx);
1399+
if (status == CPA_STATUS_RETRY) {
1400+
printf("cpaCySymRemoveSession retry!\n");
1401+
/* treat this as error, since session should not be active */
1402+
ret = ASYNC_OP_E;
1403+
}
1404+
else if (status != CPA_STATUS_SUCCESS) {
1405+
printf("cpaCySymRemoveSession failed! status %d\n", status);
1406+
ret = ASYNC_OP_E;
1407+
}
1408+
}
14021409

1403-
ctx->symCtx = NULL;
1404-
ctx->symCtxSize = 0;
1410+
if (doFree) {
1411+
CpaCySymSessionCtx* symCtx = ctx->symCtx;
14051412

1406-
status = cpaCySymRemoveSession(dev->qat.handle, symCtx);
1407-
if (status == CPA_STATUS_RETRY) {
1408-
printf("cpaCySymRemoveSession retry!\n");
1409-
ret = WC_PENDING_E;
1410-
}
1411-
else if (status != CPA_STATUS_SUCCESS) {
1412-
printf("cpaCySymRemoveSession failed! status %d\n", status);
1413-
ret = ASYNC_OP_E;
1414-
}
1413+
/* if we aren't a copy then clear open var */
1414+
if (ctx->symCtx == ctx->symCtxOpen)
1415+
ctx->symCtxOpen = NULL;
1416+
1417+
ctx->symCtx = NULL;
1418+
ctx->symCtxSize = 0;
14151419

1416-
XFREE(symCtx, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA64);
1420+
XFREE(symCtx, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA64);
1421+
}
14171422
}
14181423

14191424
#ifdef QAT_ENABLE_HASH
@@ -1441,7 +1446,7 @@ static int IntelQaSymClose(WC_ASYNC_DEV* dev)
14411446

14421447
#ifdef QAT_ENABLE_CRYPTO
14431448
static void IntelQaSymCipherFree(WC_ASYNC_DEV* dev,
1444-
CpaCySymOpData* opData, CpaBufferList *pDstBuffer)
1449+
CpaCySymOpData* opData, CpaBufferList *pDstBuffer, int forceClose)
14451450
{
14461451
if (opData) {
14471452
if (opData->pAdditionalAuthData) {
@@ -1469,8 +1474,10 @@ static void IntelQaSymCipherFree(WC_ASYNC_DEV* dev,
14691474
XMEMSET(pDstBuffer, 0, sizeof(CpaBufferList));
14701475
}
14711476

1472-
/* close and free sym context */
1473-
IntelQaSymClose(dev);
1477+
if (forceClose) {
1478+
/* close and free sym context */
1479+
IntelQaSymClose(dev, 0);
1480+
}
14741481

14751482
/* clear temp pointers */
14761483
dev->qat.out = NULL;
@@ -1479,8 +1486,6 @@ static void IntelQaSymCipherFree(WC_ASYNC_DEV* dev,
14791486
dev->qat.op.cipher.authTag = NULL;
14801487
dev->qat.op.cipher.authTagSz = 0;
14811488
#endif
1482-
1483-
(void)dev;
14841489
}
14851490

14861491
static void IntelQaSymCipherCallback(void *pCallbackTag, CpaStatus status,
@@ -1547,7 +1552,7 @@ static void IntelQaSymCipherCallback(void *pCallbackTag, CpaStatus status,
15471552

15481553
/* make sure and perform cleanup before marking event */
15491554
/* Free allocations */
1550-
IntelQaSymCipherFree(dev, opData, pDstBuffer);
1555+
IntelQaSymCipherFree(dev, opData, pDstBuffer, 0);
15511556

15521557
dev->event.ret = ret;
15531558
dev->qat.status = status;
@@ -1731,7 +1736,7 @@ static int IntelQaSymCipher(WC_ASYNC_DEV* dev, byte* out, const byte* in,
17311736
dev, status, ret);
17321737

17331738
/* handle cleanup */
1734-
IntelQaSymCipherFree(dev, opData, bufferList);
1739+
IntelQaSymCipherFree(dev, opData, bufferList, 1);
17351740
}
17361741

17371742
return ret;
@@ -1922,7 +1927,7 @@ static void IntelQaSymHashFree(WC_ASYNC_DEV* dev,
19221927
XFREE(pDstBuffer, dev->heap, DYNAMIC_TYPE_ASYNC_NUMA);
19231928
}
19241929

1925-
/* if final or force close */
1930+
/* if final or forced */
19261931
if (dev->qat.out || forceClose) {
19271932
/* free any tmp input */
19281933
if (dev->qat.op.hash.tmpIn) {
@@ -1933,14 +1938,12 @@ static void IntelQaSymHashFree(WC_ASYNC_DEV* dev,
19331938
dev->qat.op.hash.blockSize = 0;
19341939

19351940
/* close session */
1936-
IntelQaSymClose(dev);
1941+
IntelQaSymClose(dev, 0);
19371942
}
19381943

19391944
/* clear temp pointers */
19401945
dev->qat.out = NULL;
19411946
dev->qat.outLen = 0;
1942-
1943-
(void)dev;
19441947
}
19451948

19461949
static void IntelQaSymHashCallback(void *pCallbackTag, CpaStatus status,
@@ -2431,8 +2434,6 @@ static void IntelQaEcdhFree(WC_ASYNC_DEV* dev,
24312434
/* clear temp pointers */
24322435
dev->qat.out = NULL;
24332436
dev->qat.outLenPtr = NULL;
2434-
2435-
(void)dev;
24362437
}
24372438

24382439
static void IntelQaEcdhCallback(void *pCallbackTag, CpaStatus status,
@@ -2615,8 +2616,6 @@ static void IntelQaEcdsaSignFree(WC_ASYNC_DEV* dev,
26152616
/* clear temp pointers */
26162617
dev->qat.op.ecc_sign.pR = NULL;
26172618
dev->qat.op.ecc_sign.pS = NULL;
2618-
2619-
(void)dev;
26202619
}
26212620

26222621
static void IntelQaEcdsaSignCallback(void *pCallbackTag,
@@ -2759,8 +2758,6 @@ static void IntelQaEcdsaVerifyFree(WC_ASYNC_DEV* dev,
27592758

27602759
/* clear temp pointers */
27612760
dev->qat.op.ecc_verify.stat = NULL;
2762-
2763-
(void)dev;
27642761
}
27652762

27662763
static void IntelQaEcdsaVerifyCallback(void *pCallbackTag,
@@ -2891,8 +2888,6 @@ static void IntelQaDhKeyGenFree(WC_ASYNC_DEV* dev,
28912888
/* clear temp pointers */
28922889
dev->qat.out = NULL;
28932890
dev->qat.outLenPtr = NULL;
2894-
2895-
(void)dev;
28962891
}
28972892

28982893
static void IntelQaDhKeyGenCallback(void *pCallbackTag, CpaStatus status,
@@ -3025,8 +3020,6 @@ static void IntelQaDhAgreeFree(WC_ASYNC_DEV* dev,
30253020
/* clear temp pointers */
30263021
dev->qat.out = NULL;
30273022
dev->qat.outLenPtr = NULL;
3028-
3029-
(void)dev;
30303023
}
30313024

30323025
static void IntelQaDhAgreeCallback(void *pCallbackTag, CpaStatus status,

‎wolfssl/wolfcrypt/port/intel/quickassist.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ typedef struct IntelQaSymCtx {
105105
CpaCySymSessionCtx symCtxOpen;
106106
CpaCySymSessionCtx symCtx;
107107
word32 symCtxSize;
108+
word32 isOpen;
108109
} IntelQaSymCtx;
109110
#endif
110111

0 commit comments

Comments
 (0)