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 B84A5A0545 for ; Mon, 20 Jun 2022 11:48:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B409E427EB; Mon, 20 Jun 2022 11:48:20 +0200 (CEST) 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 834A2427F9 for ; Mon, 20 Jun 2022 11:48:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718498; 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=P8KatyupaMj3RV8QvoG8lh6AOMce422kzJcvey/395U=; b=TxMHkaxdC9zwesX7R0htv78Ndi/DfxQmPgi7bsv7qhB4lffLhpcCeKJouvDsIO4/uolD22 uGSDrS2sCCWhVG8jA7tH77Mh8cE276H22d9S1QCEYyKVkAXNMIlhFoB3VyW9MBuxPJ93wC b4P3uuCih1KmLnG+CgZe1w9gh7iJB+o= 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-7-TpRxe5fkM4mlS9-USIEZyg-1; Mon, 20 Jun 2022 05:48:14 -0400 X-MC-Unique: TpRxe5fkM4mlS9-USIEZyg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C31B80B71A; Mon, 20 Jun 2022 09:48:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADCCE400F3FF; Mon, 20 Jun 2022 09:48:13 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Stephen Hemminger , dpdk stable Subject: patch 'crypto/ipsec_mb: fix build with GCC 12' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:45 +0100 Message-Id: <20220620094752.1027299-12-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/c86456efc916bff6ecb9b6ab9664c9409d1a3fe2 Thanks. Kevin --- >From c86456efc916bff6ecb9b6ab9664c9409d1a3fe2 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 18 May 2022 12:16:48 +0200 Subject: [PATCH] crypto/ipsec_mb: fix build with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 468f31eb71c4c2aa454841b316766514cabd0f02 ] GCC 12 raises the following warning: In function ‘__rte_ring_enqueue_elems_64’, inlined from ‘__rte_ring_enqueue_elems’ at ../lib/ring/rte_ring_elem_pvt.h:130:3, inlined from ‘__rte_ring_do_hts_enqueue_elem’ at ../lib/ring/rte_ring_hts_elem_pvt.h:196:3, inlined from ‘rte_ring_mp_hts_enqueue_burst_elem’ at ../lib/ring/rte_ring_hts.h:110:9, inlined from ‘rte_ring_enqueue_burst_elem’ at ../lib/ring/rte_ring_elem.h:577:10, inlined from ‘rte_ring_enqueue_burst’ at ../lib/ring/rte_ring.h:738:9, inlined from ‘process_op_bit’ at ../drivers/crypto/ipsec_mb/pmd_snow3g.c:425:16, inlined from ‘snow3g_pmd_dequeue_burst’ at ../drivers/crypto/ipsec_mb/pmd_snow3g.c:484:20: ../lib/ring/rte_ring_elem_pvt.h:68:44: error: array subscript 1 is outside array bounds of ‘struct rte_crypto_op[0]’ [-Werror=array-bounds] 68 | ring[idx + 1] = obj[i + 1]; | ~~~^~~~~~~ ../drivers/crypto/ipsec_mb/pmd_snow3g.c: In function ‘snow3g_pmd_dequeue_burst’: ../drivers/crypto/ipsec_mb/pmd_snow3g.c:434:1: note: at offset 8 into object ‘op’ of size 8 434 | snow3g_pmd_dequeue_burst(void *queue_pair, | ^~~~~~~~~~~~~~~~~~~~~~~~ Validate that one (exactly) op has been processed or return early. Fixes: b537abdbee74 ("crypto/snow3g: support bit-level operations") Signed-off-by: David Marchand Acked-by: Stephen Hemminger --- drivers/crypto/ipsec_mb/pmd_snow3g.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_snow3g.c b/drivers/crypto/ipsec_mb/pmd_snow3g.c index ebc9a0b562..9a85f46721 100644 --- a/drivers/crypto/ipsec_mb/pmd_snow3g.c +++ b/drivers/crypto/ipsec_mb/pmd_snow3g.c @@ -423,10 +423,11 @@ process_op_bit(struct rte_crypto_op *op, struct snow3g_session *session, } - enqueued_op = rte_ring_enqueue_burst(qp->ingress_queue, - (void **)&op, processed_op, NULL); + 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; - return enqueued_op; + return 1; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:28.047992484 +0100 +++ 0012-crypto-ipsec_mb-fix-build-with-GCC-12.patch 2022-06-20 10:46:27.788146840 +0100 @@ -1 +1 @@ -From 468f31eb71c4c2aa454841b316766514cabd0f02 Mon Sep 17 00:00:00 2001 +From c86456efc916bff6ecb9b6ab9664c9409d1a3fe2 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 468f31eb71c4c2aa454841b316766514cabd0f02 ] + @@ -41 +42,0 @@ -Cc: stable@dpdk.org