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 BDFA7A054A for ; Tue, 25 Oct 2022 17:10:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B974742C42; Tue, 25 Oct 2022 17:10:01 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4887C42C34 for ; Tue, 25 Oct 2022 17:10:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710599; 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=YAVdlIguxrPceB5RFbbKhjOFhmMlyGSjnTYocYgU0jw=; b=hS0x4c9ThCLs93Jg/LkE9xEQ9pX0VQOZthIZ5sSn+yMI7o547ZfeuHEaOxwaMH1JblSAL9 OkltK89HHMRgH3hGF4WhoiIBuel9Rp/apMe0bof1U5a5/HQYjuRNlXJep2pWbnwnIow1oi OtzcERz96aY3Lx0TjLv5n+JYYNn+BC0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-539-TyNcL9vMNMiOl3s4b85Hww-1; Tue, 25 Oct 2022 11:09:58 -0400 X-MC-Unique: TyNcL9vMNMiOl3s4b85Hww-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 30E8F101A54E; Tue, 25 Oct 2022 15:09:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2798749BB60; Tue, 25 Oct 2022 15:09:55 +0000 (UTC) From: Kevin Traynor To: Olivier Matz Cc: Honnappa Nagarahalli , dpdk stable Subject: patch 'mem: fix API doc about allocation on secondary processes' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:21 +0100 Message-Id: <20221025150734.142189-86-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 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/01/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/e3b8a0894a03510565f2bb32e3f435248d48764d Thanks. Kevin --- >From e3b8a0894a03510565f2bb32e3f435248d48764d Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 29 Sep 2022 14:23:11 +0200 Subject: [PATCH] mem: fix API doc about allocation on secondary processes [ upstream commit d5262b521d096349e9e96b436f90eee6554ba595 ] Since 10 years, memzone allocation is allowed on secondary processes. Now it's time to update the documentation accordingly. At the same time, fix mempool, mbuf and ring documentation which rely on memzones internally. Bugzilla ID: 1074 Fixes: 916e4f4f4e45 ("memory: fix for multi process support") Signed-off-by: Olivier Matz Reviewed-by: Honnappa Nagarahalli --- lib/eal/include/rte_memzone.h | 3 --- lib/mbuf/rte_mbuf.h | 3 --- lib/mempool/rte_mempool.h | 1 - lib/ring/rte_ring.h | 1 - lib/ring/rte_ring_elem.h | 1 - 5 files changed, 9 deletions(-) diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h index 5db1210831..bb4223a056 100644 --- a/lib/eal/include/rte_memzone.h +++ b/lib/eal/include/rte_memzone.h @@ -119,5 +119,4 @@ struct rte_memzone { * On error case, rte_errno will be set appropriately: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - ENOSPC - the maximum number of memzones has already been allocated * - EEXIST - a memzone with the same name already exists @@ -185,5 +184,4 @@ const struct rte_memzone *rte_memzone_reserve(const char *name, * On error case, rte_errno will be set appropriately: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - ENOSPC - the maximum number of memzones has already been allocated * - EEXIST - a memzone with the same name already exists @@ -257,5 +255,4 @@ const struct rte_memzone *rte_memzone_reserve_aligned(const char *name, * On error case, rte_errno will be set appropriately: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - ENOSPC - the maximum number of memzones has already been allocated * - EEXIST - a memzone with the same name already exists diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h index dedf83c38d..30d7937349 100644 --- a/lib/mbuf/rte_mbuf.h +++ b/lib/mbuf/rte_mbuf.h @@ -667,5 +667,4 @@ void rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg); * with rte_errno set appropriately. Possible rte_errno values include: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - EINVAL - cache size provided is too large, or priv_size is not aligned. * - ENOSPC - the maximum number of memzones has already been allocated @@ -709,5 +708,4 @@ rte_pktmbuf_pool_create(const char *name, unsigned n, * with rte_errno set appropriately. Possible rte_errno values include: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - EINVAL - cache size provided is too large, or priv_size is not aligned. * - ENOSPC - the maximum number of memzones has already been allocated @@ -763,5 +761,4 @@ struct rte_pktmbuf_extmem { * with rte_errno set appropriately. Possible rte_errno values include: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - EINVAL - cache size provided is too large, or priv_size is not aligned. * - ENOSPC - the maximum number of memzones has already been allocated diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 1e7a3c1527..f023418a6b 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -1042,5 +1042,4 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); * with rte_errno set appropriately. Possible rte_errno values include: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - EINVAL - cache size provided is too large or an unknown flag was passed * - ENOSPC - the maximum number of memzones has already been allocated diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h index da17ed6d7c..937cfbb7a0 100644 --- a/lib/ring/rte_ring.h +++ b/lib/ring/rte_ring.h @@ -165,5 +165,4 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count, * rte_errno set appropriately. Possible errno values include: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - EINVAL - count provided is not a power of 2 * - ENOSPC - the maximum number of memzones has already been allocated diff --git a/lib/ring/rte_ring_elem.h b/lib/ring/rte_ring_elem.h index 4bd016c110..91f2b5ff2a 100644 --- a/lib/ring/rte_ring_elem.h +++ b/lib/ring/rte_ring_elem.h @@ -97,5 +97,4 @@ ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count); * rte_errno set appropriately. Possible errno values include: * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure - * - E_RTE_SECONDARY - function was called from a secondary process instance * - EINVAL - esize is not a multiple of 4 or count provided is not a * power of 2. -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.489865684 +0100 +++ 0086-mem-fix-API-doc-about-allocation-on-secondary-proces.patch 2022-10-25 14:18:58.528798510 +0100 @@ -1 +1 @@ -From d5262b521d096349e9e96b436f90eee6554ba595 Mon Sep 17 00:00:00 2001 +From e3b8a0894a03510565f2bb32e3f435248d48764d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d5262b521d096349e9e96b436f90eee6554ba595 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -49 +50 @@ -index 9811e8c760..b6e23d98ce 100644 +index dedf83c38d..30d7937349 100644 @@ -52 +53 @@ -@@ -665,5 +665,4 @@ void rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg); +@@ -667,5 +667,4 @@ void rte_pktmbuf_pool_init(struct rte_mempool *mp, void *opaque_arg); @@ -58 +59 @@ -@@ -707,5 +706,4 @@ rte_pktmbuf_pool_create(const char *name, unsigned n, +@@ -709,5 +708,4 @@ rte_pktmbuf_pool_create(const char *name, unsigned n, @@ -64 +65 @@ -@@ -761,5 +759,4 @@ struct rte_pktmbuf_extmem { +@@ -763,5 +761,4 @@ struct rte_pktmbuf_extmem { @@ -71 +72 @@ -index a3c4ee351d..4c4af2a8ed 100644 +index 1e7a3c1527..f023418a6b 100644 @@ -74 +75 @@ -@@ -1024,5 +1024,4 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); +@@ -1042,5 +1042,4 @@ typedef void (rte_mempool_ctor_t)(struct rte_mempool *, void *); @@ -81 +82 @@ -index 980e92e594..7c48e35d27 100644 +index da17ed6d7c..937cfbb7a0 100644 @@ -84 +85 @@ -@@ -181,5 +181,4 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count, +@@ -165,5 +165,4 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count, @@ -91 +92 @@ -index fb1edc9aad..7f7d4951d3 100644 +index 4bd016c110..91f2b5ff2a 100644