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 DF63445804 for ; Fri, 23 Aug 2024 18:22:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA8EF4337A; Fri, 23 Aug 2024 18:22:13 +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 948FA4336F for ; Fri, 23 Aug 2024 18:22:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430132; 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=VP2m8FGCWLX3VJnc35K5VrZwl93TrjmqrRkn8jy4K3o=; b=AUa/w3ZnEhVUyvMeuMzMgvQlJgRxRVgq5UwSOGjRCpXIFEzeV/8RhpeJOxImCTma7vkJj1 ITDcP4Tau5cdMVub8bJeEbwQQfVTy5SHQqqgxQRQB1DbTq5jrOHWp+p8QNVqzlCRD+8kYX Q5+mQWLBXPRiTq/ePcz9cQ7E1Db6CBk= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-186-4agFaCR6NBm-eO3O5i2A7A-1; Fri, 23 Aug 2024 12:22:10 -0400 X-MC-Unique: 4agFaCR6NBm-eO3O5i2A7A-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AAAED1955D4F; Fri, 23 Aug 2024 16:22:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 469421956053; Fri, 23 Aug 2024 16:22:08 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: Vipin Padmam Ramesh , dpdk stable Subject: patch 'fbarray: fix incorrect lookbehind behavior' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:19 +0100 Message-ID: <20240823161929.1004778-71-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/5bc9924c52d50593a476ebaf94c5342daa85a84f Thanks. Kevin --- >From 5bc9924c52d50593a476ebaf94c5342daa85a84f Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 8 Jul 2024 17:07:33 +0100 Subject: [PATCH] fbarray: fix incorrect lookbehind behavior [ upstream commit 8e3712928716a1deb8857c971865aa15dc436b04 ] Currently, whenever first bit of current index mask is set (meaning, there is potentially a run starting at the start of the mask), lookbehind loop is entered. In that loop, if the last bit of lookbehind mask is not set, the lookbehind is stopped, and the current lookbehind mask index is assigned to current index mask. However, because at that point we are inside a while-loop that decrements current index mask after each iteration, this results in erroneous mask index decrement. Fix lookbehind to avoid erroneous decrement, and add corresponding unit test. Fixes: e1ca5dc86226 ("fbarray: add reverse finding of chunk") Signed-off-by: Vipin Padmam Ramesh Signed-off-by: Anatoly Burakov --- app/test/test_fbarray.c | 24 ++++++++++++++++++++++++ lib/eal/common/eal_common_fbarray.c | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/test/test_fbarray.c b/app/test/test_fbarray.c index fff44816a1..f448d4f196 100644 --- a/app/test/test_fbarray.c +++ b/app/test/test_fbarray.c @@ -112,4 +112,12 @@ static int lookahead_test_setup(void) } +static int lookbehind_test_setup(void) +{ + /* set index 63 as used */ + param.start = 63; + param.end = 63; + return init_array(); +} + static int test_invalid(void) { @@ -733,4 +741,19 @@ static int test_lookahead(void) } +static int test_lookbehind(void) +{ + int ret, free_len = 2; + + /* run regular test first */ + ret = test_find(); + if (ret != TEST_SUCCESS) + return ret; + + /* test if we can find free chunk while crossing mask boundary */ + TEST_ASSERT_EQUAL(rte_fbarray_find_prev_n_free(¶m.arr, param.start + 1, free_len), + param.start - free_len, "Free chunk index is wrong\n"); + return TEST_SUCCESS; +} + static struct unit_test_suite fbarray_test_suite = { .suite_name = "fbarray autotest", @@ -747,4 +770,5 @@ static struct unit_test_suite fbarray_test_suite = { TEST_CASE_ST(empty_msk_test_setup, reset_array, test_empty), TEST_CASE_ST(lookahead_test_setup, reset_array, test_lookahead), + TEST_CASE_ST(lookbehind_test_setup, reset_array, test_lookbehind), TEST_CASES_END() } diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index b59dd68d3e..0013ef2c55 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -516,5 +516,6 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, */ ignore_msk = UINT64_MAX << need; - msk_idx = lookbehind_idx; + /* outer loop will decrement msk_idx so add 1 */ + msk_idx = lookbehind_idx + 1; break; } -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.920925613 +0100 +++ 0071-fbarray-fix-incorrect-lookbehind-behavior.patch 2024-08-23 17:18:09.749430207 +0100 @@ -1 +1 @@ -From 8e3712928716a1deb8857c971865aa15dc436b04 Mon Sep 17 00:00:00 2001 +From 5bc9924c52d50593a476ebaf94c5342daa85a84f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8e3712928716a1deb8857c971865aa15dc436b04 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index bf89b99e5b..147d6e2a07 100644 +index fff44816a1..f448d4f196 100644 @@ -73 +74 @@ -index 2680b34823..b4f0b0b0c3 100644 +index b59dd68d3e..0013ef2c55 100644 @@ -76 +77 @@ -@@ -513,5 +513,6 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, +@@ -516,5 +516,6 @@ find_prev_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n,