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 7924DA00C2 for ; Tue, 8 Mar 2022 15:16:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 748054068B; Tue, 8 Mar 2022 15:16:14 +0100 (CET) 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 BE6C24068B for ; Tue, 8 Mar 2022 15:16:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748972; 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=iw6xBRpasvrWMRmF2X5vXRCVCl2Umht/Z9ldsHYagVM=; b=aB7+rIYVJhnIYPE6Zc2hLZ90aQ6/ZxTjbuP8z3MQqb18Xk91OzZFolrTgCEnyvl5qgIk1b YTuggOJU5R73+aBcTQhhcjhEoL9yW6hSokEDXbzfcyT9BNh6/8sRH/FKH1yAPcFFh0EBt/ LuJuekEADHlQZkDgcnBuFbjZiggoN3Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-8-A0RYtJoKOxKCHpW7wspr3Q-1; Tue, 08 Mar 2022 09:16:09 -0500 X-MC-Unique: A0RYtJoKOxKCHpW7wspr3Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F220C800050; Tue, 8 Mar 2022 14:16:07 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id B41E184034; Tue, 8 Mar 2022 14:16:06 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Jerin Jacob , dpdk stable Subject: patch 'common/cnxk: fix bitmap usage for TM' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:44 +0000 Message-Id: <20220308141500.286915-29-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/14/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/552ab1729a35c68e4c9c9c3d37370d3e3e058d57 Thanks. Kevin --- >From 552ab1729a35c68e4c9c9c3d37370d3e3e058d57 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Thu, 3 Mar 2022 12:30:41 +0530 Subject: [PATCH] common/cnxk: fix bitmap usage for TM [ upstream commit 66d485fb50d8de4e78deefebdadc4723c2db2ea2 ] Revert change [1] to return error on case where no slab of free resources is found. That error check break's a case where there is a spare schedule queue to be reused that was just allocated for sake of contiguous static TM nodes. [1] Fixes: 14f7e5d4bf2d ("common/cnxk: add missing checks of return values") Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_nix_tm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/common/cnxk/roc_nix_tm.c b/drivers/common/cnxk/roc_nix_tm.c index e765fe703c..ebb27a3106 100644 --- a/drivers/common/cnxk/roc_nix_tm.c +++ b/drivers/common/cnxk/roc_nix_tm.c @@ -1017,8 +1017,6 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent, } - if (!slab) { - if (!plt_bitmap_scan(bmp, &pos, &slab)) - return -ENOENT; - } + if (!slab) + plt_bitmap_scan(bmp, &pos, &slab); if (child->priority == parent->rr_prio && spare_schq != -1) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.149273083 +0000 +++ 0029-common-cnxk-fix-bitmap-usage-for-TM.patch 2022-03-08 13:55:28.498315169 +0000 @@ -1 +1 @@ -From 66d485fb50d8de4e78deefebdadc4723c2db2ea2 Mon Sep 17 00:00:00 2001 +From 552ab1729a35c68e4c9c9c3d37370d3e3e058d57 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 66d485fb50d8de4e78deefebdadc4723c2db2ea2 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 7a17780058..5b70c7bfed 100644 +index e765fe703c..ebb27a3106 100644 @@ -25 +26 @@ -@@ -1043,8 +1043,6 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent, +@@ -1017,8 +1017,6 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent,