DPDK patches and discussions
 help / color / mirror / Atom feed
From: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Cc: dev@dpdk.org, Herakliusz Lipiec <herakliusz.lipiec@intel.com>,
	jianfeng.tan@intel.com, stable@dpdk.org
Subject: [dpdk-dev] [PATCH v5 1/2] ipc: fix memory leak in sync request
Date: Fri,  3 May 2019 11:28:56 +0100	[thread overview]
Message-ID: <20190503102857.15812-2-herakliusz.lipiec@intel.com> (raw)
Message-ID: <20190503102856.-2wbqS-fY3TZhvjLDBNWSEvtw22KEJZErTqo2Wn6a2Q@z> (raw)
In-Reply-To: <20190503102857.15812-1-herakliusz.lipiec@intel.com>

When sending multiple requests, rte_mp_request_sync
can succeed sending a few of those requests, but then
fail on a later one and in the end return with rc=-1.
The upper layers - e.g. device hotplug - currently
handles this case as if no messages were sent and no
memory for response buffers was allocated, which is
not true. Fixed by always freeing memory buffers on
failure.

Bugzilla ID: 228
Fixes: 783b6e54971d ("eal: add synchronous multi-process communication")
Cc: jianfeng.tan@intel.com
Cc: stable@dpdk.org

Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/eal_common_proc.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index b46d644b3..ef5eddbea 100644
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -927,13 +927,13 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 
 	RTE_LOG(DEBUG, EAL, "request: %s\n", req->name);
 
-	if (check_input(req) == false)
-		return -1;
-
 	reply->nb_sent = 0;
 	reply->nb_received = 0;
 	reply->msgs = NULL;
 
+	if (check_input(req) == false)
+		goto err;
+
 	if (internal_config.no_shconf) {
 		RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
 		return 0;
@@ -942,7 +942,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 	if (gettimeofday(&now, NULL) < 0) {
 		RTE_LOG(ERR, EAL, "Failed to get current time\n");
 		rte_errno = errno;
-		return -1;
+		goto err;
 	}
 
 	end.tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000;
@@ -954,6 +954,8 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		pthread_mutex_lock(&pending_requests.lock);
 		ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
 		pthread_mutex_unlock(&pending_requests.lock);
+		if (ret)
+			goto err;
 		return ret;
 	}
 
@@ -962,7 +964,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 	if (!mp_dir) {
 		RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
 		rte_errno = errno;
-		return -1;
+		goto err;
 	}
 
 	dir_fd = dirfd(mp_dir);
@@ -972,7 +974,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 			mp_dir_path);
 		closedir(mp_dir);
 		rte_errno = errno;
-		return -1;
+		goto err;
 	}
 
 	pthread_mutex_lock(&pending_requests.lock);
@@ -989,7 +991,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 		 * locks on receive
 		 */
 		if (mp_request_sync(path, req, reply, &end))
-			ret = -1;
+			goto err;
 	}
 	pthread_mutex_unlock(&pending_requests.lock);
 	/* unlock the directory */
@@ -998,6 +1000,12 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 	/* dir_fd automatically closed on closedir */
 	closedir(mp_dir);
 	return ret;
+
+err:
+	free(reply->msgs);
+	reply->nb_received = 0;
+	reply->msgs = NULL;
+	return -1;
 }
 
 int __rte_experimental
-- 
2.17.2


  parent reply	other threads:[~2019-05-03 10:28 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-17 14:38 [dpdk-dev] [PATCH 1/8] ipc: fix rte_mp_request_sync memleak Herakliusz Lipiec
2019-04-17 14:38 ` Herakliusz Lipiec
2019-04-23  8:11 ` Burakov, Anatoly
2019-04-23  8:11   ` Burakov, Anatoly
2019-04-23  8:13 ` Burakov, Anatoly
2019-04-23  8:13   ` Burakov, Anatoly
2019-04-23 17:43 ` [dpdk-dev] [PATCH v2 0/8] ipc: fix possible memleaks Herakliusz Lipiec
2019-04-23 17:43   ` Herakliusz Lipiec
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 1/8] ipc: fix rte_mp_request_sync memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-24  9:28     ` Stojaczyk, Dariusz
2019-04-24  9:28       ` Stojaczyk, Dariusz
2019-04-25  9:37     ` Burakov, Anatoly
2019-04-25  9:37       ` Burakov, Anatoly
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 2/8] ipc: fix hotplug memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-25  6:00     ` Stojaczyk, Dariusz
2019-04-25  6:00       ` Stojaczyk, Dariusz
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 3/8] ipc: fix vdev memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-25  6:08     ` Stojaczyk, Dariusz
2019-04-25  6:08       ` Stojaczyk, Dariusz
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 4/8] ipc: fix vfio memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-25  6:06     ` Stojaczyk, Dariusz
2019-04-25  6:06       ` Stojaczyk, Dariusz
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 5/8] ipc: fix pdump memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 6/8] ipc: fix tap pmd memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 7/8] ipc: fix net/mlx4 memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-23 20:16     ` Yongseok Koh
2019-04-23 20:16       ` Yongseok Koh
2019-04-23 17:43   ` [dpdk-dev] [PATCH v2 8/8] ipc: fix net/mlx5 memleak Herakliusz Lipiec
2019-04-23 17:43     ` Herakliusz Lipiec
2019-04-23 20:16     ` Yongseok Koh
2019-04-23 20:16       ` Yongseok Koh
2019-04-25 11:43   ` [dpdk-dev] [PATCH v3 0/2] ipc: fix possible memleaks Herakliusz Lipiec
2019-04-25 11:43     ` Herakliusz Lipiec
2019-04-25 11:43     ` [dpdk-dev] [PATCH v3 1/2] ipc: fix rte_mp_request_sync memleak Herakliusz Lipiec
2019-04-25 11:43       ` Herakliusz Lipiec
2019-04-25 12:47       ` Burakov, Anatoly
2019-04-25 12:47         ` Burakov, Anatoly
2019-04-25 11:43     ` [dpdk-dev] [PATCH v3 2/2] ipc: fix tap pmd memleak Herakliusz Lipiec
2019-04-25 11:43       ` Herakliusz Lipiec
2019-04-25 12:48     ` [dpdk-dev] [PATCH v4 0/2] ipc: fix possible memleaks Herakliusz Lipiec
2019-04-25 12:48       ` Herakliusz Lipiec
2019-04-25 12:48       ` [dpdk-dev] [PATCH v4 1/2] ipc: fix rte_mp_request_sync memleak Herakliusz Lipiec
2019-04-25 12:48         ` Herakliusz Lipiec
2019-04-25 12:48         ` Burakov, Anatoly
2019-04-25 12:48           ` Burakov, Anatoly
2019-04-25 12:48       ` [dpdk-dev] [PATCH v4 2/2] ipc: fix tap pmd memleak Herakliusz Lipiec
2019-04-25 12:48         ` Herakliusz Lipiec
2019-04-25 18:14         ` Wiles, Keith
2019-04-25 18:14           ` Wiles, Keith
2019-05-03  8:34       ` [dpdk-dev] [PATCH v4 0/2] ipc: fix possible memleaks Thomas Monjalon
2019-05-03  8:34         ` Thomas Monjalon
2019-05-03  8:38         ` Burakov, Anatoly
2019-05-03  8:38           ` Burakov, Anatoly
2019-05-03 10:28       ` [dpdk-dev] [PATCH v5 0/2] ipc: fix possible memory leaks Herakliusz Lipiec
2019-05-03 10:28         ` Herakliusz Lipiec
2019-05-03 10:28         ` Herakliusz Lipiec [this message]
2019-05-03 10:28           ` [dpdk-dev] [PATCH v5 1/2] ipc: fix memory leak in sync request Herakliusz Lipiec
2019-05-03 10:28         ` [dpdk-dev] [PATCH v5 2/2] net/tap: fix ipc related memory leak Herakliusz Lipiec
2019-05-03 10:28           ` Herakliusz Lipiec
2019-05-03 10:54         ` [dpdk-dev] [PATCH v5 0/2] ipc: fix possible memory leaks Thomas Monjalon
2019-05-03 10:54           ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190503102857.15812-2-herakliusz.lipiec@intel.com \
    --to=herakliusz.lipiec@intel.com \
    --cc=dev@dpdk.org \
    --cc=jianfeng.tan@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).