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 ACF86A034F for ; Tue, 1 Mar 2022 11:46:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5BF8407FF; Tue, 1 Mar 2022 11:46:04 +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 E8025426E1 for ; Tue, 1 Mar 2022 11:46:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131562; 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=KkdzO6BKUOSwgfIdDonZXP9VoZp7PnNvZ1ibJYHHbRo=; b=Cl0BclcGQSAzcekgU+a9s1A845oh+sXVl2V359xGaHNMP9ECGRaEJ7i6BDGiVcOoXLoA+5 ilJl+s5OFlpyEHjKplkzjXu6vrVD8hH8tm1RxEDLQ7iDrB+tXWt6TD6V4GINtalVRWDgGp yZ8g7FijxxZ+BbOe1pEWH1GuA1VfNII= 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-78-Gc2QWwbIN_-vPmlGP2IHvg-1; Tue, 01 Mar 2022 05:45:59 -0500 X-MC-Unique: Gc2QWwbIN_-vPmlGP2IHvg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 355C551DC; Tue, 1 Mar 2022 10:45:58 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30F9C721DF; Tue, 1 Mar 2022 10:45:56 +0000 (UTC) From: Kevin Traynor To: Ashwin Sekhar T K Cc: Jerin Jacob , dpdk stable Subject: patch 'mempool/cnxk: fix batch allocation failure path' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:44 +0000 Message-Id: <20220301104300.334382-88-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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/06/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/dbafc478b0524db951f89162ba53331dc76b65bd Thanks. Kevin --- >From dbafc478b0524db951f89162ba53331dc76b65bd Mon Sep 17 00:00:00 2001 From: Ashwin Sekhar T K Date: Fri, 18 Feb 2022 12:57:12 +0530 Subject: [PATCH] mempool/cnxk: fix batch allocation failure path [ upstream commit 5582a60effbb8599ad7be827abe4d06ca436b04b ] Fix bug in batch alloc issue failure path where it was enqueuing invalid pointers back to the pool. The code should rightly be falling back to default dequeue path in such cases. Fixes: 91531e63f43b ("mempool/cnxk: add cn10k batch dequeue") Signed-off-by: Ashwin Sekhar T K Acked-by: Jerin Jacob --- drivers/mempool/cnxk/cn10k_mempool_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c index 4c669b878f..6ebbf91de5 100644 --- a/drivers/mempool/cnxk/cn10k_mempool_ops.c +++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c @@ -203,5 +203,5 @@ cn10k_mempool_deq(struct rte_mempool *mp, void **obj_table, unsigned int n) /* If issue fails, try falling back to default alloc */ if (unlikely(rc)) - return cn10k_mempool_enq(mp, obj_table, n); + return cnxk_mempool_deq(mp, obj_table, n); mem->status = BATCH_ALLOC_OP_ISSUED; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.848142855 +0000 +++ 0088-mempool-cnxk-fix-batch-allocation-failure-path.patch 2022-03-01 10:41:01.456244129 +0000 @@ -1 +1 @@ -From 5582a60effbb8599ad7be827abe4d06ca436b04b Mon Sep 17 00:00:00 2001 +From dbafc478b0524db951f89162ba53331dc76b65bd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5582a60effbb8599ad7be827abe4d06ca436b04b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org