From patchwork Fri Jan 7 15:06:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ji, Kai" X-Patchwork-Id: 105688 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 950A6A04A6; Fri, 7 Jan 2022 16:06:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A30E40140; Fri, 7 Jan 2022 16:06:11 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 42ED240042 for ; Fri, 7 Jan 2022 16:06:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641567970; x=1673103970; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=YKf17GGBegF8tGY0rQF79pAb9NpxMfG6/BRiUTVLSxM=; b=i53dHiIvWSDi5bUZn23mqSJZliIOfVRey1Bw8PkhPwk1X77jQhKJeiTz gi/+oBJPj1KdfpXCiOBJ5Kgq5DRjApdYKjyzYUOdON/g3hsy3pW4ctzJj SHixxPWW2EkCeKwaG/luGcpqrH4x03LA+Gc2Z4phq0HbjA/c4qpSAqw5/ T9l8yxqQ+yPctCuNo9fN+AxEL7DQv7cbAXcGy+v5H8vKzdNG3TW1R+xAF 35fzXe4izv0G3VnYBGhjt5VbYJ52X1nTXbbWLrTQxMiF0UyXQMl6dH5ut tkxHnjvU5FEwu8hs5f1bEUgSMVh2XZG2T2VNINydong2rEn1uCGr95u80 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="306244967" X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="306244967" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 07:06:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="527393130" Received: from silpixa00400272.ir.intel.com (HELO silpixa00400272.ger.corp.intel.com) ([10.237.223.111]) by orsmga008.jf.intel.com with ESMTP; 07 Jan 2022 07:06:08 -0800 From: Kai Ji To: dev@dpdk.org Cc: Kai Ji , hemant.agrawal@nxp.com Subject: [dpdk-dev v2] test/cryptodev: Fix sgl oop in raw dp unit test Date: Fri, 7 Jan 2022 15:06:04 +0000 Message-Id: <20220107150604.14276-1-kai.ji@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211105161730.22210-1-kai.ji@intel.com> References: <20211105161730.22210-1-kai.ji@intel.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix SGL OOP support in sym raw dp unit test Fixes: cd8166c28cd1 ("test/crypto: add raw API test for dpaax") Cc: hemant.agrawal@nxp.com Signed-off-by: Kai Ji Acked-by: Akhil Goyal --- app/test/test_cryptodev.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 10b48cdadb..e43f8013cc 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -209,6 +209,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, int enqueue_status, dequeue_status; struct crypto_unittest_params *ut_params = &unittest_params; int is_sgl = sop->m_src->nb_segs > 1; + int is_oop = 0; ctx_service_size = rte_cryptodev_get_raw_dp_ctx_size(dev_id); if (ctx_service_size < 0) { @@ -247,6 +248,9 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, ofs.raw = 0; + if ((sop->m_dst != NULL) && (sop->m_dst != sop->m_src)) + is_oop = 1; + if (is_cipher && is_auth) { cipher_offset = sop->cipher.data.offset; cipher_len = sop->cipher.data.length; @@ -277,6 +281,8 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, if (is_sgl) { uint32_t remaining_off = auth_offset + auth_len; struct rte_mbuf *sgl_buf = sop->m_src; + if (is_oop) + sgl_buf = sop->m_dst; while (remaining_off >= rte_pktmbuf_data_len(sgl_buf) && sgl_buf->next != NULL) { @@ -293,7 +299,8 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, /* Then check if digest-encrypted conditions are met */ if ((auth_offset + auth_len < cipher_offset + cipher_len) && (digest.iova == auth_end_iova) && is_sgl) - max_len = RTE_MAX(max_len, auth_offset + auth_len + + max_len = RTE_MAX(max_len, + auth_offset + auth_len + ut_params->auth_xform.auth.digest_length); } else if (is_cipher) { @@ -356,7 +363,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id, sgl.num = n; /* Out of place */ - if (sop->m_dst != NULL) { + if (is_oop) { dest_sgl.vec = dest_data_vec; vec.dest_sgl = &dest_sgl; n = rte_crypto_mbuf_to_vec(sop->m_dst, 0, max_len,