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 26CEA41D4F for ; Thu, 23 Feb 2023 10:37:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1CE1643158; Thu, 23 Feb 2023 10:37:43 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 7810843150 for ; Thu, 23 Feb 2023 10:37:41 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id h14so1466062wru.4 for ; Thu, 23 Feb 2023 01:37:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OpR9G1oxhBa0r0onqSawvBej3JjWs9T0sOMECl+bhjY=; b=Qxroy0RUpOqaEFkRI79dj5acJu+EqDGtL/ptZp5XtDDT6myhesK3l8UDBrO/F/OdxH umNgTlIUwYaCLfuS10xP/C6HKjneN6vMqMqImluvCOeUBcoiuEdlzpVHiO7ygSjuNhYo p3hmf4uTmADyM+yOq72KRM/SiBJsuKnAYHSR6gdyPNgT5qksYUAuNplMIOL9ZGdlFLFo FL6CT916EQS7P2RrrXBhDcwGUEP1721rWFVLxR8uRqYu4wHcnKNCTwRGGNRIB2YI8k5A npW1YgDY4CLu6jr/f/VnhFpCnlkH+y7+P/DKkvbNGvaZC6RmSYkjSoZRKHg0Dil5Apl/ RSUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OpR9G1oxhBa0r0onqSawvBej3JjWs9T0sOMECl+bhjY=; b=liO8BjxQbgKY65VzEIVN1DE0XCzPKlX8QFr7qcuIYK0MBLv9d77W088pedLJpzQ2kq uNLntNYCG7/T6Qte9uS0qJE2HefgRQd5ey8cugMD/qKH1zeWW3V7fA1Qmnd9tr29QzwX aNdIsKkTtXyVPF0paBuOtoENMnRJGfG5ToZ9qxhHN+vVNK5+L7x9E6NDpeOf/30xeH5i fA9vmFANtWYVoUYS686Q8u5+GEfvNsmMaS5kRj+fh4kR+3i0aw4+Bsp15nJ4K2/r2aQ9 PR4S4YjPjpdIolSyhPCI3IkkKrfR0QtM/gYv16cIckB9NY/mpOyrrw/WjA+UPfdADGhd 9cfA== X-Gm-Message-State: AO0yUKW7vVqc1w53WaTzY4EQgvwBtfWUUXB54k5vV3Bv5JM/W6VeK4my N6rRwZ1RPCh5iKFgco71H+c= X-Google-Smtp-Source: AK7set9CEor3WgAprB+2N755y9fsYQSgxp8V+OeLLWROamqNckW4vd/ic6qmFIya30J6Zlp+0GxzaA== X-Received: by 2002:adf:f208:0:b0:2c5:4b22:bce9 with SMTP id p8-20020adff208000000b002c54b22bce9mr10923941wro.47.1677145061118; Thu, 23 Feb 2023 01:37:41 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id l17-20020a5d4111000000b002c558869934sm659163wrp.81.2023.02.23.01.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:37:40 -0800 (PST) From: luca.boccassi@gmail.com To: Ciara Power Cc: dpdk stable Subject: patch 'crypto/qat: fix stream cipher direction' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:11 +0000 Message-Id: <20230223093715.3926893-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.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 Hi, FYI, your patch has been queued to stable release 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/09162b9e22428a67be570cab8b4231b5810ef246 Thanks. Luca Boccassi --- >From 09162b9e22428a67be570cab8b4231b5810ef246 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 21 Dec 2022 14:05:55 +0000 Subject: [PATCH] crypto/qat: fix stream cipher direction [ upstream commit 96ef7feb7a63ee74a99e221d255d91e8af3cf196 ] Stream ciphers use ENCRYPT mode in HW for both encryption and decryption operations. This patch adds in an overwrite to always set ENCRYPT mode for these algorithms. Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability") Signed-off-by: Ciara Power --- drivers/crypto/qat/qat_sym_session.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 10db656316..d397bde1ca 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -1572,9 +1572,10 @@ int qat_sym_session_aead_create_cd_cipher(struct qat_sym_session *cdesc, key_convert = ICP_QAT_HW_CIPHER_NO_CONVERT; } else if (cdesc->qat_cipher_alg == ICP_QAT_HW_CIPHER_ALGO_SNOW_3G_UEA2 || cdesc->qat_cipher_alg == - ICP_QAT_HW_CIPHER_ALGO_ZUC_3G_128_EEA3) + ICP_QAT_HW_CIPHER_ALGO_ZUC_3G_128_EEA3) { key_convert = ICP_QAT_HW_CIPHER_KEY_CONVERT; - else if (cdesc->qat_dir == ICP_QAT_HW_CIPHER_ENCRYPT) + cdesc->qat_dir = ICP_QAT_HW_CIPHER_ENCRYPT; + } else if (cdesc->qat_dir == ICP_QAT_HW_CIPHER_ENCRYPT) key_convert = ICP_QAT_HW_CIPHER_NO_CONVERT; else key_convert = ICP_QAT_HW_CIPHER_KEY_CONVERT; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:28.596764182 +0000 +++ 0007-crypto-qat-fix-stream-cipher-direction.patch 2023-02-23 09:36:28.170168909 +0000 @@ -1 +1 @@ -From 96ef7feb7a63ee74a99e221d255d91e8af3cf196 Mon Sep 17 00:00:00 2001 +From 09162b9e22428a67be570cab8b4231b5810ef246 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 96ef7feb7a63ee74a99e221d255d91e8af3cf196 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ea1b729076..978ee49dce 100644 +index 10db656316..d397bde1ca 100644 @@ -22 +23 @@ -@@ -1884,9 +1884,10 @@ int qat_sym_cd_cipher_set(struct qat_sym_session *cdesc, +@@ -1572,9 +1572,10 @@ int qat_sym_session_aead_create_cd_cipher(struct qat_sym_session *cdesc, @@ -33,2 +34,2 @@ - else if (cdesc->qat_mode == ICP_QAT_HW_CIPHER_AEAD_MODE) - key_convert = ICP_QAT_HW_CIPHER_NO_CONVERT; + else + key_convert = ICP_QAT_HW_CIPHER_KEY_CONVERT;