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 CAFB7455AD for ; Mon, 15 Jul 2024 17:27:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C68C940A75; Mon, 15 Jul 2024 17:27:46 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id DCCAE402DD for ; Mon, 15 Jul 2024 17:27:44 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-42793fc0a6dso30418045e9.0 for ; Mon, 15 Jul 2024 08:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057264; x=1721662064; darn=dpdk.org; 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=hFAWUVLA2Ibhark0TfnNX9vjFxPxW2OUeVh4Vhx58+k=; b=MOzZieqepInUa+NdcXs1a94dsBg4clqaF1Tz6CAneqCM8OnzxIepV6iBrmxL+nxIz6 voco5yq7YlbMo3lCHjDvgJTmXE7INF1Hj1crasgGJsDnyZZuBLdl/wPQZ5l1khVuk83D ESH53AaDfb5ZSEOvcEEDBF5y8TOgOAa/QkIppSSEQ3luWspo9fk9/oDiaAUA065YSF4i /uNnTiegxRmDWULcMSsOQiJEh9AMqMDifQydnNT6R4zdVE3UjCXAocu9BaE6a/YAxAcr J0ECtBSql98+2P79vQtRP9RXMAkwlAuWb+8esVMDuEoOYhCEdyCW1dBB2EWF/nBdknU9 LStA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057264; x=1721662064; 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=hFAWUVLA2Ibhark0TfnNX9vjFxPxW2OUeVh4Vhx58+k=; b=HIIGXkW935QGCSIRrduQKj97UHP5z0OeVtQKX50LoGG1zz0CHBXZFKat5+e+EIjVzn LDGbyBvSz4czJv/2KU7drwfIHL/UjT/LFIpaICR1JYVx2na9Gavgy3a6pQDyYC+jhqZO aphKfhc0UupAAQGG9M6jLZpG4KYfhE1DjAw9sEuk1INvkLL3GSpigavKYTOtMtEEz2Es RcAycIdXVfKmMKbJFgv5M/FcOYK7FRS6BsU5JQkIu54aJtOUt8yAIAsY5RpNVYJNj73h spV5KzTU2816Ydi2SPQo/rNCWMNNs2OjiAdsyGI3oLUs37I6NGhDfpCEsV6Mq4OkAaQf fcDA== X-Forwarded-Encrypted: i=1; AJvYcCXNu4OzGdMjR8zYC5yImGXPTLvX73WH1ffYY3EsES1DxM8sGXROtW7ISVy9irSVQexnpLJODqQCXp8nM5AOJmc= X-Gm-Message-State: AOJu0YyfFOPpWWg54W6MjSSc+oCA8z3USvY1rFi2aKvbLYWuBgNj6aTn sP+tcLn8VLdSIyq14JAkkYrRgDGWZLDfDUtkIUY9pRH65FkAbf2g8VqLfp9E X-Google-Smtp-Source: AGHT+IFfwzXVZNWcgo0UyEqFN4Wnehb1e+kX1rPrjwNjvLbtCS/DzxpZSRinVY1XxOKQnHrjTurzKw== X-Received: by 2002:a05:600c:2184:b0:426:61e8:fb35 with SMTP id 5b1f17b1804b1-426707cc03dmr135359375e9.4.1721057264486; Mon, 15 Jul 2024 08:27:44 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5e8e2ecsm92953595e9.21.2024.07.15.08.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:27:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Gowrishankar Muthukrishnan Cc: Akhil Goyal , dpdk stable Subject: patch 'app/crypto-perf: fix result for asymmetric' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:25:50 +0100 Message-Id: <20240715152704.2229503-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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 22.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 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/528f8f36a88277ecdaee24c26447de59def3841d Thanks. Luca Boccassi --- >From 528f8f36a88277ecdaee24c26447de59def3841d Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Wed, 26 Jun 2024 14:17:42 +0530 Subject: [PATCH] app/crypto-perf: fix result for asymmetric [ upstream commit 022f9bf9d4571092be6bb98cea12efb1aa8fe0af ] For asymmetric op, private test data should be stored after rte_crypto_asym_op struct. Fixes: a538d1d2d01e ("test/crypto-perf: extend asymmetric crypto throughput test") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_test_common.c | 6 ++++-- app/test-crypto-perf/cperf_test_latency.c | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_common.c b/app/test-crypto-perf/cperf_test_common.c index 94d39fb177..6b8ab65731 100644 --- a/app/test-crypto-perf/cperf_test_common.c +++ b/app/test-crypto-perf/cperf_test_common.c @@ -149,11 +149,11 @@ cperf_alloc_common_memory(const struct cperf_options *options, int ret; /* Calculate the object size */ - uint16_t crypto_op_size = sizeof(struct rte_crypto_op) + - sizeof(struct rte_crypto_sym_op); + uint16_t crypto_op_size = sizeof(struct rte_crypto_op); uint16_t crypto_op_private_size; if (options->op_type == CPERF_ASYM_MODEX) { + crypto_op_size += sizeof(struct rte_crypto_asym_op); snprintf(pool_name, RTE_MEMPOOL_NAMESIZE, "perf_asym_op_pool%u", rte_socket_id()); *pool = rte_crypto_op_pool_create( @@ -170,6 +170,8 @@ cperf_alloc_common_memory(const struct cperf_options *options, return 0; } + crypto_op_size += sizeof(struct rte_crypto_sym_op); + /* * If doing AES-CCM, IV field needs to be 16 bytes long, * and AAD field needs to be long enough to have 18 bytes, diff --git a/app/test-crypto-perf/cperf_test_latency.c b/app/test-crypto-perf/cperf_test_latency.c index 406e082e4e..1c5fca0a55 100644 --- a/app/test-crypto-perf/cperf_test_latency.c +++ b/app/test-crypto-perf/cperf_test_latency.c @@ -122,7 +122,11 @@ store_timestamp(struct rte_crypto_op *op, uint64_t timestamp) { struct priv_op_data *priv_data; - priv_data = (struct priv_op_data *) (op->sym + 1); + if (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) + priv_data = (struct priv_op_data *) (op->sym + 1); + else + priv_data = (struct priv_op_data *) (op->asym + 1); + priv_data->result->status = op->status; priv_data->result->tsc_end = timestamp; } @@ -250,9 +254,13 @@ cperf_latency_test_runner(void *arg) ctx->res[tsc_idx].tsc_start = tsc_start; /* * Private data structure starts after the end of the - * rte_crypto_sym_op structure. + * rte_crypto_sym_op (or rte_crypto_asym_op) structure. */ - priv_data = (struct priv_op_data *) (ops[i]->sym + 1); + if (ops[i]->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) + priv_data = (struct priv_op_data *) (ops[i]->sym + 1); + else + priv_data = (struct priv_op_data *) (ops[i]->asym + 1); + priv_data->result = (void *)&ctx->res[tsc_idx]; tsc_idx++; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:35.413000464 +0100 +++ 0012-app-crypto-perf-fix-result-for-asymmetric.patch 2024-07-15 16:19:34.452203987 +0100 @@ -1 +1 @@ -From 022f9bf9d4571092be6bb98cea12efb1aa8fe0af Mon Sep 17 00:00:00 2001 +From 528f8f36a88277ecdaee24c26447de59def3841d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 022f9bf9d4571092be6bb98cea12efb1aa8fe0af ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -47 +48 @@ -index b8ad6bf4d4..376847e761 100644 +index 406e082e4e..1c5fca0a55 100644 @@ -63 +64 @@ -@@ -251,9 +255,13 @@ cperf_latency_test_runner(void *arg) +@@ -250,9 +254,13 @@ cperf_latency_test_runner(void *arg)