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 B8C8A43829 for ; Tue, 5 Mar 2024 16:35:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3449415D7; Tue, 5 Mar 2024 16:35:47 +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 7F029402AF for ; Tue, 5 Mar 2024 16:35:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652945; 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=3i2T2IIjuUuhTb0TwI52/bmsiOFKeqHqQlfKLAFUhhE=; b=RDN+X6IbHDH+tCY7y9+z+5xm6x3j/pUKws4mQhcbNG/L2JA3yYFVoVK8OA9NVEPsLXefpv 8vTtNdQt2Hh0j35R3wFX91Qzbb1Grnd2KnJQCgbskegy3SevarRVPXMIlqbbyGt8vBjfUs eqOzQyUiQd83OhLsBqI2Ympp6O8kaws= 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-647-V7r_Eb9mPWq9msm6rA9uGQ-1; Tue, 05 Mar 2024 10:35:41 -0500 X-MC-Unique: V7r_Eb9mPWq9msm6rA9uGQ-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 EEF783801FE5; Tue, 5 Mar 2024 15:35:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC98D2022C24; Tue, 5 Mar 2024 15:35:39 +0000 (UTC) From: Kevin Traynor To: Suanming Mou Cc: Anoob Joseph , Ciara Power , dpdk stable Subject: patch 'app/crypto-perf: fix next segment mbuf' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:06 +0000 Message-ID: <20240305153449.263666-33-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/fa23c86e3404748fd06624fa4336a8733eed56dd Thanks. Kevin --- >From fa23c86e3404748fd06624fa4336a8733eed56dd Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Thu, 4 Jan 2024 10:24:05 +0800 Subject: [PATCH] app/crypto-perf: fix next segment mbuf [ upstream commit 06a109ca5dc551631d9251e81966a4bc52f98c5a ] In fill_multi_seg_mbuf(), when remaining_segments is 0, rte_mbuf m's next should pointer to NULL instead of a new rte_mbuf, that causes setting m->next as NULL out of the while loop to the invalid mbuf. This commit fixes the invalid mbuf next operation. Fixes: bf9d6702eca9 ("app/crypto-perf: use single mempool") Signed-off-by: Suanming Mou Acked-by: Anoob Joseph Acked-by: Ciara Power --- app/test-crypto-perf/cperf_test_common.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_common.c b/app/test-crypto-perf/cperf_test_common.c index 5a65e11ba7..228798dca8 100644 --- a/app/test-crypto-perf/cperf_test_common.c +++ b/app/test-crypto-perf/cperf_test_common.c @@ -51,5 +51,4 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, uint16_t mbuf_hdr_size = sizeof(struct rte_mbuf); uint16_t remaining_segments = segments_nb; - struct rte_mbuf *next_mbuf; rte_iova_t next_seg_phys_addr = rte_mempool_virt2iova(obj) + mbuf_offset + mbuf_hdr_size; @@ -72,13 +71,13 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, m->port = 0xff; rte_mbuf_refcnt_set(m, 1); - next_mbuf = (struct rte_mbuf *) ((uint8_t *) m + - mbuf_hdr_size + segment_sz); - m->next = next_mbuf; - m = next_mbuf; + remaining_segments--; - + if (remaining_segments > 0) { + m->next = (struct rte_mbuf *)((uint8_t *) m + mbuf_hdr_size + segment_sz); + m = m->next; + } else { + m->next = NULL; + } } while (remaining_segments > 0); - - m->next = NULL; } -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.467765342 +0000 +++ 0033-app-crypto-perf-fix-next-segment-mbuf.patch 2024-03-05 14:08:54.649520762 +0000 @@ -1 +1 @@ -From 06a109ca5dc551631d9251e81966a4bc52f98c5a Mon Sep 17 00:00:00 2001 +From fa23c86e3404748fd06624fa4336a8733eed56dd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 06a109ca5dc551631d9251e81966a4bc52f98c5a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 932aab16df..b3bf9f67e8 100644 +index 5a65e11ba7..228798dca8 100644 @@ -27 +28 @@ -@@ -50,5 +50,4 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, +@@ -51,5 +51,4 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, @@ -33 +34 @@ -@@ -71,13 +70,13 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, +@@ -72,13 +71,13 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp,