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 B53C4A04DD for ; Wed, 28 Oct 2020 11:54:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A97EFC9F6; Wed, 28 Oct 2020 11:54:22 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 0BAF2CA34 for ; Wed, 28 Oct 2020 11:54:19 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id s9so5164789wro.8 for ; Wed, 28 Oct 2020 03:54:19 -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=Uwx3yhxGn2bKV6ze1aEw0BY1f8yjDb3WYkFkdxhCWBE=; b=ONvdnO8sTy4PDryZPwqaLy6881oBj574rknPe8Kr71JkGI+L9pY71UScWZMwc4H8U5 cxNRNoYD807Pa/hgGDdP3j63q6dGaHnud/bUlcPMLNqMmCj84oRHf0UHOaaW6PpXsAif 0sEhxaJUnKkwxe+ziVA4xk4X/rQoDXVCmrdzNCmpemL975jN4VDfijy0hEeGs2Tx7gH+ PvHeuncgyh3qQ894bTcvAI/+VKj56PYNGfUI78fZopRBXcN8gYdfWfMt/FgMH7MrEDFO ZQYWRJdjB4lqeEwCxDTm5mQi4SngCSKdbp/F3RF5SeG2F2WYWCL/PwvPKkOmyCChKGCP pNuw== 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=Uwx3yhxGn2bKV6ze1aEw0BY1f8yjDb3WYkFkdxhCWBE=; b=VKAswYrqe79MJXGFk+jS1O/hE85zjjjjUtFsJDPHuzuFHc+uPLIDR3Y63gINdomg8O 0TxDbNvl4CvcsRfHPVoZit53oMLsaXkNUmAbrwTn92mbq03HcY+LOIHFijOWqhaGEDFI jCs3ZpqBIPHUIREtxJVemFnhTCMEW1tbdvBE2rrsY3Xel88DvHiZRuJSmIiBT2vrkXan BRIOF6oCJDc4g9ZEjawU248WG1mBPtbquACjFKj6Ax1/qOlzDtSp6lkqzzyGCAKO5LYq glxKZx/XEgiHOVtaEEUg7mElqsFBGiVXioHGlY9+viAqnW+rjiBP2wfikK0Mp8gGWfj5 Yl5w== X-Gm-Message-State: AOAM532SBzrY6BJ0UvJnzHTnRNjXZ68ck5tbqxurLiOyIG39IjcsyLsv Pyq1+DB/5A2hfztFiwv6a8I= X-Google-Smtp-Source: ABdhPJw7MJR1WwANt91RvLg1/pFwYCvqkf5waydiT4gEEMEaDCEN2E1wn94Ktz+8Qj73uO7qPjuReQ== X-Received: by 2002:adf:d4ce:: with SMTP id w14mr8324393wrk.142.1603882458800; Wed, 28 Oct 2020 03:54:18 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q6sm6095823wma.0.2020.10.28.03.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:54:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Abhinandan Gujjar Cc: Akhil Goyal , dpdk stable Date: Wed, 28 Oct 2020 10:45:14 +0000 Message-Id: <20201028104606.3504127-155-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/event_crypto_adapter: fix configuration' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 130b526d1bfcc7b9c6d3a5d6e3cc356b8a63d12e Mon Sep 17 00:00:00 2001 From: Abhinandan Gujjar Date: Thu, 17 Sep 2020 06:44:35 +0530 Subject: [PATCH] test/event_crypto_adapter: fix configuration [ upstream commit 74449375237f2c2efd57211e667c726ef710a393 ] This patch updates the xform with right configuration. For session based ops, sym session pool is created with valid userdata size. Fixes: 24054e3640a2 ("test/crypto: use separate session mempools") Signed-off-by: Abhinandan Gujjar Acked-by: Akhil Goyal --- app/test/test_event_crypto_adapter.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c index 8d42462d87..530ce96f1a 100644 --- a/app/test/test_event_crypto_adapter.c +++ b/app/test/test_event_crypto_adapter.c @@ -171,7 +171,6 @@ test_op_forward_mode(uint8_t session_less) struct rte_event ev; uint32_t cap; int ret; - uint8_t cipher_key[17]; memset(&m_data, 0, sizeof(m_data)); @@ -183,14 +182,7 @@ test_op_forward_mode(uint8_t session_less) /* Setup Cipher Parameters */ cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; cipher_xform.next = NULL; - - cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC; - cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT; - - cipher_xform.cipher.key.data = cipher_key; - cipher_xform.cipher.key.length = 16; - cipher_xform.cipher.iv.offset = IV_OFFSET; - cipher_xform.cipher.iv.length = 16; + cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL; op = rte_crypto_op_alloc(params.op_mpool, RTE_CRYPTO_OP_TYPE_SYMMETRIC); @@ -378,7 +370,6 @@ test_op_new_mode(uint8_t session_less) struct rte_mbuf *m; uint32_t cap; int ret; - uint8_t cipher_key[17]; memset(&m_data, 0, sizeof(m_data)); @@ -390,14 +381,7 @@ test_op_new_mode(uint8_t session_less) /* Setup Cipher Parameters */ cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; cipher_xform.next = NULL; - - cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC; - cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT; - - cipher_xform.cipher.key.data = cipher_key; - cipher_xform.cipher.key.length = 16; - cipher_xform.cipher.iv.offset = IV_OFFSET; - cipher_xform.cipher.iv.length = 16; + cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL; op = rte_crypto_op_alloc(params.op_mpool, RTE_CRYPTO_OP_TYPE_SYMMETRIC); @@ -564,7 +548,9 @@ configure_cryptodev(void) params.session_mpool = rte_cryptodev_sym_session_pool_create( "CRYPTO_ADAPTER_SESSION_MP", - MAX_NB_SESSIONS, 0, 0, 0, SOCKET_ID_ANY); + MAX_NB_SESSIONS, 0, 0, + sizeof(union rte_event_crypto_metadata), + SOCKET_ID_ANY); TEST_ASSERT_NOT_NULL(params.session_mpool, "session mempool allocation failed\n"); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.549919788 +0000 +++ 0155-test-event_crypto_adapter-fix-configuration.patch 2020-10-28 10:35:11.752833674 +0000 @@ -1,14 +1,15 @@ -From 74449375237f2c2efd57211e667c726ef710a393 Mon Sep 17 00:00:00 2001 +From 130b526d1bfcc7b9c6d3a5d6e3cc356b8a63d12e Mon Sep 17 00:00:00 2001 From: Abhinandan Gujjar Date: Thu, 17 Sep 2020 06:44:35 +0530 Subject: [PATCH] test/event_crypto_adapter: fix configuration +[ upstream commit 74449375237f2c2efd57211e667c726ef710a393 ] + This patch updates the xform with right configuration. For session based ops, sym session pool is created with valid userdata size. Fixes: 24054e3640a2 ("test/crypto: use separate session mempools") -Cc: stable@dpdk.org Signed-off-by: Abhinandan Gujjar Acked-by: Akhil Goyal