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 39EBDA0518 for ; Fri, 24 Jul 2020 14:07:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 31CB51C065; Fri, 24 Jul 2020 14:07:12 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 4DBE31C065 for ; Fri, 24 Jul 2020 14:07:11 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id z18so4523503wrm.12 for ; Fri, 24 Jul 2020 05:07:11 -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=IM9vqraJlsX9UHxOUA/s7REUHhKdTF0cl3xg1AD7mK4=; b=vZ0I1Frj5K9T0jfHySBbWvRAMKAJ8STLNLoiEmNkW4vgi43yfiCzhETcFWwvnv4MhL sSJBgRpdrNzdcc9Xi72dhq3te5I3mBE9oFhv8mibjnprpYl4iueq5tvr9Jb0pUQPREw7 Lt+35Gl7ESE3ZLajNuZgDV+mxC8CaSLyPp/CiILA+Y/BUFPr1Pf5YahQxJXxI35b1nIO QGPTJFyJ0Kd/Jc2RUhyAhjKMSXQnxG9m5l1tjp1RAR7jnyn4ytQJweaVUgbnkF3QQoAW lnbG5CkNmnmFLTGUPB0FTZvrnnTOfkrAlTYHtTQvg1C/KxQmJl0NnQjT+XotmpY/tyjF gHnw== 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=IM9vqraJlsX9UHxOUA/s7REUHhKdTF0cl3xg1AD7mK4=; b=Jx0QFMrEaT6v8NG30kQEkB6gQlqiopRyBjColNpQhBH6NCYxzJQECScOus7UaNZER7 4Cig+tTiLq6XJpkxNqo7MA6UOvKLHIzssN6P0A9YFJIrEVbTHqCzRpNtPwK20SE4oPJj 7CICLUYdOh7Gnpgn0n/xjQXWBPFoNx6hAp1jhDYY0cDHKYJNvQMMPY/87vJ85S59puu0 7ItJ2xT9per1CyQ+fNjitec24XRHLlaZYleFh7dXPWx/tfCPBtQKg5z1TuUSzfmxxF4g IkyB8l+pajkhJNPzniwRkP6SqiAVqjRlbpu6oZhN70s5hPcqUO4cmKp+Na+WbjPCJErg CL8w== X-Gm-Message-State: AOAM531Rv508C6eiGLKyHp+B/ne/vzCLLpTwqOjTLyYS57Z8mEtQHPq4 +kG6xugsOq81S2Jl2TYGwbX5kJB0srtmNw== X-Google-Smtp-Source: ABdhPJytX0FxM56EtDiR1pi2TFQ4lqAZWLU9uHKpzbPWtGrsXyS0zxy+9DDU1N8nfvrkNhpJl+ax6g== X-Received: by 2002:adf:fd04:: with SMTP id e4mr8134351wrr.353.1595592431011; Fri, 24 Jul 2020 05:07:11 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t189sm5120505wmf.47.2020.07.24.05.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:07:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Akhil Goyal Cc: Hemant Agrawal , dpdk stable Date: Fri, 24 Jul 2020 12:58:55 +0100 Message-Id: <20200724120030.1863487-97-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 9b5cf4fecdee61d25ba9cc32d880d117b6f66c89 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Fri, 5 Jun 2020 01:34:10 +0530 Subject: [PATCH] crypto/dpaax_sec: fix inline query for descriptors [ upstream commit 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 ] The maximum length of job descriptor which is formed is 13 words and hence rta_inline_query should take care of the max descriptor(shared + job) lengths and thus find out of the key can be referenced or immediate. Fixes: 05b12700cd4c ("crypto/dpaa_sec: support null algos for protocol offload") Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR") Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal --- drivers/common/dpaax/caamflib/desc.h | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 4 ++-- drivers/crypto/dpaa_sec/dpaa_sec.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc.h b/drivers/common/dpaax/caamflib/desc.h index e4139aaa9..635d6bad0 100644 --- a/drivers/common/dpaax/caamflib/desc.h +++ b/drivers/common/dpaax/caamflib/desc.h @@ -26,7 +26,7 @@ extern enum rta_sec_era rta_sec_era; #define CAAM_CMD_SZ sizeof(uint32_t) #define CAAM_PTR_SZ sizeof(dma_addr_t) #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE) -#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3) +#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3) /* Block size of any entity covered/uncovered with a KEK/TKEK */ #define KEK_BLOCKSIZE 16 diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 434310cfd..9f8399e2b 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -2192,7 +2192,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev, priv->flc_desc[0].desc[0] = aeaddata.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN, - MIN_JOB_DESC_SIZE, + DESC_JOB_IO_LEN, (unsigned int *)priv->flc_desc[0].desc, &priv->flc_desc[0].desc[1], 1); @@ -2410,7 +2410,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev, priv->flc_desc[0].desc[0] = cipherdata.keylen; priv->flc_desc[0].desc[1] = authdata.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN, - MIN_JOB_DESC_SIZE, + DESC_JOB_IO_LEN, (unsigned int *)priv->flc_desc[0].desc, &priv->flc_desc[0].desc[2], 2); diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 4442469e2..35f1feac4 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -348,7 +348,7 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses) cdb->sh_desc[0] = cipherdata.keylen; cdb->sh_desc[1] = authdata.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN, - MIN_JOB_DESC_SIZE, + DESC_JOB_IO_LEN, (unsigned int *)cdb->sh_desc, &cdb->sh_desc[2], 2); @@ -534,7 +534,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) cdb->sh_desc[0] = alginfo_c.keylen; cdb->sh_desc[1] = alginfo_a.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN, - MIN_JOB_DESC_SIZE, + DESC_JOB_IO_LEN, (unsigned int *)cdb->sh_desc, &cdb->sh_desc[2], 2); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:52.287828866 +0100 +++ 0097-crypto-dpaax_sec-fix-inline-query-for-descriptors.patch 2020-07-24 12:53:48.339007429 +0100 @@ -1,8 +1,10 @@ -From 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 Mon Sep 17 00:00:00 2001 +From 9b5cf4fecdee61d25ba9cc32d880d117b6f66c89 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Fri, 5 Jun 2020 01:34:10 +0530 Subject: [PATCH] crypto/dpaax_sec: fix inline query for descriptors +[ upstream commit 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 ] + The maximum length of job descriptor which is formed is 13 words and hence rta_inline_query should take care of the max descriptor(shared + job) lengths and @@ -10,7 +12,6 @@ Fixes: 05b12700cd4c ("crypto/dpaa_sec: support null algos for protocol offload") Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR") -Cc: stable@dpdk.org Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal @@ -34,7 +35,7 @@ /* Block size of any entity covered/uncovered with a KEK/TKEK */ #define KEK_BLOCKSIZE 16 diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c -index 60fdced78..c56fb2152 100644 +index 434310cfd..9f8399e2b 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -2192,7 +2192,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev, @@ -46,7 +47,7 @@ (unsigned int *)priv->flc_desc[0].desc, &priv->flc_desc[0].desc[1], 1); -@@ -2416,7 +2416,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev, +@@ -2410,7 +2410,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev, priv->flc_desc[0].desc[0] = cipherdata.keylen; priv->flc_desc[0].desc[1] = authdata.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN, @@ -56,10 +57,10 @@ &priv->flc_desc[0].desc[2], 2); diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c -index 01e79c8ea..5ce7e3582 100644 +index 4442469e2..35f1feac4 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c -@@ -351,7 +351,7 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses) +@@ -348,7 +348,7 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses) cdb->sh_desc[0] = cipherdata.keylen; cdb->sh_desc[1] = authdata.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN, @@ -68,7 +69,7 @@ (unsigned int *)cdb->sh_desc, &cdb->sh_desc[2], 2); -@@ -537,7 +537,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) +@@ -534,7 +534,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) cdb->sh_desc[0] = alginfo_c.keylen; cdb->sh_desc[1] = alginfo_a.keylen; err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,