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 60C82A04F0 for ; Thu, 19 Dec 2019 15:42:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 457AF1C036; Thu, 19 Dec 2019 15:42:02 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id EA1501C024 for ; Thu, 19 Dec 2019 15:42:00 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id a5so5689804wmb.0 for ; Thu, 19 Dec 2019 06:42:00 -0800 (PST) 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=hPY5GWOg5LHXVHs3E83YxnRZTpWMNWQMe4g/I5vwkZs=; b=UG+Q85yNPWtulBISTZc5gqSoNxnpn6QTq9h/tsHCUJm7vLTdHkDSks+FiF8JFXwhX8 Fxopv7SJqpaJ8hkMPTgKFpqkTfSkPCUKG3K6zelCkXxVOkd+zgUn7RB7URZyhJHXgnOO R27V6Z1pmLNkZXYNLiaHOyDAVNIzBe0SGDAmknkQ3s9ZWEnjk2IWHnn70UvByz/WLkY3 nDxN16TKvtHPB3W9DbnR+LeChJ5Dvcg/dm+e7p2aT3E/y2SD/xLfGl8LWyNja1O7eP4J rLRM9fDtUFpkKm28HN6OpTQlT0ebm7XUXWQA7syxCpVKmyCapR6f/BE35NFimuANrSoG F7Fw== 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=hPY5GWOg5LHXVHs3E83YxnRZTpWMNWQMe4g/I5vwkZs=; b=GXgpmeo6IZej/MxBchRDJ6jn58EAcvbqI8QUFZODr9S+Ivd0iwDjmS5NC8pZdHsvRg bILl9YjK7hBNJTNgXht1EgBAK5T8iyZrBHn3T+WrV8ADi5YMfpK3f0IT3GPaiVJmzrVc B6F0up+nH4XKbEeis+ySsAxFU4W5W0n8TLCMqtzkA++3080ea+ruGvRduYf0ipRwSTwX fwFpZLKIF3bDcbclvvhaiULNGv6j+BxvnfQ9IDoRivbf3dIgacDFapwdgVY4NUeXDO8Z 1lZU3jKtT7TCFca3AzaxAqo4okiFSsCUxna4Ls2o00wOcSQxOBKbRjfcU8+P1J58qjbu U19A== X-Gm-Message-State: APjAAAXY6f+NRGMZkOj3QnowpJPUoL5ekvaif0fyR3YHQqt7NmofxZkl IPMNrwkILOKSzHrXacEkvO/jG3CDYXY= X-Google-Smtp-Source: APXvYqzsb9+IUX8BW/4HAFDoPCoxP8aSIJShGo3y89k376m7qOOmfv3ocOptnzZB/Kp0NjMftqthdQ== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr10085060wmk.141.1576766520705; Thu, 19 Dec 2019 06:42:00 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r6sm6663429wrq.92.2019.12.19.06.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:41:59 -0800 (PST) From: luca.boccassi@gmail.com To: Archana Muniganti Cc: Anoob Joseph , Akhil Goyal , dpdk stable Date: Thu, 19 Dec 2019 14:34:39 +0000 Message-Id: <20191219143447.21506-132-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/crypto-perf: fix input of AEAD decrypt' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 c3889cce9b23ffa8ca1a0ce49b87f6ee3646d476 Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Thu, 21 Nov 2019 16:44:27 +0530 Subject: [PATCH] app/crypto-perf: fix input of AEAD decrypt [ upstream commit 7f9816b9b2589625cb4b0e98a3d770c44717d633 ] In AEAD decrypt (verify mode), test data should point to cipher text instead of plain text Fixes: 5b2b0a740fba ("app/crypto-perf: overwrite mbuf when verifying") Signed-off-by: Archana Muniganti Acked-by: Anoob Joseph Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_test_verify.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c index 6945c8b4ce..29356422ad 100644 --- a/app/test-crypto-perf/cperf_test_verify.c +++ b/app/test-crypto-perf/cperf_test_verify.c @@ -230,11 +230,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf, { uint32_t segment_sz = options->segment_sz; uint8_t *mbuf_data; - uint8_t *test_data = - (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ? + uint8_t *test_data; + uint32_t remaining_bytes = options->max_buffer_size; + + if (options->op_type == CPERF_AEAD) { + test_data = (options->aead_op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ? test_vector->plaintext.data : test_vector->ciphertext.data; - uint32_t remaining_bytes = options->max_buffer_size; + } else { + test_data = + (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ? + test_vector->plaintext.data : + test_vector->ciphertext.data; + } while (remaining_bytes) { mbuf_data = rte_pktmbuf_mtod(mbuf, uint8_t *); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:31.580530956 +0000 +++ 0132-app-crypto-perf-fix-input-of-AEAD-decrypt.patch 2019-12-19 14:32:26.337302426 +0000 @@ -1,13 +1,14 @@ -From 7f9816b9b2589625cb4b0e98a3d770c44717d633 Mon Sep 17 00:00:00 2001 +From c3889cce9b23ffa8ca1a0ce49b87f6ee3646d476 Mon Sep 17 00:00:00 2001 From: Archana Muniganti Date: Thu, 21 Nov 2019 16:44:27 +0530 Subject: [PATCH] app/crypto-perf: fix input of AEAD decrypt +[ upstream commit 7f9816b9b2589625cb4b0e98a3d770c44717d633 ] + In AEAD decrypt (verify mode), test data should point to cipher text instead of plain text Fixes: 5b2b0a740fba ("app/crypto-perf: overwrite mbuf when verifying") -Cc: stable@dpdk.org Signed-off-by: Archana Muniganti Acked-by: Anoob Joseph @@ -17,10 +18,10 @@ 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c -index bbdf37d051..833bc9a552 100644 +index 6945c8b4ce..29356422ad 100644 --- a/app/test-crypto-perf/cperf_test_verify.c +++ b/app/test-crypto-perf/cperf_test_verify.c -@@ -203,11 +203,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf, +@@ -230,11 +230,19 @@ cperf_mbuf_set(struct rte_mbuf *mbuf, { uint32_t segment_sz = options->segment_sz; uint8_t *mbuf_data;