From: Huawei Xie <huawei.xie@intel.com>
To: dev@dpdk.org
Cc: haifeng.lin@intel.com
Subject: [dpdk-dev] [PATCH RFC v2 12/12] lib/librte_vhost: cleanup when vhost user socket connection is closed
Date: Thu, 11 Dec 2014 05:37:57 +0800 [thread overview]
Message-ID: <1418247477-13920-13-git-send-email-huawei.xie@intel.com> (raw)
In-Reply-To: <1418247477-13920-1-git-send-email-huawei.xie@intel.com>
close the memory region file descriptor
close the kick/callfd
vSwitch needs to run endlessly. resource leak is deadly issue.
Signed-off-by: Huawei Xie <huawei.xie@intel.com>
---
lib/librte_vhost/vhost_user/vhost-net-user.c | 7 ++--
lib/librte_vhost/vhost_user/virtio-net-user.c | 59 +++++++++++++++++++--------
lib/librte_vhost/vhost_user/virtio-net-user.h | 1 +
3 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.c b/lib/librte_vhost/vhost_user/vhost-net-user.c
index 6b9ebd7..35215b4 100644
--- a/lib/librte_vhost/vhost_user/vhost-net-user.c
+++ b/lib/librte_vhost/vhost_user/vhost-net-user.c
@@ -283,9 +283,9 @@ vserver_message_handler(int connfd, uint64_t dat)
RTE_LOG(ERR, VHOST_CONFIG,
"vhost read message failed\n");
- /*TODO: cleanup */
close(connfd);
fdset_del(&g_vhost_server->fdset, connfd);
+ user_destroy_device(ctx);
ops->destroy_device(ctx);
return;
@@ -293,9 +293,9 @@ vserver_message_handler(int connfd, uint64_t dat)
RTE_LOG(INFO, VHOST_CONFIG,
"vhost peer closed\n");
- /*TODO: cleanup */
close(connfd);
fdset_del(&g_vhost_server->fdset, connfd);
+ user_destroy_device(ctx);
ops->destroy_device(ctx);
return;
@@ -304,9 +304,10 @@ vserver_message_handler(int connfd, uint64_t dat)
RTE_LOG(ERR, VHOST_CONFIG,
"vhost read incorrect message\n");
- /*TODO: cleanup */
close(connfd);
fdset_del(&g_vhost_server->fdset, connfd);
+ user_destroy_device(ctx);
+ ops->destroy_device(ctx);
return;
}
diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c
index 4e49e9b..75f9f54 100644
--- a/lib/librte_vhost/vhost_user/virtio-net-user.c
+++ b/lib/librte_vhost/vhost_user/virtio-net-user.c
@@ -65,6 +65,31 @@ get_blk_size(int fd)
return (uint64_t)stat.st_blksize;
}
+static void
+free_mem_region(struct virtio_net *dev)
+{
+ struct orig_region_map *region;
+ unsigned int idx;
+ int ret;
+ uint64_t alignment;
+
+ if (!dev || !dev->mem)
+ return;
+
+ region = orig_region(dev->mem, dev->mem->nregions);
+ for (idx = 0; idx < dev->mem->nregions; idx++) {
+ if (region[idx].mapped_address) {
+ alignment = region[idx].blksz;
+ printf("Freeing %p\n",
+ (void *)(uintptr_t)region[idx].mapped_address);
+ ret = munmap((void *)RTE_ALIGN_FLOOR(region[idx].mapped_address, alignment), RTE_ALIGN_CEIL(region[idx].mapped_size, alignment));
+ printf("munmap ret= %d\n", ret);
+ printf("close file %d\n", region[idx].fd);
+ close(region[idx].fd);
+ }
+ }
+}
+
int
user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)
{
@@ -73,28 +98,15 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)
uint64_t mapped_address, mapped_size, base_address = 0;
struct virtio_net *dev;
unsigned int idx = 0;
+ struct orig_region_map *region;
struct orig_region_map tmp[VHOST_MEMORY_MAX_NREGIONS] =
{ [0 ... VHOST_MEMORY_MAX_NREGIONS - 1] = { 0 } };
- struct orig_region_map *region;
uint64_t alignment;
- int ret;
/* unmap old memory regions one by one*/
dev = get_device(ctx);
- if (dev->mem) {
- region = orig_region(dev->mem, dev->mem->nregions);
- for (idx = 0; idx < dev->mem->nregions; idx++) {
- if (region[idx].mapped_address) {
- alignment = region[idx].blksz;
- printf("Freeing %p\n",
- (void *)(uintptr_t)region[idx].mapped_address);
- ret = munmap((void *)RTE_ALIGN_FLOOR(region[idx].mapped_address, alignment),
- RTE_ALIGN_CEIL(region[idx].mapped_size, alignment));
- printf("munmap ret= %d\n", ret);
- printf("close file %d\n", region[idx].fd);
- close(region[idx].fd);
- }
- }
+ if (dev && dev->mem) {
+ free_mem_region(dev);
free(dev->mem);
dev->mem = NULL;
}
@@ -248,7 +260,6 @@ user_set_vring_kick(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)
if (virtio_is_ready(dev) &&
!(dev->flags & VIRTIO_DEV_RUNNING))
notify_ops->new_device(dev);
-
}
/*
@@ -284,5 +295,19 @@ user_get_vring_base(struct vhost_device_ctx ctx,
}
return 0;
+}
+
+void
+user_destroy_device(struct vhost_device_ctx ctx)
+{
+ struct virtio_net *dev = get_device(ctx);
+
+ if (dev && (dev->flags & VIRTIO_DEV_RUNNING))
+ notify_ops->destroy_device(dev);
+ if (dev && dev->mem) {
+ free_mem_region(dev);
+ free(dev->mem);
+ dev->mem = NULL;
+ }
}
diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.h b/lib/librte_vhost/vhost_user/virtio-net-user.h
index 0f6a75a..df24860 100644
--- a/lib/librte_vhost/vhost_user/virtio-net-user.h
+++ b/lib/librte_vhost/vhost_user/virtio-net-user.h
@@ -45,4 +45,5 @@ void user_set_vring_kick(struct vhost_device_ctx, struct VhostUserMsg *);
int user_get_vring_base(struct vhost_device_ctx, struct vhost_vring_state *);
+void user_destroy_device(struct vhost_device_ctx);
#endif
--
1.8.1.4
next prev parent reply other threads:[~2014-12-10 21:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 21:37 [dpdk-dev] [PATCH RFC v2 00/12] lib/librte_vhost: vhost-user support Huawei Xie
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 01/12] lib/librte_vhost: mov vhost-cuse implementation to vhost_cuse directory Huawei Xie
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 02/12] lib/librte_vhost: rename vhost-net-cdev.h as vhost-net.h Huawei Xie
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 03/12] lib/librte_vhost: move event_copy logic from virtio-net.c to vhost-net-cdev.c Huawei Xie
2015-01-07 9:10 ` Xie, Huawei
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 04/12] lib/librte_vhost: copy of host_memory_map from virtio-net.c to new file virtio-net-cdev.c Huawei Xie
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 05/12] lib/librte_vhost: host_memory_map refine Huawei Xie
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 06/12] lib/librte_vhost: cuse_set_memory_table Huawei Xie
2014-12-15 5:20 ` Tetsuya Mukawa
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 07/12] lib/librte_vhost: async event and callback Huawei Xie
2014-12-15 5:20 ` Tetsuya Mukawa
2014-12-17 17:51 ` Xie, Huawei
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 08/12] lib/librte_vhost: vhost-user support Huawei Xie
2014-12-11 5:36 ` Linhaifeng
2015-01-05 10:21 ` Xie, Huawei
2015-01-23 3:40 ` Xie, Huawei
2015-01-23 3:53 ` Linhaifeng
2014-12-11 6:04 ` Linhaifeng
2014-12-11 17:13 ` Xie, Huawei
2014-12-12 2:25 ` Linhaifeng
2014-12-11 20:16 ` Xie, Huawei
2015-01-23 3:36 ` Xie, Huawei
2015-01-23 8:36 ` Linhaifeng
2014-12-16 3:05 ` Tetsuya Mukawa
2014-12-17 1:06 ` Xie, Huawei
2014-12-17 3:31 ` Tetsuya Mukawa
2014-12-17 4:22 ` Tetsuya Mukawa
2014-12-17 17:31 ` Xie, Huawei
2014-12-19 3:36 ` Tetsuya Mukawa
2014-12-24 7:21 ` Tetsuya Mukawa
2015-01-04 9:53 ` Xie, Huawei
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 09/12] lib/librte_vhost: minor fix Huawei Xie
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 10/12] lib/librte_vhost: vhost-user memory region map Huawei Xie
2014-12-16 2:38 ` Tetsuya Mukawa
2014-12-10 21:37 ` [dpdk-dev] [PATCH RFC v2 11/12] lib/librte_vhost: kick/callfd fix Huawei Xie
2014-12-10 21:37 ` Huawei Xie [this message]
2014-12-10 22:04 ` [dpdk-dev] [PATCH RFC v2 00/12] lib/librte_vhost: vhost-user support Xie, Huawei
2014-12-11 2:21 ` Tetsuya Mukawa
2014-12-15 5:26 ` Tetsuya Mukawa
2014-12-17 17:43 ` Xie, Huawei
2015-01-07 12:43 ` Qiu, Michael
2015-01-23 8:16 ` Linhaifeng
2015-01-26 7:24 ` Xie, Huawei
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=1418247477-13920-13-git-send-email-huawei.xie@intel.com \
--to=huawei.xie@intel.com \
--cc=dev@dpdk.org \
--cc=haifeng.lin@intel.com \
/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).