d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto/qat: fix buffer overwrite in OOP case

Browse Source 
In out-of-place operation, data is DMAed from source mbuf
to destination mbuf. To avoid header data in dest mbuf being
overwritten, the minimal data-set should be DMAed.

Fixes: 39e0bee48e ("crypto/qat: rework request builder for performance")

Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: John Griffin <john.griffin@intel.com>
This commit is contained in:
Fiona Trahe 2016-12-09 15:39:05 +00:00 committed by Pablo de Lara
parent 53a3ba0c36
commit 96ec5f9045
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/crypto/qat/qat_crypto.c
View File

@ -955,7 +955,7 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)
uint32_t cipher_len = 0, cipher_ofs = 0; uint32_t cipher_len = 0, cipher_ofs = 0;
uint32_t auth_len = 0, auth_ofs = 0; uint32_t auth_len = 0, auth_ofs = 0;
uint32_t min_ofs = 0; uint32_t min_ofs = 0;
uint64_t buf_start = 0; uint64_t src_buf_start = 0, dst_buf_start = 0;
#ifdef RTE_LIBRTE_PMD_QAT_DEBUG_TX #ifdef RTE_LIBRTE_PMD_QAT_DEBUG_TX
@ -1077,27 +1077,40 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)
if (do_cipher && do_auth) if (do_cipher && do_auth)
min_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs; min_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs;
if (unlikely(op->sym->m_dst != NULL)) {
/* Start DMA at nearest aligned address below min_ofs */ /* Out-of-place operation (OOP)
#define QAT_64_BTYE_ALIGN_MASK (~0x3f) * Don't align DMA start. DMA the minimum data-set
buf_start = rte_pktmbuf_mtophys_offset(op->sym->m_src, min_ofs) & * so as not to overwrite data in dest buffer
QAT_64_BTYE_ALIGN_MASK;
if (unlikely((rte_pktmbuf_mtophys(op->sym->m_src)
- rte_pktmbuf_headroom(op->sym->m_src)) > buf_start)) {
/* alignment has pushed addr ahead of start of mbuf
* so revert and take the performance hit
*/ */
buf_start = rte_pktmbuf_mtophys(op->sym->m_src); src_buf_start =
} rte_pktmbuf_mtophys_offset(op->sym->m_src, min_ofs);
dst_buf_start =
rte_pktmbuf_mtophys_offset(op->sym->m_dst, min_ofs);
} else {
/* In-place operation
* Start DMA at nearest aligned address below min_ofs
*/
src_buf_start =
rte_pktmbuf_mtophys_offset(op->sym->m_src, min_ofs)
& QAT_64_BTYE_ALIGN_MASK;
qat_req->comn_mid.dest_data_addr = if (unlikely((rte_pktmbuf_mtophys(op->sym->m_src) -
qat_req->comn_mid.src_data_addr = buf_start; rte_pktmbuf_headroom(op->sym->m_src))
> src_buf_start)) {
/* alignment has pushed addr ahead of start of mbuf
* so revert and take the performance hit
*/
src_buf_start =
rte_pktmbuf_mtophys_offset(op->sym->m_src,
min_ofs);
}
dst_buf_start = src_buf_start;
}
if (do_cipher) { if (do_cipher) {
cipher_param->cipher_offset = cipher_param->cipher_offset =
(uint32_t)rte_pktmbuf_mtophys_offset( (uint32_t)rte_pktmbuf_mtophys_offset(
op->sym->m_src, cipher_ofs) - buf_start; op->sym->m_src, cipher_ofs) - src_buf_start;
cipher_param->cipher_length = cipher_len; cipher_param->cipher_length = cipher_len;
} else { } else {
cipher_param->cipher_offset = 0; cipher_param->cipher_offset = 0;
@ -1105,7 +1118,7 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)
} }
if (do_auth) { if (do_auth) {
auth_param->auth_off = (uint32_t)rte_pktmbuf_mtophys_offset( auth_param->auth_off = (uint32_t)rte_pktmbuf_mtophys_offset(
op->sym->m_src, auth_ofs) - buf_start; op->sym->m_src, auth_ofs) - src_buf_start;
auth_param->auth_len = auth_len; auth_param->auth_len = auth_len;
} else { } else {
auth_param->auth_off = 0; auth_param->auth_off = 0;
@ -1118,21 +1131,8 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)
(cipher_param->cipher_offset + cipher_param->cipher_length) (cipher_param->cipher_offset + cipher_param->cipher_length)
: (auth_param->auth_off + auth_param->auth_len); : (auth_param->auth_off + auth_param->auth_len);
qat_req->comn_mid.src_data_addr = src_buf_start;
/* out-of-place operation (OOP) */ qat_req->comn_mid.dest_data_addr = dst_buf_start;
if (unlikely(op->sym->m_dst != NULL)) {
if (do_auth)
qat_req->comn_mid.dest_data_addr =
rte_pktmbuf_mtophys_offset(op->sym->m_dst,
auth_ofs)
- auth_param->auth_off;
else
qat_req->comn_mid.dest_data_addr =
rte_pktmbuf_mtophys_offset(op->sym->m_dst,
cipher_ofs)
- cipher_param->cipher_offset;
}
if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_128 || if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_128 ||
ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_64) { ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_64) {

1
drivers/crypto/qat/qat_crypto.h
View File

@ -43,6 +43,7 @@
*/ */
#define ALIGN_POW2_ROUNDUP(num, align) \ #define ALIGN_POW2_ROUNDUP(num, align) \
(((num) + (align) - 1) & ~((align) - 1)) (((num) + (align) - 1) & ~((align) - 1))
#define QAT_64_BTYE_ALIGN_MASK (~0x3f)
/** /**
* Structure associated with each queue. * Structure associated with each queue.