From nobody Thu Apr 25 16:19:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605862479; cv=none; d=zohomail.com; s=zohoarc; b=h9Zz7Fwxp8QBoWEAFb0By6na10Bq/WjZI2cftiXBFnkSQ0y34RBZ2v91shrbRXy3/HZ5eUhCvgUpw4RVIkngtGaaRQjK+2H1zMj0lAkUC3Pg3bJtX5HjUudUWacDepn97ZQNXRwsTxFwZQ01JHXB4grgRYr3SpoXmNAE1lHZDS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605862479; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1eoxu7pIhcCW4LXVrp8hjlyhD4H+17Ydw+cXkM8TpN4=; b=PRYGipLjSlpJ41jtG6STsrAjsfWJZgbzCBu4gbjRW6aGrAiTUnWvy3UIOBmXtJadwdpqPuJCgMqMzv3bn3lB3vQua8E6r4yBiGFCNiqg+hA7uMT0vJH4n33FMuUsxA1zAoANyT6NmiheeFH65O6DK2ZwH74aT9A0qgSlr42Ji4s= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605862479646888.6072283914967; Fri, 20 Nov 2020 00:54:39 -0800 (PST) Received: from localhost ([::1]:59148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg2Bh-0006vl-Py for importer@patchew.org; Fri, 20 Nov 2020 03:54:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg2AQ-0005p4-H0; Fri, 20 Nov 2020 03:53:18 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg2AN-0001V2-OC; Fri, 20 Nov 2020 03:53:18 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Ccr0W0lqXzhdXH; Fri, 20 Nov 2020 16:52:43 +0800 (CST) Received: from DESKTOP-5IS4806.china.huawei.com (10.174.187.37) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Fri, 20 Nov 2020 16:52:52 +0800 From: Keqian Zhu To: , Paolo Bonzini , "Dr . David Alan Gilbert" Subject: [RFC PATCH 1/2] ramlist: Make dirty bitmap blocks of ramlist resizable Date: Fri, 20 Nov 2020 16:51:56 +0800 Message-ID: <20201120085157.7136-2-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20201120085157.7136-1-zhukeqian1@huawei.com> References: <20201120085157.7136-1-zhukeqian1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.37] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=zhukeqian1@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-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: wanghaibin.wang@huawei.com, qemu-arm@nongnu.org, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When we remove a ramblock, we should decrease the dirty bitmap blocks of ramlist to avoid memory leakage. This patch rebuilds dirty_memory_ extend to support both "extend" and "decrease". Signed-off-by: Keqian Zhu --- softmmu/physmem.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 3027747c03..f6ff78378e 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1816,17 +1816,19 @@ void qemu_ram_msync(RAMBlock *block, ram_addr_t sta= rt, ram_addr_t length) } =20 /* Called with ram_list.mutex held */ -static void dirty_memory_extend(ram_addr_t old_ram_size, +static void dirty_bitmap_resize(ram_addr_t old_ram_size, ram_addr_t new_ram_size) { ram_addr_t old_num_blocks =3D DIV_ROUND_UP(old_ram_size, DIRTY_MEMORY_BLOCK_SIZE); ram_addr_t new_num_blocks =3D DIV_ROUND_UP(new_ram_size, DIRTY_MEMORY_BLOCK_SIZE); + ram_addr_t cpy_num_blocks =3D MIN(old_num_blocks, new_num_blocks); + bool extend =3D new_num_blocks > old_num_blocks; int i; =20 - /* Only need to extend if block count increased */ - if (new_num_blocks <=3D old_num_blocks) { + /* Only need to resize if block count changed */ + if (new_num_blocks =3D=3D old_num_blocks) { return; } =20 @@ -1839,13 +1841,23 @@ static void dirty_memory_extend(ram_addr_t old_ram_= size, new_blocks =3D g_malloc(sizeof(*new_blocks) + sizeof(new_blocks->blocks[0]) * new_num_bloc= ks); =20 - if (old_num_blocks) { + if (cpy_num_blocks) { memcpy(new_blocks->blocks, old_blocks->blocks, - old_num_blocks * sizeof(old_blocks->blocks[0])); + cpy_num_blocks * sizeof(old_blocks->blocks[0])); } =20 - for (j =3D old_num_blocks; j < new_num_blocks; j++) { - new_blocks->blocks[j] =3D bitmap_new(DIRTY_MEMORY_BLOCK_SIZE); + if (extend) { + for (j =3D old_num_blocks; j < new_num_blocks; j++) { + new_blocks->blocks[j] =3D bitmap_new(DIRTY_MEMORY_BLOCK_SI= ZE); + } + } else { + for (j =3D cpy_num_blocks; j < old_num_blocks; j++) { + /* + * We are safe to free it here, for that its RAMblock + * is out-of-use. + */ + g_free(old_blocks->blocks[j]); + } } =20 qatomic_rcu_set(&ram_list.dirty_memory[i], new_blocks); @@ -1894,7 +1906,7 @@ static void ram_block_add(RAMBlock *new_block, Error = **errp, bool shared) new_ram_size =3D MAX(old_ram_size, (new_block->offset + new_block->max_length) >> TARGET_PAGE_B= ITS); if (new_ram_size > old_ram_size) { - dirty_memory_extend(old_ram_size, new_ram_size); + dirty_bitmap_resize(old_ram_size, new_ram_size); } /* Keep the list sorted from biggest to smallest block. Unlike QTAILQ, * QLIST (which has an RCU-friendly variant) does not have insertion at --=20 2.23.0 From nobody Thu Apr 25 16:19:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605862645; cv=none; d=zohomail.com; s=zohoarc; b=ax2agg6NLZVeCTmEuWLQm8q6a7mwNjd8jpnLImMBBo6S3LSiqK+AoakbUtry8Ry4p7rGZ0XmhPGIxsODFutYcK4qahhbJ5+ZPv34r5ZPpERRrUkhvMFAHt3Qo2UfS/Rzj2WcoFP1RBnPxL7gkdm4cEi4Iu2l0nSVXaON2Hcdack= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605862645; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QJVEt1Sb/Y2mqI5Z8hNBHjHUki/iQBkRi0p0tC3pPIs=; b=U04KNnKgB2bCfKg+8dsACBLpURBJ6/f0DfFyJiQOtlpcqZPZABDh+jAI+Ley3hdphEebAfT3dMZZWPu7PT1wSfzDHy1hM+X33D00KwaemjrJseabANO/9M44g8275qhmz//tkIUZf24LOgtxFCgKte69XAzHEnKpWz0bwldS4Do= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605862645878468.97774884497846; Fri, 20 Nov 2020 00:57:25 -0800 (PST) Received: from localhost ([::1]:36334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg2EN-0000td-1T for importer@patchew.org; Fri, 20 Nov 2020 03:57:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg2AQ-0005p2-Ex; Fri, 20 Nov 2020 03:53:18 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg2AN-0001Uj-Oh; Fri, 20 Nov 2020 03:53:17 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Ccr0W0Yh1zhdXB; Fri, 20 Nov 2020 16:52:43 +0800 (CST) Received: from DESKTOP-5IS4806.china.huawei.com (10.174.187.37) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Fri, 20 Nov 2020 16:52:52 +0800 From: Keqian Zhu To: , Paolo Bonzini , "Dr . David Alan Gilbert" Subject: [RFC PATCH 2/2] ramlist: Resize dirty bitmap blocks after remove ramblock Date: Fri, 20 Nov 2020 16:51:57 +0800 Message-ID: <20201120085157.7136-3-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20201120085157.7136-1-zhukeqian1@huawei.com> References: <20201120085157.7136-1-zhukeqian1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.37] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=zhukeqian1@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-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: wanghaibin.wang@huawei.com, qemu-arm@nongnu.org, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the new "dirty_bitmap_resize" interface to reduce dirty bitmap blocks after we remove a ramblock from ramlist. Signed-off-by: Keqian Zhu --- softmmu/physmem.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index f6ff78378e..2a17e0a89a 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2131,6 +2131,8 @@ static void reclaim_ramblock(RAMBlock *block) =20 void qemu_ram_free(RAMBlock *block) { + ram_addr_t old_ram_size, new_ram_size; + if (!block) { return; } @@ -2140,12 +2142,18 @@ void qemu_ram_free(RAMBlock *block) } =20 qemu_mutex_lock_ramlist(); + + old_ram_size =3D last_ram_page(); QLIST_REMOVE_RCU(block, next); + new_ram_size =3D last_ram_page(); + dirty_bitmap_resize(old_ram_size, new_ram_size); + ram_list.mru_block =3D NULL; /* Write list before version */ smp_wmb(); ram_list.version++; call_rcu(block, reclaim_ramblock, rcu); + qemu_mutex_unlock_ramlist(); } =20 --=20 2.23.0