From nobody Fri Dec 27 04:14:52 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=1732883066; cv=none; d=zohomail.com; s=zohoarc; b=hSwdwi7rQhTg3SzLh7Ob0HmUsy1/ct1SblRaJTlXwBwnQVfHc1ZBdAJ9FTL15LOJ4xhjZuTD4VQRQhgPmMbBOwjmGqFiHRHziiexMDz5vJeap2qfHKlffVmihduiFCH4OnR7iq/N/l3WJSXKZqdI0ofH+vh7/9ssB59ksJn7mt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732883066; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=loxp1y5XflVEKQBsEdu2yzpHVb5tV44nt7hAhklzyos=; b=bVyCg7wsILgkKUChgA3M5xeuPyv3hVsm/mPjYayYkHe1z6Vmx2RgqxusL8v+0mISPC4G/B+1wb6yrLDLvTjNnpzcmx1YuqSoXDZ6TK61uwSFtYnNy8OsaC8VdbsR2TEi7VIwgrCZHToofiWSM2+ClSIbFWUxojt2c1LGMpWNGtY= 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 1732883066086235.2120328903186; Fri, 29 Nov 2024 04:24:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tH020-0000rj-6M; Fri, 29 Nov 2024 07:23:32 -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 1tH01v-0000rG-2F for qemu-devel@nongnu.org; Fri, 29 Nov 2024 07:23:28 -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 1tH01p-0006Fl-FY for qemu-devel@nongnu.org; Fri, 29 Nov 2024 07:23:24 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-141-pZiAtIFROu2FJjgsflLVOA-1; Fri, 29 Nov 2024 07:23:16 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7566819560B5; Fri, 29 Nov 2024 12:23:15 +0000 (UTC) Received: from kaapi.redhat.com (unknown [10.67.24.141]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 56E4F195608A; Fri, 29 Nov 2024 12:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732882999; 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=loxp1y5XflVEKQBsEdu2yzpHVb5tV44nt7hAhklzyos=; b=Dv0oDdBsd5e/WuZRCta/+UD+k800mTaE5Me/hXl/L9ffrGHnKFFfMtEZTHm2mxlOmEtZY9 +pR45/WvNNtjyx1U1yg5jxGiHzEDJf37NpXbEFMu3PK52+2JKToHA1pVybJFCb8Xf3Sbfq IVmha2fUOmowgCcX3zZzbQEOjNerQZU= X-MC-Unique: pZiAtIFROu2FJjgsflLVOA-1 X-Mimecast-MFC-AGG-ID: pZiAtIFROu2FJjgsflLVOA From: Prasad Pandit To: qemu-devel@nongnu.org Cc: peterx@redhat.com, farosas@suse.de, berrange@redhat.com, Prasad Pandit Subject: [PATCH v2 2/3] migration: refactor ram_save_target_page functions Date: Fri, 29 Nov 2024 17:52:55 +0530 Message-ID: <20241129122256.96778-3-ppandit@redhat.com> In-Reply-To: <20241129122256.96778-1-ppandit@redhat.com> References: <20241129122256.96778-1-ppandit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 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.93, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1732883067995019100 Content-Type: text/plain; charset="utf-8" From: Prasad Pandit Refactor ram_save_target_page legacy and multifd functions into one. Other than simplifying it, it frees 'migration_ops' object from usage, so it is expunged. Signed-off-by: Prasad Pandit --- migration/ram.c | 67 +++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 50 deletions(-) v2: Make refactoring change independent of the multifd & postcopy change. v1: Further refactor ram_save_target_page() function to conflate save_zero_page() calls. - https://lore.kernel.org/qemu-devel/20241126115748.118683-1-ppandit@redha= t.com/T/#u v0: - https://lore.kernel.org/qemu-devel/20241029150908.1136894-1-ppandit@redh= at.com/T/#u diff --git a/migration/ram.c b/migration/ram.c index 05ff9eb328..5f97dda5f1 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -467,13 +467,6 @@ void ram_transferred_add(uint64_t bytes) } } =20 -struct MigrationOps { - int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss); -}; -typedef struct MigrationOps MigrationOps; - -MigrationOps *migration_ops; - static int ram_save_host_page_urgent(PageSearchStatus *pss); =20 /* NOTE: page is the PFN not real ram_addr_t. */ @@ -1986,55 +1979,36 @@ int ram_save_queue_pages(const char *rbname, ram_ad= dr_t start, ram_addr_t len, } =20 /** - * ram_save_target_page_legacy: save one target page - * - * Returns the number of pages written + * ram_save_target_page: save one target page to the precopy thread + * OR to multifd workers. * * @rs: current RAM state * @pss: data about the page we want to send */ -static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) +static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss) { ram_addr_t offset =3D ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; int res; =20 + if (!migrate_multifd() + || migrate_zero_page_detection() =3D=3D ZERO_PAGE_DETECTION_LEGACY= ) { + if (save_zero_page(rs, pss, offset)) { + return 1; + } + } + + if (migrate_multifd()) { + RAMBlock *block =3D pss->block; + return ram_save_multifd_page(block, offset); + } + if (control_save_page(pss, offset, &res)) { return res; } =20 - if (save_zero_page(rs, pss, offset)) { - return 1; - } - return ram_save_page(rs, pss); } =20 -/** - * ram_save_target_page_multifd: send one target page to multifd workers - * - * Returns 1 if the page was queued, -1 otherwise. - * - * @rs: current RAM state - * @pss: data about the page we want to send - */ -static int ram_save_target_page_multifd(RAMState *rs, PageSearchStatus *ps= s) -{ - RAMBlock *block =3D pss->block; - ram_addr_t offset =3D ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; - - /* - * While using multifd live migration, we still need to handle zero - * page checking on the migration main thread. - */ - if (migrate_zero_page_detection() =3D=3D ZERO_PAGE_DETECTION_LEGACY) { - if (save_zero_page(rs, pss, offset)) { - return 1; - } - } - - return ram_save_multifd_page(block, offset); -} - /* Should be called before sending a host page */ static void pss_host_page_prepare(PageSearchStatus *pss) { @@ -2121,7 +2095,7 @@ static int ram_save_host_page_urgent(PageSearchStatus= *pss) =20 if (page_dirty) { /* Be strict to return code; it must be 1, or what else? */ - if (migration_ops->ram_save_target_page(rs, pss) !=3D 1) { + if (ram_save_target_page(rs, pss) !=3D 1) { error_report_once("%s: ram_save_target_page failed", __fun= c__); ret =3D -1; goto out; @@ -2190,7 +2164,7 @@ static int ram_save_host_page(RAMState *rs, PageSearc= hStatus *pss) if (preempt_active) { qemu_mutex_unlock(&rs->bitmap_mutex); } - tmppages =3D migration_ops->ram_save_target_page(rs, pss); + tmppages =3D ram_save_target_page(rs, pss); if (tmppages >=3D 0) { pages +=3D tmppages; /* @@ -2388,8 +2362,6 @@ static void ram_save_cleanup(void *opaque) xbzrle_cleanup(); multifd_ram_save_cleanup(); ram_state_cleanup(rsp); - g_free(migration_ops); - migration_ops =3D NULL; } =20 static void ram_state_reset(RAMState *rs) @@ -3055,13 +3027,8 @@ static int ram_save_setup(QEMUFile *f, void *opaque,= Error **errp) return ret; } =20 - migration_ops =3D g_malloc0(sizeof(MigrationOps)); - if (migrate_multifd()) { multifd_ram_save_setup(); - migration_ops->ram_save_target_page =3D ram_save_target_page_multi= fd; - } else { - migration_ops->ram_save_target_page =3D ram_save_target_page_legac= y; } =20 bql_unlock(); --=20 2.47.1