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 4AA86A0032; Sat, 13 Nov 2021 18:23:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 664F34115D; Sat, 13 Nov 2021 18:23:10 +0100 (CET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mails.dpdk.org (Postfix) with ESMTP id 38B8041145 for ; Sat, 13 Nov 2021 18:23:07 +0100 (CET) Received: by mail-pl1-f171.google.com with SMTP id b13so11033778plg.2 for ; Sat, 13 Nov 2021 09:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EiVoq14vivz39nJuffyHDJYXlJHr8jlxYwdLxvhyMes=; b=MnQ+obc7/KVycWoCimhMFN4hTBPScJiXlqetNso01KJVkjDY5Id91Dj96Ihsf+5PFk 2la9gs6jmtHNBV4yzaDX0EAYvvHJmsjfreOUrgUjRK9ilno1TJBnnB+c5WOO2+gIv8AT 2UoXOlE4yLYDsVKaVh8VCpgrktuNgLcrHybwM4WHtvYyHVGyu5S50MpndRhpZ7lbK18p mJMAzK7P91UlA4CjN327oAeYeBRiw7BH6gx0mBRhrcF/Hc12shhl9JnjNce4RmTMmUpA y3Xl2yfxwFwyTbW6X2BcUmvbXJeKq1clL2/hwyMApK8Xnus7TXAoXdIP8VMjiylG1SKW 3rsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EiVoq14vivz39nJuffyHDJYXlJHr8jlxYwdLxvhyMes=; b=5vG8T5vFKUoHW3j73SzQUt2PdyE6N7NVkDn6N6PWosgSMz9HXJkjyFyyFc19B4xNH8 Eaqy4+1c1T0gTw0u6O6x+yyQEL194uLAfvJyNznO4YMjj24/sXBkA/icR3vMrgrH8TBt tPZ5ces3WrCqsYjN0QENbMK/isy8hGMOov/BNry+sMgzQjMti+r3vxY6Qdl/TVejvHzA yHBp8u2bKPVdEw9AKhzbN2OV9KoXZwWV8pKdg9I0QWxPtKTACaQ9d3ZKecUGV6u/IdK0 NCAKfPH1lGYlkuoBZNqXYCvvnrvxSbbhX8DLqKl0QxKiw12TPuHnZghQ7nG80YixddL8 S33Q== X-Gm-Message-State: AOAM530x0/K0XGNHVply/6ItG5EHQZsW25MCaUiDewYkJNFgHfc3E7fy kK+CX22+HQZtXh38Tf8VJsf8kJenxVaIbw== X-Google-Smtp-Source: ABdhPJz2oWZJ+MwIwlXai7AkM5+SaB/dYYA6VFyaK4ffURa4UkFoxJsD91tGFac0Al6mE4An0BdWvw== X-Received: by 2002:a17:90b:34b:: with SMTP id fh11mr46705583pjb.14.1636824186046; Sat, 13 Nov 2021 09:23:06 -0800 (PST) Received: from hermes.local (204-195-33-123.wavecable.com. [204.195.33.123]) by smtp.gmail.com with ESMTPSA id u19sm9658370pfl.185.2021.11.13.09.23.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Nov 2021 09:23:05 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov , Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam Subject: [PATCH v6 5/5] eal: malloc: cleanup mp resources Date: Sat, 13 Nov 2021 09:22:57 -0800 Message-Id: <20211113172257.6543-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211113172257.6543-1-stephen@networkplumber.org> References: <20200428235827.15383-1-stephen@networkplumber.org> <20211113172257.6543-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 The mp action resources in malloc should be cleaned up via rte_eal_cleanup. Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- lib/eal/common/malloc_heap.c | 6 ++++++ lib/eal/common/malloc_heap.h | 3 +++ lib/eal/common/malloc_mp.c | 12 ++++++++++++ lib/eal/common/malloc_mp.h | 3 +++ lib/eal/linux/eal.c | 1 + lib/eal/windows/eal_mp.c | 7 +++++++ 6 files changed, 32 insertions(+) diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c index 55aad2711b39..666f770fbf6d 100644 --- a/lib/eal/common/malloc_heap.c +++ b/lib/eal/common/malloc_heap.c @@ -1403,3 +1403,9 @@ rte_eal_malloc_heap_init(void) /* add all IOVA-contiguous areas to the heap */ return rte_memseg_contig_walk(malloc_add_seg, NULL); } + +void +rte_eal_malloc_heap_cleanup(void) +{ + unregister_mp_requests(); +} diff --git a/lib/eal/common/malloc_heap.h b/lib/eal/common/malloc_heap.h index 3a29d024b4ca..3b2fbc0aa059 100644 --- a/lib/eal/common/malloc_heap.h +++ b/lib/eal/common/malloc_heap.h @@ -85,4 +85,7 @@ malloc_socket_to_heap_id(unsigned int socket_id); int rte_eal_malloc_heap_init(void); +void +rte_eal_malloc_heap_cleanup(void); + #endif /* MALLOC_HEAP_H_ */ diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c index 2e597a17a2f2..5f6f275b7859 100644 --- a/lib/eal/common/malloc_mp.c +++ b/lib/eal/common/malloc_mp.c @@ -806,3 +806,15 @@ register_mp_requests(void) } return 0; } + +void +unregister_mp_requests(void) +{ + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + rte_mp_action_unregister(MP_ACTION_REQUEST); + } else { + rte_mp_action_unregister(MP_ACTION_SYNC); + rte_mp_action_unregister(MP_ACTION_ROLLBACK); + rte_mp_action_unregister(MP_ACTION_RESPONSE); + } +} diff --git a/lib/eal/common/malloc_mp.h b/lib/eal/common/malloc_mp.h index 0095062b72f2..c806f7beafe0 100644 --- a/lib/eal/common/malloc_mp.h +++ b/lib/eal/common/malloc_mp.h @@ -63,6 +63,9 @@ struct malloc_mp_req { int register_mp_requests(void); +void +unregister_mp_requests(void); + int request_to_primary(struct malloc_mp_req *req); diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 1a13a3474e38..ea663fe02b93 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1371,6 +1371,7 @@ rte_eal_cleanup(void) /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); eal_mp_dev_hotplug_cleanup(); + rte_eal_malloc_heap_cleanup(); rte_eal_alarm_cleanup(); rte_trace_save(); eal_trace_fini(); diff --git a/lib/eal/windows/eal_mp.c b/lib/eal/windows/eal_mp.c index f2fa9366f668..76413f49a393 100644 --- a/lib/eal/windows/eal_mp.c +++ b/lib/eal/windows/eal_mp.c @@ -87,6 +87,13 @@ register_mp_requests(void) return 0; } +void +unregister_mp_requests(void) +{ + /* Non-stub function succeeds if multi-process is not supported. */ + EAL_LOG_STUB(); +} + int request_to_primary(struct malloc_mp_req *req) { -- 2.30.2