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 493D64326F for ; Thu, 2 Nov 2023 14:13:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 422ED40A76; Thu, 2 Nov 2023 14:13:20 +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 29FE1402D5 for ; Thu, 2 Nov 2023 14:13:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930797; 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; bh=t420DXoowA0XHUErPcxjaGxBj36J+Z1tQZYzRziWjYw=; b=TzmCC/RFVcxLhyl9mQIVxwDHaEF/TE4sMIdiOGNCuMPz4LCMjTl7BGXvT1JNKWsgNYNtPy PNC53aQ6dyhxh7VymjJ8PXnN+4Ady5GaG+tDKpB38iCNE3kAuKjjsVjl6pepqTiw1NIUOG VjDQG52s6ge1YHqa7PMAFPNTcRd9gu8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-92-o8W17wn-PlqyDEdBmFfqug-1; Thu, 02 Nov 2023 09:13:14 -0400 X-MC-Unique: o8W17wn-PlqyDEdBmFfqug-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7C7785A5BD; Thu, 2 Nov 2023 13:13:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBA57492BFA; Thu, 2 Nov 2023 13:13:12 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bruce Richardson , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'mempool: fix default ops for an empty mempool' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:07 +0000 Message-ID: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/23. 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/acafc55e2672613b92e966975b1e359486de31d6 Thanks. Kevin --- >From acafc55e2672613b92e966975b1e359486de31d6 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 16 Aug 2023 16:34:29 +0100 Subject: [PATCH] mempool: fix default ops for an empty mempool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit c2c6b2f413051b022488518d040508b9ea6e0130 ] An empty mempool's ops were not initialised to a default value wrt to what the application requested via the flags parameter. As rte_mempool_create() relies on rte_mempool_create_empty(), simply move this ops initialisation to rte_mempool_create_empty(). Fixes: aa10457eb4c2 ("mempool: make mempool populate and free api public") Signed-off-by: David Marchand Reviewed-by: Bruce Richardson Reviewed-by: Morten Brørup --- lib/mempool/rte_mempool.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index 40e6d17409..4dbff7fbc4 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -917,4 +917,20 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size, STAILQ_INIT(&mp->mem_list); + /* + * Since we have 4 combinations of the SP/SC/MP/MC examine the flags to + * set the correct index into the table of ops structs. + */ + if ((flags & RTE_MEMPOOL_F_SP_PUT) && (flags & RTE_MEMPOOL_F_SC_GET)) + ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL); + else if (flags & RTE_MEMPOOL_F_SP_PUT) + ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL); + else if (flags & RTE_MEMPOOL_F_SC_GET) + ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL); + else + ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL); + + if (ret) + goto exit_unlock; + /* * local_cache pointer is set even if cache_size is zero. @@ -957,5 +973,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, int socket_id, unsigned flags) { - int ret; struct rte_mempool *mp; @@ -965,20 +980,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, return NULL; - /* - * Since we have 4 combinations of the SP/SC/MP/MC examine the flags to - * set the correct index into the table of ops structs. - */ - if ((flags & RTE_MEMPOOL_F_SP_PUT) && (flags & RTE_MEMPOOL_F_SC_GET)) - ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL); - else if (flags & RTE_MEMPOOL_F_SP_PUT) - ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL); - else if (flags & RTE_MEMPOOL_F_SC_GET) - ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL); - else - ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL); - - if (ret) - goto fail; - /* call the mempool priv initializer */ if (mp_init) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:40.945642681 +0000 +++ 0001-mempool-fix-default-ops-for-an-empty-mempool.patch 2023-11-02 13:09:40.760163165 +0000 @@ -1 +1 @@ -From c2c6b2f413051b022488518d040508b9ea6e0130 Mon Sep 17 00:00:00 2001 +From acafc55e2672613b92e966975b1e359486de31d6 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit c2c6b2f413051b022488518d040508b9ea6e0130 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 4d337fca8d..7a7a9bf6db 100644 +index 40e6d17409..4dbff7fbc4 100644 @@ -28 +29 @@ -@@ -915,4 +915,20 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size, +@@ -917,4 +917,20 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size, @@ -49 +50 @@ -@@ -955,5 +971,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, +@@ -957,5 +973,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, @@ -55 +56 @@ -@@ -963,20 +978,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size, +@@ -965,20 +980,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,