From nobody Sun May 19 00:47:44 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; dmarc=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1615899577; cv=none; d=zohomail.com; s=zohoarc; b=icmgx8T29X4LHERK1Prs+qiWVoeuH6Btq9nCCGihE0M4eBuIBVbfUq61UzPDwgpgD/a2MAWoP3C3e1xoNzWHMaDyU1oA5WIfN8nPXT678l8xqmBbF0Y0LB4NgUEoVsH6vBbLeVLUf8aiZpqXZtykUDhf90zjta2GPQNwcStxeSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615899577; 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=7PHD/Ld/txDZ5PB9+DBJhB9cZxbjmzGv+wI4e0re8y4=; b=QnXRqfdRP9ruycXeaaSMf4gDLlGz7755ZT7oxdzJzHVOr6hP5Ub38RB+B0Zk6Ao2czZBAT52sUe6xKJWahlbLexiHYkQK1C+aBfMKpSmpVNvpnyWwyL40j73QEYd165EBQpP6EUiVZ8VuUzuywS2DZgm4RO04fgkIC7mTOn/WzE= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615899577179786.8263904507904; Tue, 16 Mar 2021 05:59:37 -0700 (PDT) Received: from localhost ([::1]:45860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM9IO-0000S4-3i for importer@patchew.org; Tue, 16 Mar 2021 08:59:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM9HC-0007rS-SD for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:58:22 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4302) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM9HA-000170-V1 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:58:22 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4F0CvW6r3xzmXly; Tue, 16 Mar 2021 20:55:51 +0800 (CST) Received: from DESKTOP-6NKE0BC.china.huawei.com (10.174.185.210) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Tue, 16 Mar 2021 20:58:04 +0800 From: Kunkun Jiang To: David Edmondson , Peter Xu , Juan Quintela , "Dr . David Alan Gilbert" , Andrey Gruzdev , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alexey Romko , "open list:All patches CC here" Subject: [PATCH v4 1/2] migration/ram: Reduce unnecessary rate limiting Date: Tue, 16 Mar 2021 20:57:15 +0800 Message-ID: <20210316125716.1243-2-jiangkunkun@huawei.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20210316125716.1243-1-jiangkunkun@huawei.com> References: <20210316125716.1243-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.190; envelope-from=jiangkunkun@huawei.com; helo=szxga04-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.001, RCVD_IN_MSPIKE_WL=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" When the host page is a huge page and something is sent in the current iteration, migration_rate_limit() should be executed. If not, it can be omitted. Signed-off-by: Keqian Zhu Signed-off-by: Kunkun Jiang Reviewed-by: David Edmondson Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 72143da0ac..3eb5b0d7a7 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2015,8 +2015,13 @@ static int ram_save_host_page(RAMState *rs, PageSear= chStatus *pss, =20 pages +=3D tmppages; pss->page++; - /* Allow rate limiting to happen in the middle of huge pages */ - migration_rate_limit(); + /* + * Allow rate limiting to happen in the middle of huge pages if + * something is sent in the current iteration. + */ + if (pagesize_bits > 1 && tmppages > 0) { + 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 Sun May 19 00:47:44 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; dmarc=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1615899773; cv=none; d=zohomail.com; s=zohoarc; b=L2VYNIdPBArz0Q8RogfVJ+VGy9WPQl/xoFtylHbUMFWOMOhokTDbyKOv2y9YhM23lPGjys9LFhSrcd9dFyopav8G2hEII3+9DsbAcSy/V5xbXzOsdtt8WmaTjC9YaWahXLjg57FRLzSi0Mze9bShd0N/eApFhqcP6isHR1G34EY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615899773; 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=4xTndaWcIY5waYD9o+DEIEJlVlAaF9BYZVQ8O3NmXJU=; b=BmvOhbMQj4m/RWI8t3c24Ef9U9FaXTbQHBFrT6gowAhoisYhjGIJ4i8JNrBk8pLmbi5KpNoV/9+OD3gmcG/nUpc1Je1h8iNwopy44+Y/UyW8QdhDKaaCeCx7gKucyW7HIZX347LFMqsNwQcc5Ncrv7ESWSMpa5w9NscHhgFCttY= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615899773332229.98552605073985; Tue, 16 Mar 2021 06:02:53 -0700 (PDT) Received: from localhost ([::1]:49696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM9LW-0002HK-8V for importer@patchew.org; Tue, 16 Mar 2021 09:02:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM9HB-0007px-Kr for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:58:21 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM9H8-000171-L7 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 08:58:21 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4F0CvX02jFzmYB0; Tue, 16 Mar 2021 20:55:52 +0800 (CST) Received: from DESKTOP-6NKE0BC.china.huawei.com (10.174.185.210) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Tue, 16 Mar 2021 20:58:07 +0800 From: Kunkun Jiang To: David Edmondson , Peter Xu , Juan Quintela , "Dr . David Alan Gilbert" , Andrey Gruzdev , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Alexey Romko , "open list:All patches CC here" Subject: [PATCH v4 2/2] migration/ram: Optimize ram_save_host_page() Date: Tue, 16 Mar 2021 20:57:16 +0800 Message-ID: <20210316125716.1243-3-jiangkunkun@huawei.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20210316125716.1243-1-jiangkunkun@huawei.com> References: <20210316125716.1243-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.190; envelope-from=jiangkunkun@huawei.com; helo=szxga04-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.001, RCVD_IN_MSPIKE_WL=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" 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. It will improve performance to use migration_bitmap_find_dirty(). Tested on Kunpeng 920; VM parameters: 1U 4G (page size 1G) The time of ram_save_host_page() in the last round of ram saving: before optimize: 9250us after optimize: 34us Signed-off-by: Keqian Zhu Signed-off-by: Kunkun Jiang Reviewed-by: Peter Xu --- migration/ram.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 3eb5b0d7a7..1d9c24aa85 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1993,6 +1993,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 @@ -2003,30 +2005,27 @@ static int ram_save_host_page(RAMState *rs, PageSea= rchStatus *pss, =20 do { /* Check the pages is dirty and if it is send it */ - if (!migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { - pss->page++; - continue; - } - - tmppages =3D ram_save_target_page(rs, pss, last_stage); - if (tmppages < 0) { - return tmppages; - } + if (migration_bitmap_clear_dirty(rs, pss->block, pss->page)) { + tmppages =3D ram_save_target_page(rs, pss, last_stage); + if (tmppages < 0) { + return tmppages; + } =20 - pages +=3D tmppages; - pss->page++; - /* - * Allow rate limiting to happen in the middle of huge pages if - * something is sent in the current iteration. - */ - if (pagesize_bits > 1 && tmppages > 0) { - migration_rate_limit(); + pages +=3D tmppages; + /* + * Allow rate limiting to happen in the middle of huge pages if + * something is sent in the current iteration. + */ + if (pagesize_bits > 1 && tmppages > 0) { + migration_rate_limit(); + } } - } while ((pss->page & (pagesize_bits - 1)) && + pss->page =3D migration_bitmap_find_dirty(rs, pss->block, pss->pag= e); + } 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