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 96E7643829 for ; Tue, 5 Mar 2024 16:35:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9195B415D7; Tue, 5 Mar 2024 16:35:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 670D0402AF for ; Tue, 5 Mar 2024 16:35:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jwq8/rpq6AjlcHMY+StLhzzYJ6A/TXzjCRGDdIHS4Yg=; b=RBN6Za08UvU9ZGYejMtw+sXSpW9FQYT7eEKsj9vQMGz6vgkCTv3Yz8s0eECYyvAebp/nP4 npiQ2bipUfQosKBmqMf3jUMZiYMSqjgB5NEUsd/IUThEPS9a602/VLog1sr/5kJfmSIsn3 IBoqlS9wJw3SShS4H8fzn/SjMCH1+Pg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-VQGYcIKqOk2o8AfSKaePew-1; Tue, 05 Mar 2024 10:35:42 -0500 X-MC-Unique: VQGYcIKqOk2o8AfSKaePew-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 325B928C97C9; Tue, 5 Mar 2024 15:35:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47967200AFA5; Tue, 5 Mar 2024 15:35:41 +0000 (UTC) From: Kevin Traynor To: Suanming Mou Cc: Anoob Joseph , Ciara Power , dpdk stable Subject: patch 'app/crypto-perf: fix data comparison' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:07 +0000 Message-ID: <20240305153449.263666-34-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 03/11/24. 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/4fe2036cef8a481892791e7c06f85172285841ad Thanks. Kevin --- >From 4fe2036cef8a481892791e7c06f85172285841ad Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Fri, 5 Jan 2024 08:03:22 +0800 Subject: [PATCH] app/crypto-perf: fix data comparison [ upstream commit ddec2a39bae12da2817392239ddce19f3953fd53 ] The function memcmp() returns an integer less than, equal to, or greater than zero. In current code, if the first memcmp() returns less than zero and the second memcmp() returns greater than zero, the sum of results may still be 0 and indicates verify successed. This commit converts the return value to be zero or greater than zero. That will make sure the sum of results be correct. Fixes: df52cb3b6e13 ("app/crypto-perf: move verify as single test type") Signed-off-by: Suanming Mou Acked-by: Anoob Joseph Acked-by: Ciara Power --- app/test-crypto-perf/cperf_test_verify.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c index 496eb0de00..372d1560e3 100644 --- a/app/test-crypto-perf/cperf_test_verify.c +++ b/app/test-crypto-perf/cperf_test_verify.c @@ -176,9 +176,9 @@ cperf_verify_op(struct rte_crypto_op *op, if (cipher == 1) { if (options->cipher_op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) - res += memcmp(data + cipher_offset, + res += !!memcmp(data + cipher_offset, vector->ciphertext.data, options->test_buffer_size); else - res += memcmp(data + cipher_offset, + res += !!memcmp(data + cipher_offset, vector->plaintext.data, options->test_buffer_size); @@ -187,5 +187,5 @@ cperf_verify_op(struct rte_crypto_op *op, if (auth == 1) { if (options->auth_op == RTE_CRYPTO_AUTH_OP_GENERATE) - res += memcmp(data + auth_offset, + res += !!memcmp(data + auth_offset, vector->digest.data, options->digest_sz); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.488292722 +0000 +++ 0034-app-crypto-perf-fix-data-comparison.patch 2024-03-05 14:08:54.649520762 +0000 @@ -1 +1 @@ -From ddec2a39bae12da2817392239ddce19f3953fd53 Mon Sep 17 00:00:00 2001 +From 4fe2036cef8a481892791e7c06f85172285841ad Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ddec2a39bae12da2817392239ddce19f3953fd53 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index a6c0ffe813..8aa714b969 100644 +index 496eb0de00..372d1560e3 100644 @@ -29 +30 @@ -@@ -187,9 +187,9 @@ cperf_verify_op(struct rte_crypto_op *op, +@@ -176,9 +176,9 @@ cperf_verify_op(struct rte_crypto_op *op, @@ -41 +42 @@ -@@ -198,5 +198,5 @@ cperf_verify_op(struct rte_crypto_op *op, +@@ -187,5 +187,5 @@ cperf_verify_op(struct rte_crypto_op *op,