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 DE47DA0032; Sat, 13 Nov 2021 01:29:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D0B14114A; Sat, 13 Nov 2021 01:28:37 +0100 (CET) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mails.dpdk.org (Postfix) with ESMTP id 6226F4115E for ; Sat, 13 Nov 2021 01:28:35 +0100 (CET) Received: by mail-pg1-f176.google.com with SMTP id 136so4707568pgc.0 for ; Fri, 12 Nov 2021 16:28:35 -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=cRVZNC9mLjCkazasozVxfEIU6jcqZfXi9G/kIITD2Qg=; b=vAXb/3Oi4Kt30VM5t5gcXu4E/aZAaob1cNFiZiHO4UvmGkJVEYn+ETFsGHld3X17yW MB70t2rOQSYPoBiXaGaCkRvq1rOLEX4HfTfbjEWwS/j3TkuZNmEON2oD4jq8irs2l8IK JDhffZGXAA/T5D+1krIy3C+LkTJHKm8UUFYJlA3WWzFO1S5OYbfIj1FRyL0iw8RX8nGG HE71E6/b5a9w/ngJNif0AkO1eiwYPG+11fopJGjj4sc4+KvJuxLNdezeUpyheA3AQJNO ISYuRfck6X6wL2xoLRR3nQQrOFbslufaYe/cRHZAFkxEPZuM7ZXGgCOQqxuyso0yUkqW Gp+g== 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=cRVZNC9mLjCkazasozVxfEIU6jcqZfXi9G/kIITD2Qg=; b=FnThdLgZsDw1r4Wp/2+su8I3RuM+LJdsD34LExzz9czFqO7MCrFsICrJ7SEGXl6Z58 dzAGPefupV7Wuqd5f434hSqTy/5JCzF2qldUvtlPKrU/ts/dJS8DZyumT0ed2lr0EeFz NLRL0Sn5XsBp0PypdW0XrZN2m/i28q604K7mbxpbM9cptPqNbe0+8HLCr/J3mVDlV0x+ kZDTtuGdzAKC8F/pVe9KtxQx6w5x6EBAZqdkKbYSyzny5UynoYG0QobhL6/sAkF7UcoH 7r2oHVSo06TrSQ1EkPs7895CSiUEgvXSOoywE5s80iYPVXBs+dDwjN40vnRFXPqlw/kr p/8g== X-Gm-Message-State: AOAM531ixHmVLU1reamZoULhvOm2ncPVwwnTwLp6/bGWKYzPBH37tJYA nTzD3F9PwHsk3tevdevNqTzsfa49HkzsDA== X-Google-Smtp-Source: ABdhPJxbF45MHYF10/JkfGifsdkD4PK6+bu6M0Cjn5e+iur3QRkqQ5InMoxPTsLyTP/Wl0U86C9ZZQ== X-Received: by 2002:aa7:970e:0:b0:4a2:655f:7a12 with SMTP id a14-20020aa7970e000000b004a2655f7a12mr10515445pfg.65.1636763314172; Fri, 12 Nov 2021 16:28:34 -0800 (PST) Received: from hermes.local (204-195-33-123.wavecable.com. [204.195.33.123]) by smtp.gmail.com with ESMTPSA id z10sm7687748pfh.106.2021.11.12.16.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 16:28:33 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Subject: [PATCH v4 5/5] eal: malloc: cleanup mp resources Date: Fri, 12 Nov 2021 16:28:24 -0800 Message-Id: <20211113002824.338343-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211113002824.338343-1-stephen@networkplumber.org> References: <20200428235827.15383-1-stephen@networkplumber.org> <20211113002824.338343-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 + 5 files changed, 25 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(); -- 2.30.2