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 6FF15A00C2 for ; Thu, 3 Nov 2022 10:29:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6AFAB41143; Thu, 3 Nov 2022 10:29:24 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id C8AF840693 for ; Thu, 3 Nov 2022 10:29:23 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id y16so1680930wrt.12 for ; Thu, 03 Nov 2022 02:29:23 -0700 (PDT) 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=RDvQnMSkODGNednnd6BcTzxsTcbQ61tCBdZ94umV5Ts=; b=WO0Spkygpayrmr9YKMjzV+qToCug6sG6SsnvSPNB+0UYHeKUr4eJE1LqafUdnLQFFc MrcmCeL6ZTRkiNE8p3oa0G3PlPYerUSQ118pnJ0XUIaI/65eQ+tC/UfbOr06mBnHBIMT x61//mwxcPqeBDpM1NWI+Jmt7sOAYYKXjCtXVI9aoHRNG4XiW6us8+tWSuhtC1o91a/h xuV7pweKiyo2V4C06bsYnJch5V55b4Kn67z8KsctMzXZSN/80taBjU09jLNKq87koejC fUI+x4rzjq6LrSBrbp3h3JaqRx+ejntztp1tQcqmOjAbOje5mqh3EH1ZDi352nfw9E0Y SycQ== 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=RDvQnMSkODGNednnd6BcTzxsTcbQ61tCBdZ94umV5Ts=; b=NZrfJw0KMpheRlPgB8mYFSZqP/w0MKJay6UTS9QO7R8jWFX3SgxPe8RlMRR9P8AYHL 4eV4Oq86i5Rputa1BqxwJVwxEMZc7XCOGa9Y6v7iJLWDziixxep0rHJy3Z/5aMyZaaIW 5Gzb4zOptLIwT5BOt9a0zZxBwA+TTxG+ZpJvQwS8eMsLkqoSeB8//LcuufEUxcgzSg/u vBDhsmWV8J0nnSY9FWSLch67KngxzfsnZbUDtrQBS0qtRVEiAYRbxIVz7HruiJ2fpmm+ 1FXqwvTjyyswtaz4iLjgi6hJctblzv+wfi98xKBnH5Kl5lZxzDbIXn/5+i92SkUXnDt8 vwUg== X-Gm-Message-State: ACrzQf3EJ5mvyf4EASlZpOYy8CevU8MTcAHsXnBV/ULtMHoBgUgMjXTR OHdrtRhqn91/W4yygZvdFHykJTBnXmXzJA== X-Google-Smtp-Source: AMsMyM5D2JSkIghLgKE6opBKsJp0Y0hhkAH3v64gfjnI6pQM4KY3JCNhAvOCl9fofM/D6sQLJmKKnw== X-Received: by 2002:a05:6000:178e:b0:236:d839:c255 with SMTP id e14-20020a056000178e00b00236d839c255mr11162623wrg.447.1667467763484; Thu, 03 Nov 2022 02:29:23 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id z11-20020a5d654b000000b0023662d97130sm358167wrv.20.2022.11.03.02.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:29:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Sunyang Wu Cc: Joey Xing , Qingmin Liu , Lei Cai , Akhil Goyal , dpdk stable Subject: patch 'test/crypto: fix debug messages' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:42 +0000 Message-Id: <20221103092758.1099402-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ca71ce42820c9e0d8b6d56459069689508862cba Thanks. Luca Boccassi --- >From ca71ce42820c9e0d8b6d56459069689508862cba Mon Sep 17 00:00:00 2001 From: Sunyang Wu Date: Tue, 26 Jul 2022 11:38:19 +0800 Subject: [PATCH] test/crypto: fix debug messages [ upstream commit 1c6b77de0aa97072372fa80891c93063ec132c1a ] When the queue_ops_rsa_enc_dec function is called, the plaintext will be printed twice instead of both plaintext and ciphertext. When the create_aead_operation function is called, the contents of iv and aad will be printed incorrectly. This patch fixes the issues above. Fixes: 77a217a19bb7 ("test/crypto: add AES-CCM tests") Fixes: 5ae36995f10f ("test/crypto: move RSA enqueue/dequeue into functions") Signed-off-by: Sunyang Wu Reviewed-by: Joey Xing Reviewed-by: Qingmin Liu Reviewed-by: Lei Cai Acked-by: Akhil Goyal --- app/test/test_cryptodev.c | 4 ++-- app/test/test_cryptodev_asym.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index a87e5583ac..9dfea535a0 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -7535,7 +7535,7 @@ create_aead_operation(enum rte_crypto_aead_operation op, rte_pktmbuf_iova(ut_params->ibuf); /* Copy AAD 18 bytes after the AAD pointer, according to the API */ memcpy(sym_op->aead.aad.data + 18, tdata->aad.data, tdata->aad.len); - debug_hexdump(stdout, "aad:", sym_op->aead.aad.data, + debug_hexdump(stdout, "aad:", sym_op->aead.aad.data + 18, tdata->aad.len); /* Append IV at the end of the crypto operation*/ @@ -7544,7 +7544,7 @@ create_aead_operation(enum rte_crypto_aead_operation op, /* Copy IV 1 byte after the IV pointer, according to the API */ rte_memcpy(iv_ptr + 1, tdata->iv.data, tdata->iv.len); - debug_hexdump(stdout, "iv:", iv_ptr, + debug_hexdump(stdout, "iv:", iv_ptr + 1, tdata->iv.len); } else { aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16); diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index af1310d9a2..dce9775d23 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -209,8 +209,8 @@ queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess) status = TEST_FAILED; goto error_exit; } - debug_hexdump(stdout, "encrypted message", asym_op->rsa.message.data, - asym_op->rsa.message.length); + debug_hexdump(stdout, "encrypted message", asym_op->rsa.cipher.data, + asym_op->rsa.cipher.length); /* Use the resulted output as decryption Input vector*/ asym_op = result_op->asym; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:26.889902074 +0000 +++ 0024-test-crypto-fix-debug-messages.patch 2022-11-03 09:27:25.357422131 +0000 @@ -1 +1 @@ -From 1c6b77de0aa97072372fa80891c93063ec132c1a Mon Sep 17 00:00:00 2001 +From ca71ce42820c9e0d8b6d56459069689508862cba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c6b77de0aa97072372fa80891c93063ec132c1a ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 69a0301de0..54ce306b42 100644 +index a87e5583ac..9dfea535a0 100644 @@ -29 +30 @@ -@@ -8287,7 +8287,7 @@ create_aead_operation(enum rte_crypto_aead_operation op, +@@ -7535,7 +7535,7 @@ create_aead_operation(enum rte_crypto_aead_operation op, @@ -38 +39 @@ -@@ -8296,7 +8296,7 @@ create_aead_operation(enum rte_crypto_aead_operation op, +@@ -7544,7 +7544,7 @@ create_aead_operation(enum rte_crypto_aead_operation op, @@ -48 +49 @@ -index fc1a727472..9da54530e5 100644 +index af1310d9a2..dce9775d23 100644 @@ -51 +52 @@ -@@ -208,8 +208,8 @@ queue_ops_rsa_enc_dec(void *sess) +@@ -209,8 +209,8 @@ queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)