From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D88ACA0093 for ; Tue, 19 May 2020 15:15:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CCDCF1D702; Tue, 19 May 2020 15:15:11 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id A74E41D702 for ; Tue, 19 May 2020 15:15:10 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id t8so736119wmi.0 for ; Tue, 19 May 2020 06:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GJrh9sbFU0OhgdzsudIJ5S3Uz5nPcnrD/ga7lvGE4b8=; b=V3+WSlawjBRc/AqydiE3BqA6EqPGCI3yA88unYPkxwAEafQo35KZ1R4EoGL+QjAfg5 SGUswc8afNykPr/MqPBA29V0BsrNCLfikuJn3dckLp1Wf7qD51Gzz6CbgS14UMGPty2o M3T+KMslf/mSbw5GSvbUvSrWGdBqSqb+z3rsBeKa3WS9mUyyuYvP/XA3IkWB+bPTIAyG QnDSYShFI6euFzWHOOYuz0Tin16axv+Ph24FLeemaOTRE4n+vMR88T3JZEQBLjxNOw7w ujqTv7gN6TANRDIGRsmkBaX0bevkz+KYBYt0ZJHvyG+gmHdiUbAIxu1jTkOV7cnIyZtO e9ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GJrh9sbFU0OhgdzsudIJ5S3Uz5nPcnrD/ga7lvGE4b8=; b=kzHxWiXB3fbD3QkShQ8UzD8L0aqQnC3tWN7fbg9RPlcIN/eWvSoadEpCYNJK1nGhop X9x7kt/TDzGukEg/NDtEyYVDjMLbRcqLADGjij+0Ko9Be56sQ4plGZVUVdYVUzQxCxjk y43DdxE5fr76EN24J1IUlsn+psR1HEEBihCWXcJ3Wxovzq4vhkN99vdzTU0Sfo/bqUgO Pxyn3e92yI8YCiKsIngkwq1KxprnjdvaxkLxOeS81A9jjI27kyUKFLtfSkr/BoCR5anU 41z658Ls7vAJryeVveO6Pq0tunbJTHl+08mj7TN9qCcr+iG3RH1a8Ad2/UXm53VQqL21 W80A== X-Gm-Message-State: AOAM530conycOd6kQjdDphWmMowmZSTvKuVWkvE5EwJgoaBpJr86N7xT FdYAAYg/Nc5A4GUTDGsfARQ= X-Google-Smtp-Source: ABdhPJzfwik3y8+x15iI0qURtM9bjRgyUm08HYBX7zRpQZWWRgZELLn2rItLPoFr2QL/buDthffKUw== X-Received: by 2002:a7b:c7d0:: with SMTP id z16mr610204wmk.0.1589894110302; Tue, 19 May 2020 06:15:10 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q9sm3717607wmb.34.2020.05.19.06.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Arek Kusztal Cc: Fiona Trahe , dpdk stable Date: Tue, 19 May 2020 14:05:11 +0100 Message-Id: <20200519130549.112823-176-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. Thanks. Luca Boccassi --- >From 0665fb6e097a758af43ef525e9e0dde16d960ff5 Mon Sep 17 00:00:00 2001 From: Arek Kusztal Date: Wed, 29 Apr 2020 16:51:34 +0200 Subject: [PATCH] crypto/qat: fix cipher descriptor for ZUC and SNOW [ upstream commit fae347cb345a844442c18e1384b832912e07daa0 ] Offset of cd pointer is too big by state1size + state2size, so few extra unnecessary bytes will be copied into cd. Snow offset was improved as well. Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability") Signed-off-by: Arek Kusztal Acked-by: Fiona Trahe --- drivers/crypto/qat/qat_sym_session.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 72290ba480..f69c2e2fd7 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -1524,7 +1524,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, (struct icp_qat_fw_la_auth_req_params *) ((char *)&req_tmpl->serv_specif_rqpars + ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET); - uint16_t state1_size = 0, state2_size = 0; + uint16_t state1_size = 0, state2_size = 0, cd_extra_size = 0; uint16_t hash_offset, cd_size; uint32_t *aad_len = NULL; uint32_t wordIndex = 0; @@ -1700,7 +1700,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, memcpy(cipherconfig->key, authkey, authkeylen); memset(cipherconfig->key + authkeylen, 0, ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ); - cdesc->cd_cur_ptr += sizeof(struct icp_qat_hw_cipher_config) + + cd_extra_size += sizeof(struct icp_qat_hw_cipher_config) + authkeylen + ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ; auth_param->hash_state_sz = ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ >> 3; break; @@ -1716,8 +1716,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, + ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ); memcpy(cdesc->cd_cur_ptr + state1_size, authkey, authkeylen); - cdesc->cd_cur_ptr += state1_size + state2_size - + ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ; + cd_extra_size += ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ; auth_param->hash_state_sz = ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ >> 3; cdesc->min_qat_dev_gen = QAT_GEN2; @@ -1803,7 +1802,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, RTE_ALIGN_CEIL(hash_cd_ctrl->inner_state1_sz, 8)) >> 3); - cdesc->cd_cur_ptr += state1_size + state2_size; + cdesc->cd_cur_ptr += state1_size + state2_size + cd_extra_size; cd_size = cdesc->cd_cur_ptr-(uint8_t *)&cdesc->cd; cd_pars->u.s.content_desc_addr = cdesc->cd_paddr; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:51.704190182 +0100 +++ 0176-crypto-qat-fix-cipher-descriptor-for-ZUC-and-SNOW.patch 2020-05-19 14:04:44.520653884 +0100 @@ -1,13 +1,14 @@ -From fae347cb345a844442c18e1384b832912e07daa0 Mon Sep 17 00:00:00 2001 +From 0665fb6e097a758af43ef525e9e0dde16d960ff5 Mon Sep 17 00:00:00 2001 From: Arek Kusztal Date: Wed, 29 Apr 2020 16:51:34 +0200 Subject: [PATCH] crypto/qat: fix cipher descriptor for ZUC and SNOW +[ upstream commit fae347cb345a844442c18e1384b832912e07daa0 ] + Offset of cd pointer is too big by state1size + state2size, so few extra unnecessary bytes will be copied into cd. Snow offset was improved as well. Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability") -Cc: stable@dpdk.org Signed-off-by: Arek Kusztal Acked-by: Fiona Trahe @@ -16,10 +17,10 @@ 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c -index 3727d564d8..58bdbd3438 100644 +index 72290ba480..f69c2e2fd7 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c -@@ -1664,7 +1664,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, +@@ -1524,7 +1524,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, (struct icp_qat_fw_la_auth_req_params *) ((char *)&req_tmpl->serv_specif_rqpars + ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET); @@ -28,7 +29,7 @@ uint16_t hash_offset, cd_size; uint32_t *aad_len = NULL; uint32_t wordIndex = 0; -@@ -1886,7 +1886,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, +@@ -1700,7 +1700,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, memcpy(cipherconfig->key, authkey, authkeylen); memset(cipherconfig->key + authkeylen, 0, ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ); @@ -37,7 +38,7 @@ authkeylen + ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ; auth_param->hash_state_sz = ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ >> 3; break; -@@ -1902,8 +1902,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, +@@ -1716,8 +1716,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, + ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ); memcpy(cdesc->cd_cur_ptr + state1_size, authkey, authkeylen); @@ -47,7 +48,7 @@ auth_param->hash_state_sz = ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ >> 3; cdesc->min_qat_dev_gen = QAT_GEN2; -@@ -1989,7 +1988,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, +@@ -1803,7 +1802,7 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, RTE_ALIGN_CEIL(hash_cd_ctrl->inner_state1_sz, 8)) >> 3);