From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A4AAA04FF for ; Tue, 22 Mar 2022 16:14:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6397A40694; Tue, 22 Mar 2022 16:14:55 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 1FB4A40694 for ; Tue, 22 Mar 2022 16:14:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647962093; x=1679498093; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0/GDEkiD6BbutK3c2LgXBPKlA3xqbxAHE5H2WEkIlgs=; b=CCUCRiPpo50IgbZY6+hg7pJP+Yl1OvsI+elpDgZ0I5LDtgHQPu2Zf6ab QWoPj0yuFsnFy6sDEvZpIFN4EBC7Jv1KAP0MzsVfc/LrkhjDK4elbGLMZ W2Kx3cwibaCOmVVLBu2nksJLYKFgatS15Kk0Qunysjff4LJ/Bzop4XVtT 6trt7QTXfd6ef8+RxZT2aGlYM6XNYoLUgcqtToU8Qru25x2eJqkpjwOXD vK5D1uxAN1j1auMcLkoFeEaFuah+6jZulY007N8Jj4ZtljK/SiwPxjSac CR5fc8UNx1BrpF9uRT8AfAWuBKMTGUfPlaVSB7n0aSEKtX1x6l1mNc2n6 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10294"; a="257792328" X-IronPort-AV: E=Sophos;i="5.90,201,1643702400"; d="scan'208";a="257792328" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2022 08:14:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,201,1643702400"; d="scan'208";a="515378565" Received: from silpixa00401363.ir.intel.com ([10.55.128.38]) by orsmga002.jf.intel.com with ESMTP; 22 Mar 2022 08:14:51 -0700 From: Pablo de Lara To: ktraynor@redhat.com Cc: stable@dpdk.org, Pablo de Lara , Fan Zhang , Radu Nicolau Subject: [PATCH 21.11 v2 2/2] crypto/ipsec_mb: fix GMAC parameters setting Date: Tue, 22 Mar 2022 15:14:47 +0000 Message-Id: <20220322151447.718221-2-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322151447.718221-1-pablo.de.lara.guarch@intel.com> References: <20220322151447.718221-1-pablo.de.lara.guarch@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit 837269c2e5c5a8813adfcf59f23b80569048ddeb ] AES-GMAC requires plaintext length to be 0 when using AES-GCM, so only AAD data is used. Fixes: a501609ea646 ("crypto/ipsec_mb: fix length and offset settings") Cc: pablo.de.lara.guarch@intel.com Cc: stable@dpdk.org Signed-off-by: Pablo de Lara Acked-by: Fan Zhang Acked-by: Radu Nicolau Tested-by: Radu Nicolau --- drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c index 519ff023ff..536a586e98 100644 --- a/drivers/crypto/ipsec_mb/pmd_aesni_mb.c +++ b/drivers/crypto/ipsec_mb/pmd_aesni_mb.c @@ -1284,9 +1284,9 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp, op->sym->aead.data.offset; job->msg_len_to_hash_in_bytes = op->sym->aead.data.length; - } else { - job->msg_len_to_cipher_in_bytes = 0; + } else { /* AES-GMAC only, only AAD used */ job->msg_len_to_hash_in_bytes = 0; + job->hash_start_src_offset_in_bytes = 0; } job->iv = rte_crypto_op_ctod_offset(op, uint8_t *, @@ -1366,8 +1366,18 @@ set_mb_job_params(IMB_JOB *job, struct ipsec_mb_qp *qp, job->msg_len_to_cipher_in_bits = op->sym->cipher.data.length; break; - case IMB_CIPHER_CCM: case IMB_CIPHER_GCM: + if (session->cipher.mode == IMB_CIPHER_NULL) { + /* AES-GMAC only (only AAD used) */ + job->msg_len_to_cipher_in_bytes = 0; + job->cipher_start_src_offset_in_bytes = 0; + } else { + job->cipher_start_src_offset_in_bytes = + op->sym->aead.data.offset; + job->msg_len_to_cipher_in_bytes = op->sym->aead.data.length; + } + break; + case IMB_CIPHER_CCM: case IMB_CIPHER_CHACHA20_POLY1305: job->cipher_start_src_offset_in_bytes = op->sym->aead.data.offset; -- 2.25.1