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 B9EEDA0543 for ; Wed, 6 Jul 2022 22:36:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF5D140FAE; Wed, 6 Jul 2022 22:36:38 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id C164A40A7F for ; Wed, 6 Jul 2022 22:36:36 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id 84-20020a1c0257000000b003a2ca59cce8so133555wmc.1 for ; Wed, 06 Jul 2022 13:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l7NBe0RIJlPqVkRlSznB3UVQZMU1VdIU76W0wcrr+bU=; b=btiAu79pZFDaivhWwgt+OKyOAEfv28u/q58byqklPXfNYWFzpqqkkywgdPf6E0ci28 eb0UWb1tvVpcbOtx9SfsfZfOMp3vxXwM8edV/UVuEmNdM4fGmhpbnlevnEYdGGZVj+Mu B2/t0fbzyKkmMWdrESiPAkRZ6DwW+b0VemVMtP/ZmBwM8b8tyDrXm8MTjpyWpqoBC6K6 RjNdsOx/RJjWSAMIJN3uvAbswr/bPonyIoLSNSpqFfxAp/ADFGLZqvBJIjTWA7SzcVfI Dmj2wxKWJ/S379LzClXHPbBK0E2gTLpdGAPgJuGyxBncZH8lSiGchdTloeHVz2SSwE/5 KoFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l7NBe0RIJlPqVkRlSznB3UVQZMU1VdIU76W0wcrr+bU=; b=K9qeER7PjwKnBZoe5e1dGNZmS1Yq0qB2BDLxS0/uFFmcVtT7DexIH3khArAdPrHSiq q4F2peXrOarDPsFPzxXXrU8Ne7qjWnttwFqJEUtsdfacmTMjnARPUdS72S5S6ead0ZBA Y0qPjqmJD5HDCSDT/h7Yzmwnpiu2kRH222DSGbozY4fxGvZYLxsQOGpAIr/0Hv+ItSaV IDCNeYxE2MiBoVy+Jfq8upvEBmcgGL/sA7fAb9vaUTsxGYlbkC8ZxU3z/IIMqeB4K+HG MUIzawD3ACFskquapoMs/LDjxRIZfAFZ/Zbr+CUOJb63gWiue0DlrUBM0vtS80cSLzOS 2SiA== X-Gm-Message-State: AJIora/aCgcfzfsoM8d6rLcQaAhR8EzBqlJgiXfV6hOXDLL8sjuF0QwP FnoGgbzf5HXGmMZXMAb/Bu0= X-Google-Smtp-Source: AGRyM1uUGhd659R2K/c5Jhm6GqtOowxkLcZeAn6s2+XvuC4JlEHlpEGN5bk8w9tjrUdJQ0Ep1tsX5Q== X-Received: by 2002:a05:600c:4e8e:b0:3a0:4f43:beb6 with SMTP id f14-20020a05600c4e8e00b003a04f43beb6mr449670wmq.176.1657139796544; Wed, 06 Jul 2022 13:36:36 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id l14-20020a05600c4f0e00b003a199ed4f44sm17146426wmq.27.2022.07.06.13.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:36:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Ori Kam , dpdk stable Subject: patch 'app/regex: fix mbuf size for multi-segment buffer' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:35:05 +0100 Message-Id: <20220706203506.3422496-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-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 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 07/08/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/20ee5fbe91aa81bbd72fbb6014cd5d1bcfbf5941 Thanks. Luca Boccassi --- >From 20ee5fbe91aa81bbd72fbb6014cd5d1bcfbf5941 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Tue, 5 Jul 2022 11:09:16 +0300 Subject: [PATCH] app/regex: fix mbuf size for multi-segment buffer [ upstream commit a442ca2d230209e1bbc9262abc7c871ff33ef627 ] When allocating multi segmented buffers, and in case there is a remainder in total buf len, the actual job len might be more than expected job_len. This adds additional space in the mbuf in the multi seg case, to allow the remaining memory to be stored in one segment. Fixes: c1d1b94eec58 ("app/regex: fix number of matches") Signed-off-by: Raslan Darawsheh Acked-by: Ori Kam --- app/test-regex/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-regex/main.c b/app/test-regex/main.c index 564025bceb..ca0b0a5d6a 100644 --- a/app/test-regex/main.c +++ b/app/test-regex/main.c @@ -415,8 +415,8 @@ run_regex(void *args) mbuf_mp = rte_pktmbuf_pool_create(mbuf_pool, rte_align32pow2(nb_jobs * nb_qps * nb_segs), 0, 0, (nb_segs == 1) ? MBUF_SIZE : - (rte_align32pow2(job_len) / nb_segs + - RTE_PKTMBUF_HEADROOM), + (rte_align32pow2(job_len + (data_len % nb_jobs)) / + nb_segs + RTE_PKTMBUF_HEADROOM), rte_socket_id()); if (mbuf_mp == NULL) { printf("Error, can't create memory pool\n"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.589976634 +0100 +++ 0030-app-regex-fix-mbuf-size-for-multi-segment-buffer.patch 2022-07-06 21:07:53.583519475 +0100 @@ -1 +1 @@ -From a442ca2d230209e1bbc9262abc7c871ff33ef627 Mon Sep 17 00:00:00 2001 +From 20ee5fbe91aa81bbd72fbb6014cd5d1bcfbf5941 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a442ca2d230209e1bbc9262abc7c871ff33ef627 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index fe90e11313..351c36a879 100644 +index 564025bceb..ca0b0a5d6a 100644 @@ -26 +27 @@ -@@ -412,8 +412,8 @@ run_regex(void *args) +@@ -415,8 +415,8 @@ run_regex(void *args)