From nobody Mon May 20 19:11:41 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=1614587032; cv=none; d=zohomail.com; s=zohoarc; b=hlXcRw/QBYPobvEj83Cfz8qlY7CpBkhhwu7HTFoUYl7iWedxEijm+BMdsxN5t64a+r+gwqxL2e+PWS930FK4LMYyvtG23xrrrXoadJXjKFx4LTSSE0lDDfJSodu74EN0Bzvbex+t1jVqji6+5iSfF+OAHSyzZuRW0X0c6b/PmmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614587032; h=Content-Type:Content-Transfer-Encoding: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=gOcVD5g5D6a4hvUlVskHevwBiGc48Iv1dhJIvL2mwoQ=; b=W8KvNYgsuW6YmZ6mgKujnkwv0penfpPO4DhfpiNMuOu7zlo2DtrOuGa/bsJqqADsSqHqwaHolPrk54HHydxNpch3OPthWmXUpuumrvcJTpbXeTF/mcOE8AmvVsDqIZoMcRvU9gk56jekf+wSheC5Yxjb1X3hRg6cX5D6Tb114yo= 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 161458703258261.14817092341218; Mon, 1 Mar 2021 00:23:52 -0800 (PST) Received: from localhost ([::1]:55470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGdqJ-0002pm-J2 for importer@patchew.org; Mon, 01 Mar 2021 03:23:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGdok-0001ZY-RZ for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:22:14 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGdog-0005W8-Aa for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:22:14 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DptV269NNzMgSn; Mon, 1 Mar 2021 16:19:54 +0800 (CST) Received: from DESKTOP-6NKE0BC.china.huawei.com (10.174.185.210) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Mon, 1 Mar 2021 16:21:54 +0800 From: Kunkun Jiang To: David Edmondson , Juan Quintela , "Dr . David Alan Gilbert" , "open list:All patches CC here" Subject: [PATCH v2 1/3] migration/ram: Modify the code comment of ram_save_host_page() Date: Mon, 1 Mar 2021 16:21:30 +0800 Message-ID: <20210301082132.1107-2-jiangkunkun@huawei.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20210301082132.1107-1-jiangkunkun@huawei.com> References: <20210301082132.1107-1-jiangkunkun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.185.210] 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=jiangkunkun@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: Zenghui Yu , wanghaibin.wang@huawei.com, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The ram_save_host_page() has been modified several times since its birth. But the comment hasn't been modified as it should be. It'd better to modify the comment to explain ram_save_host_page() more clearly. Signed-off-by: Keqian Zhu Signed-off-by: Kunkun Jiang --- migration/ram.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 72143da0ac..24967cb970 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1970,15 +1970,13 @@ static int ram_save_target_page(RAMState *rs, PageS= earchStatus *pss, } =20 /** - * ram_save_host_page: save a whole host page + * ram_save_host_page: save a whole host page or the rest of a RAMBlock * - * Starting at *offset send pages up to the end of the current host - * page. It's valid for the initial offset to point into the middle of - * a host page in which case the remainder of the hostpage is sent. - * Only dirty target pages are sent. Note that the host page size may - * be a huge page for this block. - * The saving stops at the boundary of the used_length of the block - * if the RAMBlock isn't a multiple of the host page size. + * Send dirty pages between pss->page and either the end of that page + * or the used_length of the RAMBlock, whichever is smaller. + * + * Note that if the host page is a huge page, pss->page may be in the + * middle of that page. * * Returns the number of pages written or negative on error * --=20 2.23.0 From nobody Mon May 20 19:11:41 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=1614587033; cv=none; d=zohomail.com; s=zohoarc; b=JGGKBjhK+cQkkf22h8QckRc/IlcL/ihkxPWbE/RvXeWrO8M+4dH6r9gk7cBp+CHL88dvUT4dlgBK+sMoR7HburxwbeRsPI/RNe39QBt5kYZVfCMlxbYOPEem9XuJCg6NWMrYm3S2BmuvG8Tqnys9xNsc0a/OiyCWREW4iMrTTPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614587033; h=Content-Type:Content-Transfer-Encoding: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=MwsGEJtsaQeG2QmcTGA4Np1sQyVaJJc/zJVWrMXeyxQ=; b=a4o3Icv/6n7aGWmGwD6HX8hJd+OTq4l7iqkfZdaw7txaENBCqL/cN1bFiG4JXVJCgVX+ef6t8zTEzTHxpXHI8ATAECbl6B+PzuyoAZCJ1xtg27FIaSdbICE4peTtJ1JRzsiXacxLZB83wdcvY34Edrpp3WLFwAQZamd0odrVtfY= 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 1614587033897550.8747032823177; Mon, 1 Mar 2021 00:23:53 -0800 (PST) Received: from localhost ([::1]:55578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGdqK-0002sL-GO for importer@patchew.org; Mon, 01 Mar 2021 03:23:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGdok-0001ZE-0Z for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:22:14 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:3053) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGdog-0005Xz-F6 for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:22:13 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4DptW10gDVzjSlX; Mon, 1 Mar 2021 16:20:45 +0800 (CST) Received: from DESKTOP-6NKE0BC.china.huawei.com (10.174.185.210) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Mon, 1 Mar 2021 16:21:57 +0800 From: Kunkun Jiang To: David Edmondson , Juan Quintela , "Dr . David Alan Gilbert" , "open list:All patches CC here" Subject: [PATCH v2 2/3] migration/ram: Modify ram_save_host_page() to match the comment Date: Mon, 1 Mar 2021 16:21:31 +0800 Message-ID: <20210301082132.1107-3-jiangkunkun@huawei.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20210301082132.1107-1-jiangkunkun@huawei.com> References: <20210301082132.1107-1-jiangkunkun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.185.210] 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.32; envelope-from=jiangkunkun@huawei.com; helo=szxga06-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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Zenghui Yu , wanghaibin.wang@huawei.com, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" According to the comment, when the host page is a huge page, the migration_rate_limit() should be executed. If not, this function can be omitted to save time. Signed-off-by: Keqian Zhu Signed-off-by: Kunkun Jiang Reviewed-by: David Edmondson --- migration/ram.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 24967cb970..3a9115b6dc 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2014,7 +2014,9 @@ static int ram_save_host_page(RAMState *rs, PageSearc= hStatus *pss, pages +=3D tmppages; pss->page++; /* Allow rate limiting to happen in the middle of huge pages */ - migration_rate_limit(); + if (pagesize_bits > 1) { + migration_rate_limit(); + } } while ((pss->page & (pagesize_bits - 1)) && offset_in_ramblock(pss->block, ((ram_addr_t)pss->page) << TARGET_PAGE_BIT= S)); --=20 2.23.0 From nobody Mon May 20 19:11:41 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=1614587065; cv=none; d=zohomail.com; s=zohoarc; b=QizZozr6/pjvZ76C+TJC54o95aQOZairkk9pCsfZIBE6m654+SE8ugXKH5KBD7f24M2FjdZOiCqlhUKEpCrkDdpGkj/nYj9r8FaFdJF8/mHM9Q739MlPV27ZpXfT63epVuzSveYCZ9vaZfpHa9eNSHvgVg1vCyUtBFjtRCxpNsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614587065; h=Content-Type:Content-Transfer-Encoding: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=aGEeYvDrWW+tysxUQg8n7LlKIaiRj8mUSL+79Tkd36w=; b=aqKi0s3V5wuPb/xLkysZBgKfoQ59wuD6JMLHlExfUpZdPKbcBGWZelgrMtnLTT06U9gFIpxO37JFEU8v1uHhdlVSfp17E030pZe6tfdktLeGsqbE3fyShtC0/8o4pvV9EF89F6fYIu/7IH4O5cUsONaHUB6tRp+P3/ooqyytG8c= 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 1614587065121847.9857666183208; Mon, 1 Mar 2021 00:24:25 -0800 (PST) Received: from localhost ([::1]:57640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGdqq-0003jb-4K for importer@patchew.org; Mon, 01 Mar 2021 03:24:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGdoi-0001YZ-NL for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:22:13 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:3052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGdof-0005Xy-Oo for qemu-devel@nongnu.org; Mon, 01 Mar 2021 03:22:12 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4DptW10QlzzjSlK; Mon, 1 Mar 2021 16:20:45 +0800 (CST) Received: from DESKTOP-6NKE0BC.china.huawei.com (10.174.185.210) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Mon, 1 Mar 2021 16:21:59 +0800 From: Kunkun Jiang To: David Edmondson , Juan Quintela , "Dr . David Alan Gilbert" , "open list:All patches CC here" Subject: [PATCH v2 3/3] migration/ram: Optimize ram_save_host_page() Date: Mon, 1 Mar 2021 16:21:32 +0800 Message-ID: <20210301082132.1107-4-jiangkunkun@huawei.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20210301082132.1107-1-jiangkunkun@huawei.com> References: <20210301082132.1107-1-jiangkunkun@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.185.210] 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.32; envelope-from=jiangkunkun@huawei.com; helo=szxga06-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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Zenghui Yu , wanghaibin.wang@huawei.com, Keqian Zhu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Starting from pss->page, ram_save_host_page() will check every page and send the dirty pages up to the end of the current host page or the boundary of used_length of the block. If the host page size is a huge page, the step "check" will take a lot of time. This will improve performance to use migration_bitmap_find_dirty(). Signed-off-by: Keqian Zhu Signed-off-by: Kunkun Jiang --- migration/ram.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 3a9115b6dc..a1374db356 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1991,6 +1991,8 @@ static int ram_save_host_page(RAMState *rs, PageSearc= hStatus *pss, int tmppages, pages =3D 0; size_t pagesize_bits =3D qemu_ram_pagesize(pss->block) >> TARGET_PAGE_BITS; + unsigned long hostpage_boundary =3D + QEMU_ALIGN_UP(pss->page + 1, pagesize_bits); unsigned long start_page =3D pss->page; int res; =20 @@ -2002,7 +2004,7 @@ static int ram_save_host_page(RAMState *rs, PageSearc= hStatus *pss, do { /* Check the pages is dirty and if it is send it */ if (!migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { - pss->page++; + pss->page =3D migration_bitmap_find_dirty(rs, pss->block, pss-= >page); continue; } =20 @@ -2012,16 +2014,16 @@ static int ram_save_host_page(RAMState *rs, PageSea= rchStatus *pss, } =20 pages +=3D tmppages; - pss->page++; + pss->page =3D migration_bitmap_find_dirty(rs, pss->block, pss->pag= e); /* Allow rate limiting to happen in the middle of huge pages */ if (pagesize_bits > 1) { migration_rate_limit(); } - } while ((pss->page & (pagesize_bits - 1)) && + } while ((pss->page < hostpage_boundary) && offset_in_ramblock(pss->block, ((ram_addr_t)pss->page) << TARGET_PAGE_BIT= S)); - /* The offset we leave with is the last one we looked at */ - pss->page--; + /* The offset we leave with is the min boundary of host page and block= */ + pss->page =3D MIN(pss->page, hostpage_boundary) - 1; =20 res =3D ram_save_release_protection(rs, pss, start_page); return (res < 0 ? res : pages); --=20 2.23.0