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 D4E3143C60 for ; Thu, 7 Mar 2024 02:35:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEC5342EE9; Thu, 7 Mar 2024 02:35:16 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 7C26D42EE3 for ; Thu, 7 Mar 2024 02:35:15 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-33e1d327595so122562f8f.2 for ; Wed, 06 Mar 2024 17:35:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775315; x=1710380115; 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=9mNJhfO5PJGyqF9Tj8y2jk8lHodG5yKxmLjL1UNSj8o=; b=V3hq4U3HBwEiV3wrKr8FoS04Fa3fyGyiXOIfaqK9P//OPRChc0L9xVyq075a4rjMeT wmpBWHPFBFTurGDjjrtCGYs1+q311a8+UC/HTCR0mrbdt7+aT21VR/+kX14+9IJ7rWDW eAq2HOckyScekToHVJ4+6k9hJZYB/FfZHqqn1LJDCW0AWDMqO2LqTgkU/RFmNyTJlBTL q/20RkujO+m/QWMaP/qr5QX5Fe/ZAK7GV5dlQonWh+WZstfz5lUXZIVyJ/rTGMcrZHfw SZGNRbC1q5vfl0brwK6gZ3irfGtpcmSmYzgEof5CmiCrghvg4Tey+cc0i8d8l61DZSOY ScZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775315; x=1710380115; 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=9mNJhfO5PJGyqF9Tj8y2jk8lHodG5yKxmLjL1UNSj8o=; b=p5YiZ8EutYWvFrvfuyPuf1+WpVvLUbSa1h2J/0brzbGM+SyKoVDfvbqeuppOPOJQEI 02Wt3aOVxKrWpuhD6x+256ivNt0FLGrHKZLQ0qvg03LisRmSdGstYBysgBunJyqNXZlm LP7Ojk1HqRhrU0Sr0sXKU1ztF5paVCC6G2Qt/uDvl0zMyCEaTTia1/DzHiqZVpXc3akg C0wncwNlPm5Q9qbpLggccfbKlCj61C5nuSSm1fXQpHB+VUWXLQ4GVJkgbf11FgyhCldU xg0QSwNFPX+o1trhg6zPlgL95DoHWy8Zidj9wrcq+jWr/8UFzHjhttULh3hLl95IIdi4 By3Q== X-Forwarded-Encrypted: i=1; AJvYcCVhcT0C+ZBydcMXXygkYna0e6YGbp8SdAUJAu4PRdF0EOGEl3JCNMUoRLKZF7/1ogjKpWiHDqeb/SuTWL7RlXE= X-Gm-Message-State: AOJu0YxoF0PGHqdwPrMpx1/QnhEwEzw765/CG+WjeHix2HqHQpQrnIMW 2K96xM/J1iYjXmkyJNkC59cryKI4EUR2empSBChYTBq4uQ5wjVX0 X-Google-Smtp-Source: AGHT+IHRW7oRhFFMgiY5l1AGri+2f3YozaN6+gDQqGTUf4pL0RK9i1WeZT5giGHjRO2Cpx621ZK6Rg== X-Received: by 2002:adf:fa86:0:b0:33e:3e92:257e with SMTP id h6-20020adffa86000000b0033e3e92257emr7475662wrr.68.1709775315185; Wed, 06 Mar 2024 17:35:15 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ay30-20020a5d6f1e000000b0033e239040d8sm15503577wrb.84.2024.03.06.17.35.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:35:14 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:31:09 +0000 Message-Id: <20240307013159.1735343-52-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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.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 03/09/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/ebfa1610698d839a63792a47becd4b58ac397df5 Thanks. Luca Boccassi --- >From ebfa1610698d839a63792a47becd4b58ac397df5 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 932aab16df..b3bf9f67e8 100644 --- a/app/test-crypto-perf/cperf_test_common.c +++ b/app/test-crypto-perf/cperf_test_common.c @@ -49,7 +49,6 @@ 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; @@ -70,15 +69,15 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, m->nb_segs = segments_nb; 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; } static void -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:39.340752252 +0000 +++ 0052-app-crypto-perf-fix-next-segment-mbuf.patch 2024-03-07 01:05:34.802940101 +0000 @@ -1 +1 @@ -From 06a109ca5dc551631d9251e81966a4bc52f98c5a Mon Sep 17 00:00:00 2001 +From ebfa1610698d839a63792a47becd4b58ac397df5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 06a109ca5dc551631d9251e81966a4bc52f98c5a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org