From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E41DC433DB for ; Sat, 26 Dec 2020 14:08:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47AC4208A9 for ; Sat, 26 Dec 2020 14:08:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47AC4208A9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktAEh-00034I-VK for qemu-devel@archiver.kernel.org; Sat, 26 Dec 2020 09:08:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kt6u2-0002E1-Ff; Sat, 26 Dec 2020 05:34:26 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kt6tz-0004nZ-Br; Sat, 26 Dec 2020 05:34:26 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4D30X23sWGzhslr; Sat, 26 Dec 2020 18:33:22 +0800 (CST) Received: from DESKTOP-EDHIELA.china.huawei.com (10.174.187.50) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.498.0; Sat, 26 Dec 2020 18:34:02 +0800 From: g00517791 To: , Subject: [PATCH 2/8] virtio-net: Fix memory leak of vmstate_virtio_net_rss Date: Sat, 26 Dec 2020 18:33:41 +0800 Message-ID: <20201226103347.868-3-gaojinhao@huawei.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: <20201226103347.868-1-gaojinhao@huawei.com> References: <20201226103347.868-1-gaojinhao@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.174.187.50] X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.191; envelope-from=gaojinhao@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 26 Dec 2020 09:05:44 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S . Tsirkin" , Jason Wang , Stefan Berger , Greg Kurz , "Dr . David Alan Gilbert" , Juan Quintela , wanghaibin.wang@huawei.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , zhukeqian1@huawei.com, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jinhao Gao When VM migrate VMState of virtio-net-device/rss, the field(rss_data. indirections_table) of virtio-net-device/rss having a flag of VMS_ALLOC needs to allocate memory. If the dst doesn't free memory which has bee n allocated for SaveStateEntry of virtio-net-device/rss before dst loads device state, it may result that the pointer of rss_data.indirections_table is overlaid when vm loads. We add the pre_load func to free memory, which prevents memory leak. Signed-off-by: Jinhao Gao --- hw/net/virtio-net.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 044ac95f6f..102e51f32f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2957,11 +2957,22 @@ static bool virtio_net_rss_needed(void *opaque) return VIRTIO_NET(opaque)->rss_data.enabled; } +static int virtio_net_rss_pre_load(void *opaque) +{ + VirtIONet *n = VIRTIO_NET(opaque); + + g_free(n->rss_data.indirections_table); + n->rss_data.indirections_table = NULL; + n->rss_data.indirections_len = 0; + return 0; +} + static const VMStateDescription vmstate_virtio_net_rss = { .name = "virtio-net-device/rss", .version_id = 1, .minimum_version_id = 1, .needed = virtio_net_rss_needed, + .pre_load = virtio_net_rss_pre_load, .fields = (VMStateField[]) { VMSTATE_BOOL(rss_data.enabled, VirtIONet), VMSTATE_BOOL(rss_data.redirect, VirtIONet), -- 2.23.0