From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34133)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <zhang.zhanghailiang@huawei.com>) id 1Xf38l-0001JA-GV
	for qemu-devel@nongnu.org; Fri, 17 Oct 2014 04:44:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <zhang.zhanghailiang@huawei.com>) id 1Xf38g-0005pb-Nc
	for qemu-devel@nongnu.org; Fri, 17 Oct 2014 04:44:03 -0400
Received: from szxga03-in.huawei.com ([119.145.14.66]:29138)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <zhang.zhanghailiang@huawei.com>) id 1Xf38g-0005pW-08
	for qemu-devel@nongnu.org; Fri, 17 Oct 2014 04:43:58 -0400
Message-ID: <5440D6BA.2040801@huawei.com>
Date: Fri, 17 Oct 2014 16:43:38 +0800
From: zhanghailiang <zhang.zhanghailiang@huawei.com>
MIME-Version: 1.0
References: <1413534437-13516-1-git-send-email-haifeng.lin@huawei.com>
In-Reply-To: <1413534437-13516-1-git-send-email-haifeng.lin@huawei.com>
Content-Type: text/plain; charset="windows-1252"; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] fix the memory leak for share hugepage
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: haifeng.lin@huawei.com, qemu-devel@nongnu.org
Cc: jerry.lilijun@huawei.com, mst@redhat.com

On 2014/10/17 16:27, haifeng.lin@huawei.com wrote:
> From: linhaifeng <haifeng.lin@huawei.com>
>
> The VM start with share hugepage should close the hugefile fd
> when exit.Because the hugepage fd may be send to other process
> e.g vhost-user If qemu not close the fd the other process can
> not free the hugepage otherwise exit process,this is ugly,so
> qemu should close all shared fd when exit.
>
> Signed-off-by: linhaifeng <haifeng.lin@huawei.com>
> ---
>   exec.c | 12 ++++++++++++
>   vl.c   |  7 +++++++
>   2 files changed, 19 insertions(+)
>
> diff --git a/exec.c b/exec.c
> index 759055d..d120b73 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1535,6 +1535,18 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
>           }
>       }
>   }
> +
> +void qemu_close_all_ram_fd(void)
> +{
> +    RAMBlock *block;
> +
> +    qemu_mutex_lock_ramlist();
> +    QTAILQ_FOREACH(block, &ram_list.blocks, next) {
> +        close(block->fd);
> +    }
> +    qemu_mutex_unlock_ramlist();
> +}
> +
>   #endif /* !_WIN32 */
>
>   int qemu_get_ram_fd(ram_addr_t addr)
> diff --git a/vl.c b/vl.c
> index aee73e1..0b78f3f 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -1658,6 +1658,7 @@ static int qemu_shutdown_requested(void)
>       return r;
>   }
>
> +extern void qemu_close_all_ram_fd(void);
>   static void qemu_kill_report(void)
>   {
>       if (!qtest_driver() && shutdown_signal != -1) {
> @@ -1671,6 +1672,12 @@ static void qemu_kill_report(void)
>               fprintf(stderr, " from pid " FMT_pid "\n", shutdown_pid);
>           }
>           shutdown_signal = -1;
> +
> +        /* Close all ram fd when exit. If the ram is shared by othter process

s/othter/other/

> +         * e.g vhost-user, it can free the hugepage by close fd after qemu exit,
> +         * otherwise the process have to exit to free hugepage.
> +         */
> +        qemu_close_all_ram_fd();
>       }
>   }
>
>