From nobody Tue May 14 16:14:29 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=1652224755; cv=none; d=zohomail.com; s=zohoarc; b=Bu72V/Y2pLYVTquJu82kFiv/xmbeBrmLKxUeUjOadGCr31m6zNkPJ3jBMiLN5jDt7HNPG5l+g+uC19R75vGlLP+wgZYfCFUYIISXjalx9Iaotly9q/gNxixZOo+MveCPeXgbTVfaqu1h+KNpVb1efk8ntfym2tNHhM8I/kP1rFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652224755; 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=C3PhERB/Qd47X3D+Dfp1vJsPqLtsrfRafbeH2AAOHKU=; b=TFhspGauXLX09+3VlTd9vFr+EQKrG1RtZWlLa9hbH4RyF0PQ/1vK+kOPn6SwrBE8LnbI4OB0yPCK4pYLLUhnsBH6Al65yzm8fQaVKqQRqzBZ9S5KFUR0V3n6plGzxg9b9vlg+iovJTu903Ur2+FhTIcU18vKdhaVz0HWQAA1ni8= 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 1652224755149840.4369011206988; Tue, 10 May 2022 16:19:15 -0700 (PDT) Received: from localhost ([::1]:51480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noZ8L-0002BK-SI for importer@patchew.org; Tue, 10 May 2022 19:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noZ6S-0000AR-8U for qemu-devel@nongnu.org; Tue, 10 May 2022 19:17:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noZ6P-0002de-LR for qemu-devel@nongnu.org; Tue, 10 May 2022 19:17:15 -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-595-Q8QLM7fHM4-wdIP8kWKWxg-1; Tue, 10 May 2022 19:17:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0AC1A185A7A4 for ; Tue, 10 May 2022 23:17:11 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C62940D0161; Tue, 10 May 2022 23:17:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652224632; 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=C3PhERB/Qd47X3D+Dfp1vJsPqLtsrfRafbeH2AAOHKU=; b=jNHkQBkr1h8m0OOKIkb2mZrfgZ/jXjGXXrkvIjUUtVkNdUkGTW/pwEJN1XqbML/COCzu2t YrU+lwT345/DWsGSxQZxK59dwgQMqH9wz2mqXtR58acDhgsw4H0wCenUfUqJMIBzq/mCm8 nKh0MLwcgzm3Db6NSI7I2PBZmpKtEgs= X-MC-Unique: Q8QLM7fHM4-wdIP8kWKWxg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela Subject: [PATCH 1/2] migration: Split ram_bytes_total_common() in two functions Date: Wed, 11 May 2022 01:17:07 +0200 Message-Id: <20220510231708.7197-2-quintela@redhat.com> In-Reply-To: <20220510231708.7197-1-quintela@redhat.com> References: <20220510231708.7197-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_LOW=-0.7, 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: 1652224756416100004 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 a2489a2699..b3fa3d5d8f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2304,28 +2304,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) @@ -2924,7 +2926,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.35.1 From nobody Tue May 14 16:14:29 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=1652224754; cv=none; d=zohomail.com; s=zohoarc; b=boiiMp+f08la3eAVSsKr4N7pGqPLECtWJdAMDCnYG/dGv8b0GF1sllSeD4RAflvablUfWnKMoKBUNYKVu/iwbfXqwAnqQGH1DO6iCRzAw8hla9/CBjo+tc3zvbrZ1nZIHUyF9n3TtiK3Qp1xyRgwV8H+NOEkvoDkj+LvBT7xV5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652224754; 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=MVSO5fDmF35iY5/iq6x7YAuPAHtDHLngIRTSCBRYbOI=; b=GU/N/XIQhAmNDn0pYc42eQheSEXyaVjpxict/f5OsVLInxzRNf5VSnyFLa7t/x5nJwt3BTzpKtDjptG7bmv+WfPy0oc++mKrYJhxoIlSF3IfI/wVeRfPPyOKmoYPGRDthQZbsu8hZ6peXRBZ3XjXFm5KwAxHXToT4NDw9bETfmM= 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 1652224754779637.8845582326593; Tue, 10 May 2022 16:19:14 -0700 (PDT) Received: from localhost ([::1]:51580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noZ8L-0002G1-MP for importer@patchew.org; Tue, 10 May 2022 19:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noZ6U-0000Ak-0h for qemu-devel@nongnu.org; Tue, 10 May 2022 19:17:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noZ6Q-0002dn-W9 for qemu-devel@nongnu.org; Tue, 10 May 2022 19:17:16 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-261-3YeT8KZgOUKgzYDbhp51pg-1; Tue, 10 May 2022 19:17:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C55EC1C05195 for ; Tue, 10 May 2022 23:17:12 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51CF840D0161; Tue, 10 May 2022 23:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652224634; 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=MVSO5fDmF35iY5/iq6x7YAuPAHtDHLngIRTSCBRYbOI=; b=HRq+PqL4rMe5u4Bpz7r+VmiZfRQO9hgKEMQT35tWchnrxO8eD7VwBUOjucLpev9zqoDI+E 7ajclOpNCpC3UD8BwLiB6SeSmUK45CuvVOaEgNTcNsYuKj+MshqWd84TKgg45z1dwZQnf7 2Y20NV4ZmFl/238DscyePNlJB2hCVwg= X-MC-Unique: 3YeT8KZgOUKgzYDbhp51pg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela Subject: [PATCH 2/2] migration: Calculate ram size once Date: Wed, 11 May 2022 01:17:08 +0200 Message-Id: <20220510231708.7197-3-quintela@redhat.com> In-Reply-To: <20220510231708.7197-1-quintela@redhat.com> References: <20220510231708.7197-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_LOW=-0.7, 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: 1652225657508100001 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 b3fa3d5d8f..5d415834e5 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -301,6 +301,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 */ @@ -2259,7 +2261,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 @@ -2707,13 +2709,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.35.1