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 99BE8455AD for ; Mon, 15 Jul 2024 17:27:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90AC7402DD; Mon, 15 Jul 2024 17:27:45 +0200 (CEST) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by mails.dpdk.org (Postfix) with ESMTP id A3A10402DD for ; Mon, 15 Jul 2024 17:27:43 +0200 (CEST) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2eaafda3b5cso45789751fa.3 for ; Mon, 15 Jul 2024 08:27:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057263; x=1721662063; 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=9ksM39hceD1O+14m6qVKeh6oMrZx3mf+pWHjOsETxTA=; b=Tczwtj2p72hzUBTNtREYJTYc4w+Je1mT5XqAmkf3kcuyjz1EUumWEGZPYJS8FnDepy kVgFzJIHbq1mVheeqUV1TN6ojHkJrnBMj25sgo+4ylpjRwIj8XDXgsYv6nu62YAI3ora SIQ9VeV13sWuJHF6RgKHAQBNsuKpB/k6Aux3OW3t3Wg+G3dSKRt92qWEMmyab8UMSw86 64pppo15elE5b2HQzcm/bbRBtGJ5oV5Kxnd15L4NSbGpYqrPX3pdJSuZB1kwWr7FezYa 9nKYiocW80Ugqs+aNh2bywPSCp6MhY2BE6FnGrzoo9n7d/6Y4990eGpk7xK2ws04t4W1 VRTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057263; x=1721662063; 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=9ksM39hceD1O+14m6qVKeh6oMrZx3mf+pWHjOsETxTA=; b=RkCL3PSW2eNFAi3VGepiSiIjg1IGu/eJuNXiyMVKPrzgGAOxbKkaugIwyTxl+9b3jb BoHymMR+P2HniQ9RVRZ/T3gkI0I2EzZKWkVuPv90GTnGOZCgC8G4/IY1n+pgT2AZprV3 WwEX+BqE50xrUyIzTmDBmEBq6jzJw/oEr+5zKP4AU/eVqfDC3NNIq7D6APCVTdbiCnOi 1YfXqVIFZB8siFukjCr4LKv5d3g7cSlJQs0HcbDpEJRweQG3XlllPzVnA6vdISePtKq7 gcUSNgcrnSBUZuSt28oFBboUMu15+HM0g0LJHaM/VEEiSY6ccCJgfEzLDohlBzD4eMie lXPg== X-Forwarded-Encrypted: i=1; AJvYcCU30ioivcnpFXFmEwWXp5bn7E7+Jb4cHSgeQNJ+CSz2yd3Dh+A/uFAk5FveHUulpKgw9OxBVHAbENwE52kXosg= X-Gm-Message-State: AOJu0YyBD2MbT/e5ibyyfgtmaRYljBkjr+/yJcN2iwS8DZhu4314jeZY LMIIuos9sOADf7z8w16xE9Ck4rE82nEiJm5klSVj/2/T740MD+FwXLorBU24 X-Google-Smtp-Source: AGHT+IGYTYFdrnoPd1SJxmDoicFca3jzzGoZoGKfhKRQAV/HejamyBLaSNPfMzuH7Q/K90xfxwR6fw== X-Received: by 2002:a2e:b70a:0:b0:2ec:5364:c791 with SMTP id 38308e7fff4ca-2eef2d86d1dmr1704191fa.17.1721057262747; Mon, 15 Jul 2024 08:27:42 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f2d7c9csm125975125e9.48.2024.07.15.08.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:27:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Gowrishankar Muthukrishnan Cc: Akhil Goyal , dpdk stable Subject: patch 'app/crypto-perf: remove redundant local variable' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:25:49 +0100 Message-Id: <20240715152704.2229503-11-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/d581598df3592eedba82152da56b365b91713a71 Thanks. Luca Boccassi --- >From d581598df3592eedba82152da56b365b91713a71 Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Wed, 26 Jun 2024 14:17:41 +0530 Subject: [PATCH] app/crypto-perf: remove redundant local variable [ upstream commit 766cac609427cc8ef0f6680a73c4dcd3ac4e2a0d ] Remove redundant local variable used for asym session. Fixes: a29bb2489886 ("cryptodev: hide asymmetric session structure") Fixes: 2973dbf93b44 ("security: hide session structure") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_ops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c index 93b9bfb240..6bbab3289e 100644 --- a/app/test-crypto-perf/cperf_ops.c +++ b/app/test-crypto-perf/cperf_ops.c @@ -21,7 +21,6 @@ cperf_set_ops_asym(struct rte_crypto_op **ops, uint64_t *tsc_start __rte_unused) { uint16_t i; - void *asym_sess = (void *)sess; for (i = 0; i < nb_ops; i++) { struct rte_crypto_asym_op *asym_op = ops[i]->asym; @@ -31,7 +30,7 @@ cperf_set_ops_asym(struct rte_crypto_op **ops, asym_op->modex.base.length = options->modex_data->base.len; asym_op->modex.result.data = options->modex_data->result.data; asym_op->modex.result.length = options->modex_data->result.len; - rte_crypto_op_attach_asym_session(ops[i], asym_sess); + rte_crypto_op_attach_asym_session(ops[i], sess); } } @@ -64,7 +63,6 @@ cperf_set_ops_security(struct rte_crypto_op **ops, for (i = 0; i < nb_ops; i++) { struct rte_crypto_sym_op *sym_op = ops[i]->sym; - void *sec_sess = (void *)sess; uint32_t buf_sz; uint32_t *per_pkt_hfn = rte_crypto_op_ctod_offset(ops[i], @@ -72,7 +70,7 @@ cperf_set_ops_security(struct rte_crypto_op **ops, *per_pkt_hfn = options->pdcp_ses_hfn_en ? 0 : PDCP_DEFAULT_HFN; ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; - rte_security_attach_session(ops[i], sec_sess); + rte_security_attach_session(ops[i], sess); sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] + src_buf_offset); @@ -129,7 +127,6 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops, uint16_t iv_offset __rte_unused, uint32_t *imix_idx, uint64_t *tsc_start) { - void *sec_sess = sess; const uint32_t test_buffer_size = options->test_buffer_size; const uint32_t headroom_sz = options->headroom_sz; const uint32_t segment_sz = options->segment_sz; @@ -143,7 +140,7 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops, struct rte_mbuf *m = sym_op->m_src; ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; - rte_security_attach_session(ops[i], sec_sess); + rte_security_attach_session(ops[i], sess); sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] + src_buf_offset); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:35.362937866 +0100 +++ 0011-app-crypto-perf-remove-redundant-local-variable.patch 2024-07-15 16:19:34.448203901 +0100 @@ -1 +1 @@ -From 766cac609427cc8ef0f6680a73c4dcd3ac4e2a0d Mon Sep 17 00:00:00 2001 +From d581598df3592eedba82152da56b365b91713a71 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 766cac609427cc8ef0f6680a73c4dcd3ac4e2a0d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 4ca001b721..a802281a71 100644 +index 93b9bfb240..6bbab3289e 100644 @@ -39 +40 @@ -@@ -62,7 +61,6 @@ cperf_set_ops_security(struct rte_crypto_op **ops, +@@ -64,7 +63,6 @@ cperf_set_ops_security(struct rte_crypto_op **ops, @@ -47 +48 @@ -@@ -70,7 +68,7 @@ cperf_set_ops_security(struct rte_crypto_op **ops, +@@ -72,7 +70,7 @@ cperf_set_ops_security(struct rte_crypto_op **ops, @@ -56 +57 @@ -@@ -127,7 +125,6 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops, +@@ -129,7 +127,6 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops, @@ -62,4 +63,4 @@ - uint64_t tsc_start_temp, tsc_end_temp; - uint16_t i = 0; -@@ -140,7 +137,7 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops, - uint32_t offset = test_buffer_size; + const uint32_t headroom_sz = options->headroom_sz; + const uint32_t segment_sz = options->segment_sz; +@@ -143,7 +140,7 @@ cperf_set_ops_security_ipsec(struct rte_crypto_op **ops, + struct rte_mbuf *m = sym_op->m_src; @@ -70,2 +71,2 @@ - sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] + src_buf_offset); - sym_op->m_src->pkt_len = test_buffer_size; + sym_op->m_src = (struct rte_mbuf *)((uint8_t *)ops[i] + + src_buf_offset);