X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fdpdk_qat%2Fcrypto.c;h=02032f30b7301b118e59fad2b54ce2297372730b;hb=f03723017a2a5ea421df821eb0ff9a0bfcacff4f;hp=2f8ba3da960374acab8773f509519ba1b9dea927;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/examples/dpdk_qat/crypto.c b/examples/dpdk_qat/crypto.c index 2f8ba3da96..02032f30b7 100644 --- a/examples/dpdk_qat/crypto.c +++ b/examples/dpdk_qat/crypto.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -54,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -183,7 +181,7 @@ struct glob_keys g_crypto_hash_keys = { * */ #define PACKET_DATA_START_PHYS(p) \ - ((p)->buf_physaddr + ((char *)p->pkt.data - (char *)p->buf_addr)) + ((p)->buf_physaddr + (p)->data_off) /* * A fixed offset to where the crypto is to be performed, which is the first @@ -308,7 +306,7 @@ getCoreAffinity(Cpa32U *coreAffinity, const CpaInstanceHandle instanceHandle) Cpa16U i = 0; CpaStatus status = CPA_STATUS_SUCCESS; - bzero(&info, sizeof(CpaInstanceInfo2)); + memset(&info, 0, sizeof(CpaInstanceInfo2)); status = cpaCyInstanceGetInfo2(instanceHandle, &info); if (CPA_STATUS_SUCCESS != status) { @@ -339,7 +337,7 @@ get_crypto_instance_on_core(CpaInstanceHandle *pInstanceHandle, } pLocalInstanceHandles = rte_malloc("pLocalInstanceHandles", - sizeof(CpaInstanceHandle) * numInstances, CACHE_LINE_SIZE); + sizeof(CpaInstanceHandle) * numInstances, RTE_CACHE_LINE_SIZE); if (NULL == pLocalInstanceHandles) { return CPA_STATUS_FAIL; @@ -381,7 +379,7 @@ initCySymSession(const int pkt_cipher_alg, CpaBoolean isCrypto = CPA_TRUE, isHmac = CPA_TRUE; CpaCySymSessionSetupData sessionSetupData; - bzero(&sessionSetupData, sizeof(CpaCySymSessionSetupData)); + memset(&sessionSetupData, 0, sizeof(CpaCySymSessionSetupData)); /* Assumption: key length is set to each algorithm's max length */ switch (pkt_cipher_alg) { @@ -665,7 +663,7 @@ per_core_crypto_init(uint32_t lcore_id) qaCoreConf[lcore_id].numResponseAttempts = 0; /* Initialise and reserve lcore memzone for virt2phys translation */ - rte_snprintf(memzone_name, + snprintf(memzone_name, RTE_MEMZONE_NAMESIZE, "lcore_%u", lcore_id); @@ -773,8 +771,8 @@ enum crypto_result crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) { CpaCySymDpOpData *opData = - (CpaCySymDpOpData *) ((char *) (rte_buff->pkt.data) - + CRYPTO_OFFSET_TO_OPDATA); + rte_pktmbuf_mtod_offset(rte_buff, CpaCySymDpOpData *, + CRYPTO_OFFSET_TO_OPDATA); uint32_t lcore_id; if (unlikely(c >= NUM_CRYPTO || h >= NUM_HMAC)) @@ -782,10 +780,10 @@ crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) lcore_id = rte_lcore_id(); - bzero(opData, sizeof(CpaCySymDpOpData)); + memset(opData, 0, sizeof(CpaCySymDpOpData)); opData->srcBuffer = opData->dstBuffer = PACKET_DATA_START_PHYS(rte_buff); - opData->srcBufferLen = opData->dstBufferLen = rte_buff->pkt.data_len; + opData->srcBufferLen = opData->dstBufferLen = rte_buff->data_len; opData->sessionCtx = qaCoreConf[lcore_id].encryptSessionHandleTbl[c][h]; opData->thisPhys = PACKET_DATA_START_PHYS(rte_buff) + CRYPTO_OFFSET_TO_OPDATA; @@ -805,7 +803,7 @@ crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) opData->ivLenInBytes = IV_LENGTH_8_BYTES; opData->cryptoStartSrcOffsetInBytes = CRYPTO_START_OFFSET; - opData->messageLenToCipherInBytes = rte_buff->pkt.data_len + opData->messageLenToCipherInBytes = rte_buff->data_len - CRYPTO_START_OFFSET; /* * Work around for padding, message length has to be a multiple of @@ -818,7 +816,7 @@ crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) if (NO_HASH != h) { opData->hashStartSrcOffsetInBytes = HASH_START_OFFSET; - opData->messageLenToHashInBytes = rte_buff->pkt.data_len + opData->messageLenToHashInBytes = rte_buff->data_len - HASH_START_OFFSET; /* * Work around for padding, message length has to be a multiple of block @@ -831,7 +829,7 @@ crypto_encrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) * Assumption: Ok ignore the passed digest pointer and place HMAC at end * of packet. */ - opData->digestResult = rte_buff->buf_physaddr + rte_buff->pkt.data_len; + opData->digestResult = rte_buff->buf_physaddr + rte_buff->data_len; } if (CPA_STATUS_SUCCESS != enqueueOp(opData, lcore_id)) { @@ -848,8 +846,8 @@ enum crypto_result crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) { - CpaCySymDpOpData *opData = (void*) (((char *) rte_buff->pkt.data) - + CRYPTO_OFFSET_TO_OPDATA); + CpaCySymDpOpData *opData = rte_pktmbuf_mtod_offset(rte_buff, void *, + CRYPTO_OFFSET_TO_OPDATA); uint32_t lcore_id; if (unlikely(c >= NUM_CRYPTO || h >= NUM_HMAC)) @@ -857,10 +855,10 @@ crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) lcore_id = rte_lcore_id(); - bzero(opData, sizeof(CpaCySymDpOpData)); + memset(opData, 0, sizeof(CpaCySymDpOpData)); opData->dstBuffer = opData->srcBuffer = PACKET_DATA_START_PHYS(rte_buff); - opData->dstBufferLen = opData->srcBufferLen = rte_buff->pkt.data_len; + opData->dstBufferLen = opData->srcBufferLen = rte_buff->data_len; opData->thisPhys = PACKET_DATA_START_PHYS(rte_buff) + CRYPTO_OFFSET_TO_OPDATA; opData->sessionCtx = qaCoreConf[lcore_id].decryptSessionHandleTbl[c][h]; @@ -880,7 +878,7 @@ crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) opData->ivLenInBytes = IV_LENGTH_8_BYTES; opData->cryptoStartSrcOffsetInBytes = CRYPTO_START_OFFSET; - opData->messageLenToCipherInBytes = rte_buff->pkt.data_len + opData->messageLenToCipherInBytes = rte_buff->data_len - CRYPTO_START_OFFSET; /* @@ -892,7 +890,7 @@ crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) } if (NO_HASH != h) { opData->hashStartSrcOffsetInBytes = HASH_START_OFFSET; - opData->messageLenToHashInBytes = rte_buff->pkt.data_len + opData->messageLenToHashInBytes = rte_buff->data_len - HASH_START_OFFSET; /* * Work around for padding, message length has to be a multiple of block @@ -900,7 +898,7 @@ crypto_decrypt(struct rte_mbuf *rte_buff, enum cipher_alg c, enum hash_alg h) */ opData->messageLenToHashInBytes -= opData->messageLenToHashInBytes % HASH_BLOCK_DEFAULT_SIZE; - opData->digestResult = rte_buff->buf_physaddr + rte_buff->pkt.data_len; + opData->digestResult = rte_buff->buf_physaddr + rte_buff->data_len; } if (CPA_STATUS_SUCCESS != enqueueOp(opData, lcore_id)) {