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 AF40B42ECF for ; Thu, 20 Jul 2023 17:23:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC25C40685; Thu, 20 Jul 2023 17:23:22 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8559A400D6 for ; Thu, 20 Jul 2023 17:23:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866601; 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=ULhB/A652Tx6Ll6/ZMrd4n+vfIvD3s3+4/UNfaPoejI=; b=EukqR7n4gADa98ic6HmldWjTK3MIdyPoyj1PJY0YCvIbA73xCB6E9is5LeCSGPyd8MEYT/ qUj4xkf/KNEjrvtS6NBfC4gokLKeyM7JndEqK+B5xSUwriVtPQ6FBVQrhgPu0sbvI+sths Rb7bTe96tc0QVNFpYo4tA4ndZ1G5FCQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-644-ShR43WZHNeudXlYVKZ974w-1; Thu, 20 Jul 2023 11:21:50 -0400 X-MC-Unique: ShR43WZHNeudXlYVKZ974w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B9A9A1C3A084; Thu, 20 Jul 2023 15:21:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84E37492C13; Thu, 20 Jul 2023 15:21:16 +0000 (UTC) From: Kevin Traynor To: Saoirse O'Donovan Cc: Ciara Power , dpdk stable Subject: patch 'crypto/ipsec_mb: fix enqueue counter for SNOW3G' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:05 +0100 Message-ID: <20230720151942.262154-54-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.5 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/25/23. 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/2487cb35ca99c63a2803ce2eec5e1bc01cca6fdc Thanks. Kevin --- >From 2487cb35ca99c63a2803ce2eec5e1bc01cca6fdc Mon Sep 17 00:00:00 2001 From: Saoirse O'Donovan Date: Thu, 20 Apr 2023 10:31:41 +0000 Subject: [PATCH] crypto/ipsec_mb: fix enqueue counter for SNOW3G [ upstream commit dd6b0a910ff32b2b367c18ad97b045c8dc5aa882 ] This patch removes enqueue op counter update from the process_op_bit function where the process is now done in dequeue stage. The original stats increment was incorrect as they shouldn't have been updated at all in this function. Fixes: 4f1cfda59ad3 ("crypto/ipsec_mb: move snow3g PMD") Signed-off-by: Saoirse O'Donovan Acked-by: Ciara Power --- drivers/crypto/ipsec_mb/pmd_snow3g.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_snow3g.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c index 9a85f46721..f365f7bc38 100644 --- a/drivers/crypto/ipsec_mb/pmd_snow3g.c +++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c @@ -377,7 +377,8 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session, static int process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, - struct ipsec_mb_qp *qp, uint16_t *accumulated_enqueued_ops) + struct ipsec_mb_qp *qp) { - uint32_t enqueued_op, processed_op; + unsigned int processed_op; + int ret; switch (session->op) { @@ -425,7 +426,8 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, if (unlikely(processed_op != 1)) return 0; - enqueued_op = rte_ring_enqueue(qp->ingress_queue, op); - qp->stats.enqueued_count += enqueued_op; - *accumulated_enqueued_ops += enqueued_op; + + ret = rte_ring_enqueue(qp->ingress_queue, op); + if (ret != 0) + return ret; return 1; @@ -443,5 +445,4 @@ snow3g_pmd_dequeue_burst(void *queue_pair, uint32_t i; uint8_t burst_size = 0; - uint16_t enqueued_ops = 0; uint8_t processed_ops; uint32_t nb_dequeued; @@ -483,6 +484,5 @@ snow3g_pmd_dequeue_burst(void *queue_pair, } - processed_ops = process_op_bit(curr_c_op, curr_sess, - qp, &enqueued_ops); + processed_ops = process_op_bit(curr_c_op, curr_sess, qp); if (processed_ops != 1) break; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:01.605022191 +0100 +++ 0054-crypto-ipsec_mb-fix-enqueue-counter-for-SNOW3G.patch 2023-07-20 16:17:54.769750949 +0100 @@ -1 +1 @@ -From dd6b0a910ff32b2b367c18ad97b045c8dc5aa882 Mon Sep 17 00:00:00 2001 +From 2487cb35ca99c63a2803ce2eec5e1bc01cca6fdc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dd6b0a910ff32b2b367c18ad97b045c8dc5aa882 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 8ed069f428..e64df1a462 100644 +index 9a85f46721..f365f7bc38 100644 @@ -24 +25 @@ -@@ -373,7 +373,8 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session, +@@ -377,7 +377,8 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session, @@ -35 +36 @@ -@@ -422,7 +423,8 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, +@@ -425,7 +426,8 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, @@ -47 +48 @@ -@@ -440,5 +442,4 @@ snow3g_pmd_dequeue_burst(void *queue_pair, +@@ -443,5 +445,4 @@ snow3g_pmd_dequeue_burst(void *queue_pair, @@ -53 +54 @@ -@@ -480,6 +481,5 @@ snow3g_pmd_dequeue_burst(void *queue_pair, +@@ -483,6 +484,5 @@ snow3g_pmd_dequeue_burst(void *queue_pair,