From patchwork Mon Aug 21 08:58:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 130553 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2DAD8430BE; Mon, 21 Aug 2023 10:58:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB40743261; Mon, 21 Aug 2023 10:58:28 +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 EBA0143261 for ; Mon, 21 Aug 2023 10:58:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692608307; 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=BuRoWRx/+JZ/KAykQljd/VKs4dcF3gYcGjEgsRQRK7k=; b=WpMdqNqclg7tlNQMc9mLvNVY0UXO+Hy5VwycQGK14jdfCfx5PFsQ2HAymNDOtjAP5UiKzY MrTTn060ctmdtYAdDom/g0gFK01VcZR1MXtYIjhTfUFSpK1EFFMqLj7+U1HO5D8CMqYH+T oZzFUCHfOee4QWvKeHHFS1bxazZ6OFg= 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-362-LrVRYFb2PrKvSOGny7tPrw-1; Mon, 21 Aug 2023 04:58:21 -0400 X-MC-Unique: LrVRYFb2PrKvSOGny7tPrw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA66D8DC666; Mon, 21 Aug 2023 08:58:20 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.226.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9022D40C206F; Mon, 21 Aug 2023 08:58:19 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: probb@iol.unh.edu, =?utf-8?q?Morten_Br=C3=B8rup?= , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko , Anatoly Burakov Subject: [PATCH v3 3/3] ethdev: cleanup shared data with the last port Date: Mon, 21 Aug 2023 10:58:06 +0200 Message-ID: <20230821085806.3062613-4-david.marchand@redhat.com> In-Reply-To: <20230821085806.3062613-1-david.marchand@redhat.com> References: <20230818091321.2404089-1-david.marchand@redhat.com> <20230821085806.3062613-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org If no port is allocated and no port owner is still registered, ethdev from a primary process may release the memzone used to store port data. This makes it possible for the DPDK memory allocator to release associated resources back to the OS. Signed-off-by: David Marchand Acked-by: Morten Brørup --- Changes since v2: - tracked owners count and and avoided releasing shared mem if some owner is still registered, --- lib/ethdev/ethdev_driver.c | 6 ++++++ lib/ethdev/ethdev_private.c | 21 ++++++++++++++++++++- lib/ethdev/ethdev_private.h | 4 ++++ lib/ethdev/rte_ethdev.c | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c index f04666f3a2..c30cb33963 100644 --- a/lib/ethdev/ethdev_driver.c +++ b/lib/ethdev/ethdev_driver.c @@ -114,6 +114,8 @@ rte_eth_dev_allocate(const char *name) eth_dev->data->backer_port_id = RTE_MAX_ETHPORTS; eth_dev->data->mtu = RTE_ETHER_MTU; pthread_mutex_init(ð_dev->data->flow_ops_mutex, NULL); + RTE_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY); + eth_dev_shared_data->allocated_ports++; unlock: rte_spinlock_unlock(rte_mcfg_ethdev_get_lock()); @@ -264,6 +266,10 @@ rte_eth_dev_release_port(struct rte_eth_dev *eth_dev) rte_free(eth_dev->data->dev_private); pthread_mutex_destroy(ð_dev->data->flow_ops_mutex); memset(eth_dev->data, 0, sizeof(struct rte_eth_dev_data)); + eth_dev->data = NULL; + + eth_dev_shared_data->allocated_ports--; + eth_dev_shared_data_release(); } rte_spinlock_unlock(rte_mcfg_ethdev_get_lock()); diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c index 911de1e595..aea9112cc2 100644 --- a/lib/ethdev/ethdev_private.c +++ b/lib/ethdev/ethdev_private.c @@ -11,6 +11,7 @@ static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data"; +static const struct rte_memzone *eth_dev_shared_mz; struct eth_dev_shared *eth_dev_shared_data; /* spinlock for eth device callbacks */ @@ -324,7 +325,7 @@ eth_dev_shared_data_prepare(void) const unsigned int flags = 0; const struct rte_memzone *mz; - if (eth_dev_shared_data == NULL) { + if (eth_dev_shared_mz == NULL) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) { /* Allocate port data and ownership shared memory. */ mz = rte_memzone_reserve(MZ_RTE_ETH_DEV_DATA, @@ -337,10 +338,13 @@ eth_dev_shared_data_prepare(void) goto out; } + eth_dev_shared_mz = mz; eth_dev_shared_data = mz->addr; if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + eth_dev_shared_data->allocated_owners = 0; eth_dev_shared_data->next_owner_id = RTE_ETH_DEV_NO_OWNER + 1; + eth_dev_shared_data->allocated_ports = 0; memset(eth_dev_shared_data->data, 0, sizeof(eth_dev_shared_data->data)); } @@ -349,6 +353,21 @@ eth_dev_shared_data_prepare(void) return eth_dev_shared_data; } +void +eth_dev_shared_data_release(void) +{ + RTE_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY); + + if (eth_dev_shared_data->allocated_ports != 0) + return; + if (eth_dev_shared_data->allocated_owners != 0) + return; + + rte_memzone_free(eth_dev_shared_mz); + eth_dev_shared_mz = NULL; + eth_dev_shared_data = NULL; +} + void eth_dev_rxq_release(struct rte_eth_dev *dev, uint16_t qid) { diff --git a/lib/ethdev/ethdev_private.h b/lib/ethdev/ethdev_private.h index 1572da7b48..0d36b9c30f 100644 --- a/lib/ethdev/ethdev_private.h +++ b/lib/ethdev/ethdev_private.h @@ -14,7 +14,9 @@ #include "rte_ethdev.h" struct eth_dev_shared { + uint64_t allocated_owners; uint64_t next_owner_id; + uint64_t allocated_ports; struct rte_eth_dev_data data[RTE_MAX_ETHPORTS]; }; @@ -69,6 +71,8 @@ void eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo, void *eth_dev_shared_data_prepare(void) __rte_exclusive_locks_required(rte_mcfg_ethdev_get_lock()); +void eth_dev_shared_data_release(void) + __rte_exclusive_locks_required(rte_mcfg_ethdev_get_lock()); void eth_dev_rxq_release(struct rte_eth_dev *dev, uint16_t qid); void eth_dev_txq_release(struct rte_eth_dev *dev, uint16_t qid); diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index ea430d8bab..35925a403a 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -444,6 +444,7 @@ rte_eth_dev_owner_new(uint64_t *owner_id) if (eth_dev_shared_data_prepare() != NULL) { *owner_id = eth_dev_shared_data->next_owner_id++; + eth_dev_shared_data->allocated_owners++; ret = 0; } else { ret = -ENOMEM; @@ -566,6 +567,8 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) RTE_ETHDEV_LOG(NOTICE, "All port owners owned by %016"PRIx64" identifier have removed\n", owner_id); + eth_dev_shared_data->allocated_owners--; + eth_dev_shared_data_release(); } else { RTE_ETHDEV_LOG(ERR, "Invalid owner ID=%016"PRIx64"\n",