From patchwork Sun Dec 31 14:46:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Varghese, Vipin" X-Patchwork-Id: 32817 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 78AD32B8E; Sun, 31 Dec 2017 10:05:08 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 54A991D7 for ; Sun, 31 Dec 2017 10:05:05 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2017 01:05:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,485,1508828400"; d="scan'208";a="163136760" Received: from unknown (HELO localhost.localdomain) ([10.224.122.203]) by orsmga004.jf.intel.com with ESMTP; 31 Dec 2017 01:05:03 -0800 From: Vipin Varghese To: dev@dpdk.org, harry.van.haaren@intel.com Cc: deepak.k.jain@intel.com, Vipin Varghese Date: Sun, 31 Dec 2017 20:16:08 +0530 Message-Id: <1514731568-3979-1-git-send-email-vipin.varghese@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH v1] service: fix memory leak by rte_service_init X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes the memory leak created by rte_service_init, when run from secondary application. Running secondary application which shares the huge page memory from primary multiple times causes memory to be initialized but not free when application exit. The rte_service_deinit check if the service is initialized. If yes, it frees up rte_services & lcore_states. The API has to be called at end of application run. Signed-off-by: Vipin Varghese Acked-by: Harry van Haaren --- lib/librte_eal/common/include/rte_service.h | 9 +++++++++ lib/librte_eal/common/rte_service.c | 14 ++++++++++++++ lib/librte_eal/rte_eal_version.map | 1 + 3 files changed, 24 insertions(+) diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h index 9272440..ad2649e 100644 --- a/lib/librte_eal/common/include/rte_service.h +++ b/lib/librte_eal/common/include/rte_service.h @@ -420,6 +420,15 @@ int32_t rte_service_run_iter_on_app_lcore(uint32_t id, */ int32_t rte_service_dump(FILE *f, uint32_t id); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Fress all memory that is internally used. + */ + +void rte_service_deinit(void); + #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c index ae97e6b..017bc67 100644 --- a/lib/librte_eal/common/rte_service.c +++ b/lib/librte_eal/common/rte_service.c @@ -98,6 +98,20 @@ struct core_state { static struct core_state *lcore_states; static uint32_t rte_service_library_initialized; +void rte_service_deinit(void) +{ + if (rte_service_library_initialized) { + if (rte_services) + rte_free(rte_services); + if (lcore_states) + rte_free(lcore_states); + + rte_service_library_initialized = 0; + } + return; +} + + int32_t rte_service_init(void) { if (rte_service_library_initialized) { diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index f4f46c1..0f14409 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -234,5 +234,6 @@ EXPERIMENTAL { rte_service_set_runstate_mapped_check; rte_service_set_stats_enable; rte_service_start_with_defaults; + rte_service_deinit; } DPDK_17.11;