Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17241/?format=api
{ "id": 17241, "url": "https://patches.dpdk.org/api/patches/17241/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1479986267-2836-1-git-send-email-fiona.trahe@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1479986267-2836-1-git-send-email-fiona.trahe@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1479986267-2836-1-git-send-email-fiona.trahe@intel.com", "date": "2016-11-24T11:17:47", "name": "[dpdk-dev] crypto/qat: fix to avoid buffer overwrite in OOP case", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2f47fea0e4ef593490c1c27064008968508c9813", "submitter": { "id": 423, "url": "https://patches.dpdk.org/api/people/423/?format=api", "name": "Fiona Trahe", "email": "fiona.trahe@intel.com" }, "delegate": { "id": 22, "url": "https://patches.dpdk.org/api/users/22/?format=api", "username": "pdelarag", "first_name": "Pablo", "last_name": "de Lara Guarch", "email": "pablo.de.lara.guarch@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1479986267-2836-1-git-send-email-fiona.trahe@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17241/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/17241/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 1918F558A;\n\tThu, 24 Nov 2016 12:18:09 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 39A355587\n\tfor <dev@dpdk.org>; Thu, 24 Nov 2016 12:18:06 +0100 (CET)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP; 24 Nov 2016 03:18:05 -0800", "from sivswdev01.ir.intel.com (HELO localhost.localdomain)\n\t([10.237.217.45])\n\tby orsmga003.jf.intel.com with ESMTP; 24 Nov 2016 03:18:04 -0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.31,543,1473145200\"; d=\"scan'208\";a=\"905072679\"", "From": "Fiona Trahe <fiona.trahe@intel.com>", "To": "dev@dpdk.org", "Cc": "pablo.de.lara.guarch@intel.com, fiona.trahe@intel.com,\n\tjohn.griffin@intel.com, arkadiuszx.kusztal@intel.com", "Date": "Thu, 24 Nov 2016 11:17:47 +0000", "Message-Id": "<1479986267-2836-1-git-send-email-fiona.trahe@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "Subject": "[dpdk-dev] [PATCH] crypto/qat: fix to avoid buffer overwrite in OOP\n\tcase", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "In out-of-place operation, data is DMAed from source mbuf\nto destination mbuf. To avoid header data in dest mbuf being\noverwritten, the minimal data-set should be DMAed.\n\nFixes: 39e0bee48e81 (\"crypto/qat: rework request builder for performance\")\n\nSigned-off-by: Fiona Trahe <fiona.trahe@intel.com>\n---\nThis patch depends on following patch :\n crypto: remove unused digest-appended feature\n http://dpdk.org/dev/patchwork/patch/17079/\n\n drivers/crypto/qat/qat_crypto.c | 66 ++++++++++++++++++++---------------------\n drivers/crypto/qat/qat_crypto.h | 1 +\n 2 files changed, 34 insertions(+), 33 deletions(-)", "diff": "diff --git a/drivers/crypto/qat/qat_crypto.c b/drivers/crypto/qat/qat_crypto.c\nindex 6a6bd2e..afce4ac 100644\n--- a/drivers/crypto/qat/qat_crypto.c\n+++ b/drivers/crypto/qat/qat_crypto.c\n@@ -955,7 +955,7 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)\n \tuint32_t cipher_len = 0, cipher_ofs = 0;\n \tuint32_t auth_len = 0, auth_ofs = 0;\n \tuint32_t min_ofs = 0;\n-\tuint64_t buf_start = 0;\n+\tuint64_t src_buf_start = 0, dst_buf_start = 0;\n \n \n #ifdef RTE_LIBRTE_PMD_QAT_DEBUG_TX\n@@ -1077,27 +1077,40 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)\n \tif (do_cipher && do_auth)\n \t\tmin_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs;\n \n-\n-\t/* Start DMA at nearest aligned address below min_ofs */\n-\t#define QAT_64_BTYE_ALIGN_MASK (~0x3f)\n-\tbuf_start = rte_pktmbuf_mtophys_offset(op->sym->m_src, min_ofs) &\n-\t\t\t\t\t\t\tQAT_64_BTYE_ALIGN_MASK;\n-\n-\tif (unlikely((rte_pktmbuf_mtophys(op->sym->m_src)\n-\t\t\t- rte_pktmbuf_headroom(op->sym->m_src)) > buf_start)) {\n-\t\t/* alignment has pushed addr ahead of start of mbuf\n-\t\t * so revert and take the performance hit\n+\tif (unlikely(op->sym->m_dst != NULL)) {\n+\t\t/* Out-of-place operation (OOP)\n+\t\t * Don't align DMA start. DMA the minimum data-set\n+\t\t * so as not to overwrite data in dest buffer\n \t\t */\n-\t\tbuf_start = rte_pktmbuf_mtophys(op->sym->m_src);\n+\t\tsrc_buf_start =\n+\t\t\trte_pktmbuf_mtophys_offset(op->sym->m_src, min_ofs);\n+\t\tdst_buf_start =\n+\t\t\trte_pktmbuf_mtophys_offset(op->sym->m_dst, min_ofs);\n+\t} else {\n+\t\t/* In-place operation\n+\t\t * Start DMA at nearest aligned address below min_ofs\n+\t\t */\n+\t\tsrc_buf_start =\n+\t\t\trte_pktmbuf_mtophys_offset(op->sym->m_src, min_ofs)\n+\t\t\t\t\t\t& QAT_64_BTYE_ALIGN_MASK;\n+\n+\t\tif (unlikely((rte_pktmbuf_mtophys(op->sym->m_src) -\n+\t\t\t\t\trte_pktmbuf_headroom(op->sym->m_src))\n+\t\t\t\t\t\t\t> src_buf_start)) {\n+\t\t\t/* alignment has pushed addr ahead of start of mbuf\n+\t\t\t * so revert and take the performance hit\n+\t\t\t */\n+\t\t\tsrc_buf_start =\n+\t\t\t\trte_pktmbuf_mtophys_offset(op->sym->m_src,\n+\t\t\t\t\t\t\t\tmin_ofs);\n+\t\t}\n+\t\tdst_buf_start = src_buf_start;\n \t}\n \n-\tqat_req->comn_mid.dest_data_addr =\n-\t\tqat_req->comn_mid.src_data_addr = buf_start;\n-\n \tif (do_cipher) {\n \t\tcipher_param->cipher_offset =\n-\t\t\t\t\t(uint32_t)rte_pktmbuf_mtophys_offset(\n-\t\t\t\t\top->sym->m_src, cipher_ofs) - buf_start;\n+\t\t\t\t(uint32_t)rte_pktmbuf_mtophys_offset(\n+\t\t\t\top->sym->m_src, cipher_ofs) - src_buf_start;\n \t\tcipher_param->cipher_length = cipher_len;\n \t} else {\n \t\tcipher_param->cipher_offset = 0;\n@@ -1105,7 +1118,7 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)\n \t}\n \tif (do_auth) {\n \t\tauth_param->auth_off = (uint32_t)rte_pktmbuf_mtophys_offset(\n-\t\t\t\t\top->sym->m_src, auth_ofs) - buf_start;\n+\t\t\t\top->sym->m_src, auth_ofs) - src_buf_start;\n \t\tauth_param->auth_len = auth_len;\n \t} else {\n \t\tauth_param->auth_off = 0;\n@@ -1118,21 +1131,8 @@ qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)\n \t\t(cipher_param->cipher_offset + cipher_param->cipher_length)\n \t\t: (auth_param->auth_off + auth_param->auth_len);\n \n-\n-\t/* out-of-place operation (OOP) */\n-\tif (unlikely(op->sym->m_dst != NULL)) {\n-\n-\t\tif (do_auth)\n-\t\t\tqat_req->comn_mid.dest_data_addr =\n-\t\t\t\trte_pktmbuf_mtophys_offset(op->sym->m_dst,\n-\t\t\t\t\t\tauth_ofs)\n-\t\t\t\t\t\t- auth_param->auth_off;\n-\t\telse\n-\t\t\tqat_req->comn_mid.dest_data_addr =\n-\t\t\t\trte_pktmbuf_mtophys_offset(op->sym->m_dst,\n-\t\t\t\t\t\tcipher_ofs)\n-\t\t\t\t\t\t- cipher_param->cipher_offset;\n-\t}\n+\tqat_req->comn_mid.src_data_addr = src_buf_start;\n+\tqat_req->comn_mid.dest_data_addr = dst_buf_start;\n \n \tif (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_128 ||\n \t\t\tctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_64) {\ndiff --git a/drivers/crypto/qat/qat_crypto.h b/drivers/crypto/qat/qat_crypto.h\nindex 0afe74e..6b84488 100644\n--- a/drivers/crypto/qat/qat_crypto.h\n+++ b/drivers/crypto/qat/qat_crypto.h\n@@ -43,6 +43,7 @@\n */\n #define ALIGN_POW2_ROUNDUP(num, align) \\\n \t(((num) + (align) - 1) & ~((align) - 1))\n+#define QAT_64_BTYE_ALIGN_MASK (~0x3f)\n \n /**\n * Structure associated with each queue.\n", "prefixes": [ "dpdk-dev" ] }