Received: by 2002:a19:ee0a:0:0:0:0:0 with SMTP id g10csp1116165lfb; Fri, 20 Nov 2020 00:53:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxuzhVFk/7aZkiJvMSxzL6YZ13H8wtYyOQqBVdHLuvKHxPuO8BX5SF861Hef7oWOKQRX6NE X-Received: by 2002:a25:3614:: with SMTP id d20mr15421531yba.415.1605862408266; Fri, 20 Nov 2020 00:53:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605862408; cv=none; d=google.com; s=arc-20160816; b=TRKITECC1cDxeQoQcduvEDP/kAa3BnODjBreKTFNW9uUVk3r1k/ZewFoaNAm1PI4XS bd1Hqw6xp7Xx/9uw+CWCfu8YjHTDMmF1RDWCS0YAiYUa0MjwLdT01LjpLEc8BU4hb/Zs OVf0CusKULA7gXUEz/HdInpJcOhsEjuKSFxJjjq0HB/PHx7m/c4ieCQBFxgDLSiUG11E Q0O+trUC0fNW0yNKWW1KLrqFbFDJGYl3H6dtg5RfBsYl2vJHsymJXcrQr8Q5EPuWQsq6 01APGd0/NjhL6KNtkHYt3/8XOkeOSdE31IOw3OYBm7ITwHLT0xSuzgX5V5PXO2rYx4B/ WL/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:references :in-reply-to:message-id:date:subject:to:from; bh=1eoxu7pIhcCW4LXVrp8hjlyhD4H+17Ydw+cXkM8TpN4=; b=UyP70qWXdbVj9o6Ch2qC4mgrV+9SN3thGNjrMoIGxA5u3BS+rkxvSFNcFD4M6V26tq sjYlzvBZwu8a3IZ/Fm+AHEaMDvs79RfHO3awrocgH4O7BfKQcGWeiHirWu/7bO8pMWKe 4DkT4r3H0vcVyd9/GfRCKu2XpQlfdczliCVM3IrpOnd+44gLjj8wrl9lb0gd1SfR14Pl NjwUH6ki5YXos1wGTkA9ptuqTF6huzAUxz3JndV/dpBMlVNme4VlYmL/+G+QIfmEt7Eg fWaq1D9n+HCGWfOTKUOZtMFsK5YWa8Su6ppP3T5yZd+E4apGP8ij1j1x8kaFM+qOHZtn BLEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w75si2831382ybg.315.2020.11.20.00.53.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Nov 2020 00:53:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:56480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg2AZ-0005pa-Kw for alex.bennee@linaro.org; Fri, 20 Nov 2020 03:53:27 -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 Content-Type: text/plain X-Originating-IP: [10.174.187.37] X-CFilter-Loop: Reflected 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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: LfA4nU6qWVH0 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 start, ram_addr_t length) } /* 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 = DIV_ROUND_UP(old_ram_size, DIRTY_MEMORY_BLOCK_SIZE); ram_addr_t new_num_blocks = DIV_ROUND_UP(new_ram_size, DIRTY_MEMORY_BLOCK_SIZE); + ram_addr_t cpy_num_blocks = MIN(old_num_blocks, new_num_blocks); + bool extend = new_num_blocks > old_num_blocks; int i; - /* Only need to extend if block count increased */ - if (new_num_blocks <= old_num_blocks) { + /* Only need to resize if block count changed */ + if (new_num_blocks == old_num_blocks) { return; } @@ -1839,13 +1841,23 @@ static void dirty_memory_extend(ram_addr_t old_ram_size, new_blocks = g_malloc(sizeof(*new_blocks) + sizeof(new_blocks->blocks[0]) * new_num_blocks); - 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])); } - for (j = old_num_blocks; j < new_num_blocks; j++) { - new_blocks->blocks[j] = bitmap_new(DIRTY_MEMORY_BLOCK_SIZE); + if (extend) { + for (j = old_num_blocks; j < new_num_blocks; j++) { + new_blocks->blocks[j] = bitmap_new(DIRTY_MEMORY_BLOCK_SIZE); + } + } else { + for (j = 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]); + } } 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 = MAX(old_ram_size, (new_block->offset + new_block->max_length) >> TARGET_PAGE_BITS); 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 -- 2.23.0