From nobody Sat May 18 14:10:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659010361; cv=none; d=zohomail.com; s=zohoarc; b=a86K+gIpnIwuO9pBltoGyfqACpr7TMW44GOjq37FeHkiA7puftTmRL5axC2iTbflKbhhQUvVkKvNhal5mhZ+uySMEGysByO2QvIeMPleKw+9pYHaJirVSDsmWCm7xd1a5Hx1T23oiJpAJ+umHbwSzqR6jdYCWiUe7YnTSXB7pzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659010361; h=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=UW2v1hdObXcPQf63vJd+aoRP3AtFIHpRVXrGLzChD4I=; b=kNxfXsMfEnOLfgsDnUUxf92sTHWPDBicL5Q1k/Dy1xWNr5Bwldo1H04rImER4ry9vbzAgDkr+m3A/MXUK9jKnF5rv/hHBVigUOdbY5P7B9F3kWIU7f9jFj25Hq7ucU2JRVN7kvWTyiXVouGUURh/zom5s05eaJtdBRrGt+slxbk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659010361873915.9959265367505; Thu, 28 Jul 2022 05:12:41 -0700 (PDT) Received: from localhost ([::1]:39966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oH2Nc-0008RA-2f for importer@patchew.org; Thu, 28 Jul 2022 08:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH2IQ-000131-ES for qemu-devel@nongnu.org; Thu, 28 Jul 2022 08:07:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56485) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH2IN-0005h2-FS for qemu-devel@nongnu.org; Thu, 28 Jul 2022 08:07:16 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-EsiZnpXcNmuG1wK8-9w1eQ-1; Thu, 28 Jul 2022 08:07:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0F139801585 for ; Thu, 28 Jul 2022 12:07:12 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C13E1415118; Thu, 28 Jul 2022 12:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659010033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UW2v1hdObXcPQf63vJd+aoRP3AtFIHpRVXrGLzChD4I=; b=DyOL57xZ8XUnm3bkGwvHtrDiiTUHs5Q1ihcpK/fVLYNUbjKZrxJb3orEmZUtVrAMUiiOsb i8BIdnNRMr8PlfrLRahTjh12Ky/9G0Es/2Zcs9Kfg4RnVWpu0q6ncfojnNUQP1ghth/w9D vhK14vMUW0CjtmuXka4ubGPGF9Tw43c= X-MC-Unique: EsiZnpXcNmuG1wK8-9w1eQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , "Dr. David Alan Gilbert" Subject: [PATCH v2 1/2] migration: Split ram_bytes_total_common() in two functions Date: Thu, 28 Jul 2022 14:07:08 +0200 Message-Id: <20220728120709.5782-2-quintela@redhat.com> In-Reply-To: <20220728120709.5782-1-quintela@redhat.com> References: <20220728120709.5782-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659010363918100001 Content-Type: text/plain; charset="utf-8" It is just a big if in the middle of the function, and we need two functions anways. Signed-off-by: Juan Quintela --- migration/ram.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index b94669ba5d..96a2b848da 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2581,28 +2581,30 @@ void acct_update_position(QEMUFile *f, size_t size,= bool zero) } } =20 -static uint64_t ram_bytes_total_common(bool count_ignored) +static uint64_t ram_bytes_total_with_ignored(void) { RAMBlock *block; uint64_t total =3D 0; =20 RCU_READ_LOCK_GUARD(); =20 - if (count_ignored) { - RAMBLOCK_FOREACH_MIGRATABLE(block) { - total +=3D block->used_length; - } - } else { - RAMBLOCK_FOREACH_NOT_IGNORED(block) { - total +=3D block->used_length; - } + RAMBLOCK_FOREACH_MIGRATABLE(block) { + total +=3D block->used_length; } return total; } =20 uint64_t ram_bytes_total(void) { - return ram_bytes_total_common(false); + RAMBlock *block; + uint64_t total =3D 0; + + RCU_READ_LOCK_GUARD(); + + RAMBLOCK_FOREACH_NOT_IGNORED(block) { + total +=3D block->used_length; + } + return total; } =20 static void xbzrle_load_setup(void) @@ -3204,7 +3206,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) (*rsp)->f =3D f; =20 WITH_RCU_READ_LOCK_GUARD() { - qemu_put_be64(f, ram_bytes_total_common(true) | RAM_SAVE_FLAG_MEM_= SIZE); + qemu_put_be64(f, ram_bytes_total_with_ignored() | RAM_SAVE_FLAG_ME= M_SIZE); =20 RAMBLOCK_FOREACH_MIGRATABLE(block) { qemu_put_byte(f, strlen(block->idstr)); --=20 2.37.1 From nobody Sat May 18 14:10:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659010510; cv=none; d=zohomail.com; s=zohoarc; b=L4fey6XhKTN+hQfAy6Wb/3cpVXF/VPg7SQqMxYNIeEDposFW2BTjqyHmaRvw6hdl9VNGKccluXKZA4wrHuR5Uu+PTkHAL/T3lVkxkDggKy46qrr0u+7FavUSJ169qI+E4iTaADRxB9C2fe6gce2koYvixqjFMKsrGvTFKP8FOg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659010510; h=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=/c2/uZ77y+JMXOJP/6eDiidcsuj0NJJxrBV9uqPR+60=; b=X0yJpbWPV4jhqkPMiZ8V52F2VkMnOK+tQbnmatopEM3fOz7ZmjwED1bjNacWCPswCP9+DnHOWJwsxYkklM32hY7xUih1CtnrP/y27+IzYz3efY0CeI19UAWtm8v5o6qWOQCXQPo8mLIdYH6FAQ+p348clyTBlnxhx9wL8VyZ4d4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659010510645981.52373706465; Thu, 28 Jul 2022 05:15:10 -0700 (PDT) Received: from localhost ([::1]:44680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oH2Q1-00038Y-RO for importer@patchew.org; Thu, 28 Jul 2022 08:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH2IR-000128-Er for qemu-devel@nongnu.org; Thu, 28 Jul 2022 08:07:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH2IN-0005hG-9J for qemu-devel@nongnu.org; Thu, 28 Jul 2022 08:07:16 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-454-NNXbSnmxPfuKxbDCFQYkCA-1; Thu, 28 Jul 2022 08:07:13 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3309A85A58A for ; Thu, 28 Jul 2022 12:07:13 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5649F1415118; Thu, 28 Jul 2022 12:07:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659010034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/c2/uZ77y+JMXOJP/6eDiidcsuj0NJJxrBV9uqPR+60=; b=CJhR1MK+GnTqTvLKfFbfPG6cqXsBxMq4sAkMGAwefMfDSskr3z8zvjouSr4PRz+qX1OujC cOH6V4tbvEIMH41zfYpapQ+baR1+fYMoTbkQ6XFDIePBSoWKRRnt9Lnmwtvp2emGjoPHVv 9JWlHnAYUgSGEVwqcVscE4PKkn43czA= X-MC-Unique: NNXbSnmxPfuKxbDCFQYkCA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , "Dr. David Alan Gilbert" Subject: [PATCH v2 2/2] migration: Calculate ram size once Date: Thu, 28 Jul 2022 14:07:09 +0200 Message-Id: <20220728120709.5782-3-quintela@redhat.com> In-Reply-To: <20220728120709.5782-1-quintela@redhat.com> References: <20220728120709.5782-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659010524095100001 Content-Type: text/plain; charset="utf-8" We are recalculating ram size continously, when we know that it don't change during migration. Create a field in RAMState to track it. Signed-off-by: Juan Quintela --- migration/ram.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 96a2b848da..7bb4efd470 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -316,6 +316,8 @@ struct RAMState { QEMUFile *f; /* UFFD file descriptor, used in 'write-tracking' migration */ int uffdio_fd; + /* total ram size in bytes */ + uint64_t ram_bytes_total; /* Last block that we have visited searching for dirty pages */ RAMBlock *last_seen_block; /* Last block from where we have sent data */ @@ -2527,7 +2529,7 @@ static int ram_find_and_save_block(RAMState *rs) bool again, found; =20 /* No dirty page as there is zero RAM */ - if (!ram_bytes_total()) { + if (!rs->ram_bytes_total) { return pages; } =20 @@ -2986,13 +2988,14 @@ static int ram_state_init(RAMState **rsp) qemu_mutex_init(&(*rsp)->bitmap_mutex); qemu_mutex_init(&(*rsp)->src_page_req_mutex); QSIMPLEQ_INIT(&(*rsp)->src_page_requests); + (*rsp)->ram_bytes_total =3D ram_bytes_total(); =20 /* * Count the total number of pages used by ram blocks not including any * gaps due to alignment or unplugs. * This must match with the initial values of dirty bitmap. */ - (*rsp)->migration_dirty_pages =3D ram_bytes_total() >> TARGET_PAGE_BIT= S; + (*rsp)->migration_dirty_pages =3D (*rsp)->ram_bytes_total >> TARGET_PA= GE_BITS; ram_state_reset(*rsp); =20 return 0; --=20 2.37.1