From nobody Tue May 14 20:07:57 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=1675945614; cv=none; d=zohomail.com; s=zohoarc; b=cFDmgjFPCdZFKYkpZZZ8b4XX4u8fvGm9OnA98/+8C7V9x9kz/NWTC6BifNQB6EpDWXArkn3wLvT6aBq00E2dqecxQNfWMnv0F9yNuPthWIR7rWWX+WUn/WkQqP8cl0BwvlUB8mPTm8bO1fsa1hfq82MjmUy61qHA5rguroIuCos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675945614; 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=V8w5Ka0ybNaD15mAS2C68Hr2HUUwCdDnDVr6HYyi6ik=; b=Wsxnm3pwzkHmHi/txkezTp2yIAPw8mNQcJ83wDA/MOPPUNNDmQ807f2On8gBWm5xP48rYIottHnLjbwgEmIfr01LFJwgbWbTuXIM+oQyfJMSLKDAxmRPjFDCSqRGQPa9yblS+Brexthw06gEMpcM2SjzhKI6fJAJzt4Z4BX3ToA= 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 1675945614785301.181644984394; Thu, 9 Feb 2023 04:26:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ60L-0005t8-4z; Thu, 09 Feb 2023 07:26:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQ60H-0005sI-Jj for qemu-devel@nongnu.org; Thu, 09 Feb 2023 07:26:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQ60F-00052K-U5 for qemu-devel@nongnu.org; Thu, 09 Feb 2023 07:26:17 -0500 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-471-3ul6gQIpOIOepflmirNMoQ-1; Thu, 09 Feb 2023 07:26:13 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4374E811E6E for ; Thu, 9 Feb 2023 12:26:13 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id A53D32166B29; Thu, 9 Feb 2023 12:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675945574; 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=V8w5Ka0ybNaD15mAS2C68Hr2HUUwCdDnDVr6HYyi6ik=; b=UUiyBEWk83foNm3RRdeO996x2Q5Efp4IWRoNxEnogSZN/njXtEByZWk2rVffWXQY4wrmou xW5rEWqJQQ/9YGa+CdLS8Mg4xBYir8FYYkg93rO6PAPqSkF2ZMf0+7xmd+PTnGgE+t+f5W nkDD8oeG0KTcwdpv4VYfGDSapn/NuGY= X-MC-Unique: 3ul6gQIpOIOepflmirNMoQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Juan Quintela Subject: [PATCH v4 1/2] migration: Split ram_bytes_total_common() in two functions Date: Thu, 9 Feb 2023 13:26:09 +0100 Message-Id: <20230209122610.30712-2-quintela@redhat.com> In-Reply-To: <20230209122610.30712-1-quintela@redhat.com> References: <20230209122610.30712-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675945616482100003 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Reindent to make Phillipe happy (and CODING_STYLE) --- migration/ram.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index b966e148c2..70d907b524 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2596,28 +2596,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) @@ -3222,7 +3224,8 @@ static int ram_save_setup(QEMUFile *f, void *opaque) (*rsp)->pss[RAM_CHANNEL_PRECOPY].pss_channel =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_MEM_SIZE); =20 RAMBLOCK_FOREACH_MIGRATABLE(block) { qemu_put_byte(f, strlen(block->idstr)); --=20 2.39.1 From nobody Tue May 14 20:07:57 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=1675945631; cv=none; d=zohomail.com; s=zohoarc; b=A5nN+o7CCk7OQnyMSpZSJKbE18FqJezNrxEaurfdSzTw8bFyvwU2ZaZxgFLPxGJLg+rsUxq3qUMes7rw87ITXTlIshzboj2qLle+UOJaHZYmE2nRATqsdTqMA4hSRd7HK3Dwa73A71FD+yGRBzB0jBw06MxgtINeOWbiieV98nM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675945631; 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=KRtMech7tMvOsZcwcrIdFM+19xc5plbprMzNdQCJqlc=; b=Khj82eaPTaPO3lAdrdE4THeUvFEom93EDW5CoU71if3G85R/RYSMWlluX1WMA7Vb9g9/igor/GGHkJQA/GmsV9+M1icrvpAjel2NPbF/Uh3CNQxBMfzKaoAxF+spEM+LPOsLKMub7tS+an7kBS+xKF/qaECTRxsSlC6cbrbZ5BU= 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 167594563174948.74060240993094; Thu, 9 Feb 2023 04:27:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ60M-0005tS-La; Thu, 09 Feb 2023 07:26:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQ60I-0005sR-0U for qemu-devel@nongnu.org; Thu, 09 Feb 2023 07:26:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQ60G-00052O-Jf for qemu-devel@nongnu.org; Thu, 09 Feb 2023 07:26:17 -0500 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-385-uf02dnQ7MEGVXew0reL2oQ-1; Thu, 09 Feb 2023 07:26:14 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4961B380606E; Thu, 9 Feb 2023 12:26:14 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8822A2166B29; Thu, 9 Feb 2023 12:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675945576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KRtMech7tMvOsZcwcrIdFM+19xc5plbprMzNdQCJqlc=; b=YWbcCqA+dvTBq4ZtvYgsEhlIa4Pkfy3HLRAG/MErYdGBjxyMa93DgSQpE3sms3uk0WhWfl Y553DdpgAliQejDtDFkzbOwjorj3dc4L05kqHtamjUM4tiCHgwwgZuDe2BkWcznzlCiaOy kb1TVQA87d8hlT8WPJ6l6cSNy91LgxM= X-MC-Unique: uf02dnQ7MEGVXew0reL2oQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Juan Quintela , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/2] migration: Calculate ram size once Date: Thu, 9 Feb 2023 13:26:10 +0100 Message-Id: <20230209122610.30712-3-quintela@redhat.com> In-Reply-To: <20230209122610.30712-1-quintela@redhat.com> References: <20230209122610.30712-1-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675945632329100001 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- migration/ram.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 70d907b524..0d92ea6699 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -330,6 +330,8 @@ struct RAMState { PageSearchStatus pss[RAM_CHANNEL_MAX]; /* 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 dirty target page we have sent */ @@ -2545,7 +2547,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 @@ -3004,13 +3006,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.39.1