From nobody Mon Feb 9 13:37:25 2026 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692210558; cv=none; d=zohomail.com; s=zohoarc; b=aXUzChDVIULTKKviVKRKWxlFPR+fegLLT18f7m4bWIXS8tjA1zf2+/HPtx8Hn8TPwCxEYKG9Rao3xdb0aO/a7Qey6+HrGHBD3brqyvoT+jIHWDlZE6755Tkn7a6ZmWkPLXfkgXZtia6N9e+H2l/oVibkAPYaADCj3dBM1MpoD84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692210558; 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=CK37aAq4zqbVberK1XtRAZz+iCcsToYXR2C9s0mTBXE=; b=fdNBSpt3YDIpDZlHXO6Dx4ZP5tVbnXnwIpEExKeWj83xWAdMsjRWzRTeTt2c3GDw703dCS8u8aEtggg0iVhORew9o+ZiXVwGaflewYqkq4MkpnoZjUFSoaJHbVoxfIdqIET309+3USAmtBDKZ65TUZobHH78ZZaQ4h7tgtRr8Lk= 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 169221055845326.5080817948716; Wed, 16 Aug 2023 11:29:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWLFs-0003oC-Oz; Wed, 16 Aug 2023 14:28:28 -0400 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 1qWLFq-0003nZ-Ko for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:26 -0400 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWLFo-0006oE-3g for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:26 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 10BE821887; Wed, 16 Aug 2023 18:28:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B6B21133F2; Wed, 16 Aug 2023 18:28:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sDrmH0UV3WTxbQAAMHmgww (envelope-from ); Wed, 16 Aug 2023 18:28:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692210503; h=from:from:reply-to: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=CK37aAq4zqbVberK1XtRAZz+iCcsToYXR2C9s0mTBXE=; b=O0FYZtJDm5I3J8wT1Kd1t9SnviIDomfGr5qNI8TP18Q7c64f8IYdt/6x7SVZLf3v3A52QF ut+MEfcxGaaKqJXUne382/WMYRC9yXyt4BSxHDLPn4Gdl/ckcW5VnFlsch1Sf5j7/rdihI eAxAYHVwAOmnJP8rVJu1IlgKppyMjsM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692210503; h=from:from:reply-to: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=CK37aAq4zqbVberK1XtRAZz+iCcsToYXR2C9s0mTBXE=; b=/VhEulVSYmqLOhNPJFbiThcwntOIZ2osIvUIb8Ca4fg3Fw+sd4vWqPurHpPLtwdGNvJQUu MWc9KeamLVb5M/Bw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH v2 1/4] migration/ram: Remove RAMState from xbzrle_cache_zero_page Date: Wed, 16 Aug 2023 15:28:14 -0300 Message-Id: <20230816182817.17590-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230816182817.17590-1-farosas@suse.de> References: <20230816182817.17590-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1692210560339100007 Content-Type: text/plain; charset="utf-8" 'rs' is not used in that function. It's a leftover from commit 9360447d34 ("ram: Use MigrationStats for statistics"). Reviewed-by: Peter Xu Signed-off-by: Fabiano Rosas --- migration/ram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 9040d66e61..87efab72e8 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -561,7 +561,6 @@ void mig_throttle_counter_reset(void) /** * xbzrle_cache_zero_page: insert a zero page in the XBZRLE cache * - * @rs: current RAM state * @current_addr: address for the zero page * * Update the xbzrle cache to reflect a page that's been sent as all 0. @@ -570,7 +569,7 @@ void mig_throttle_counter_reset(void) * As a bonus, if the page wasn't in the cache it gets added so that * when a small write is made into the 0'd page it gets XBZRLE sent. */ -static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr) +static void xbzrle_cache_zero_page(ram_addr_t current_addr) { /* We don't care if this fails to allocate a new cache page * as long as it updated an old one */ @@ -2148,7 +2147,7 @@ static int ram_save_target_page_legacy(RAMState *rs, = PageSearchStatus *pss) */ if (rs->xbzrle_started) { XBZRLE_cache_lock(); - xbzrle_cache_zero_page(rs, block->offset + offset); + xbzrle_cache_zero_page(block->offset + offset); XBZRLE_cache_unlock(); } return res; --=20 2.35.3 From nobody Mon Feb 9 13:37:25 2026 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692210565; cv=none; d=zohomail.com; s=zohoarc; b=BYCRvl51hxtWc6nmCLcJSnro7r5QXQhnWQaVL+C5nCPLnWCwRCc+rA09GGbiXS1k6xK2MvL77KNhIy8oeC/Rj/VEeC68HxX7ykjx0u8Fla9pn+AMew8FzP8NjKcotZ5rcfy9o3ItEu0ovz4Fw0eJJQhMOgC5cnxSQuVUQZeVOKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692210565; 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=gTfEqBWD4dXN99YrVUK4MFuZMyq3BblzbsuHrlr8oUw=; b=n1mnxEBr0BpxG1Mb9P/355dsF4Y19HQAOMF78WyFWUCUVJiR5G/LDSgcMynokx05cQyHEE4r8ThCAA/EzQeOo+iToIBZN2WwdpftPuXyJ6B79KR/1PeWmn2RJDi3qa9BxfhTkO7PBUhv/SpuEYyGNua0fng/kmYPiiJYHD6wuqM= 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 1692210565545869.6053308289939; Wed, 16 Aug 2023 11:29:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWLFv-0003p0-T2; Wed, 16 Aug 2023 14:28:31 -0400 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 1qWLFs-0003oA-LU for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:28 -0400 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWLFq-0006om-D2 for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:28 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C40531F750; Wed, 16 Aug 2023 18:28:24 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 78CEC133F2; Wed, 16 Aug 2023 18:28:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8HXoEEcV3WTxbQAAMHmgww (envelope-from ); Wed, 16 Aug 2023 18:28:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692210504; h=from:from:reply-to: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=gTfEqBWD4dXN99YrVUK4MFuZMyq3BblzbsuHrlr8oUw=; b=jp3x8B+U3B+pCQ/Kk8EU9ymmY8Q3tyz757teiQpff2qG98xowLqX0LOG9CD7SepyzsQ+6O jviw7sFITyMlWy3vjI5LmDqqn9FVJRcjOR/+ZWxMWkMb0n8xF6cEU4ikOv5NmFtBskgEqL 22u0cJnX89x2LYiziKORP0g3b1MDGgQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692210504; h=from:from:reply-to: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=gTfEqBWD4dXN99YrVUK4MFuZMyq3BblzbsuHrlr8oUw=; b=ukLRbH6sllVjAtaIkvFB+4vb7rdpob1IBg1ZoYaNSSek3gNq5JCYbo1MkGLjFInvAh3Akk v1o3eUtfzGht4fAQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH v2 2/4] migration/ram: Stop passing QEMUFile around in save_zero_page Date: Wed, 16 Aug 2023 15:28:15 -0300 Message-Id: <20230816182817.17590-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230816182817.17590-1-farosas@suse.de> References: <20230816182817.17590-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1692210567525100003 Content-Type: text/plain; charset="utf-8" We don't need the QEMUFile when we're already passing the PageSearchStatus. Reviewed-by: Peter Xu Signed-off-by: Fabiano Rosas --- migration/ram.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 87efab72e8..761f43dc34 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1138,10 +1138,11 @@ void ram_release_page(const char *rbname, uint64_t = offset) * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file(PageSearchStatus *pss, QEMUFile *file, - RAMBlock *block, ram_addr_t offset) +static int save_zero_page_to_file(PageSearchStatus *pss, RAMBlock *block, + ram_addr_t offset) { uint8_t *p =3D block->host + offset; + QEMUFile *file =3D pss->pss_channel; int len =3D 0; =20 if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { @@ -1162,10 +1163,10 @@ static int save_zero_page_to_file(PageSearchStatus = *pss, QEMUFile *file, * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *bl= ock, +static int save_zero_page(PageSearchStatus *pss, RAMBlock *block, ram_addr_t offset) { - int len =3D save_zero_page_to_file(pss, f, block, offset); + int len =3D save_zero_page_to_file(pss, block, offset); =20 if (len) { stat64_add(&mig_stats.zero_pages, 1); @@ -2140,7 +2141,7 @@ static int ram_save_target_page_legacy(RAMState *rs, = PageSearchStatus *pss) return 1; } =20 - res =3D save_zero_page(pss, pss->pss_channel, block, offset); + res =3D save_zero_page(pss, block, offset); if (res > 0) { /* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale --=20 2.35.3 From nobody Mon Feb 9 13:37:25 2026 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692210558; cv=none; d=zohomail.com; s=zohoarc; b=VqsQAwu/G4OdzaPfC+J2EaBgiqcxbBKJmd+ZIyE5UfRvglAVuArCv4dWeb57b2c6XuqDF//8RX0ag0TbuKS03LBnZh1hQhi/zTbc4wXL03YYA7AFgszlDA8kI96gHkSD6DZn2VCBPbg97uHjWwUE8+N1upH179vU4HXWAqDNPMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692210558; 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=fsG/34ZSYIoS6eKANfLhgLDzptxFgaHF6zKNR/mzDrQ=; b=bo21PCYwi2ISTDzjLgy96b6L+ffqlv0WmZOl/pRoMXVZAHrNhbUjNhHK9y4GbBosBiPQRE+0dLBLsePueVwwos26FTNb2E7+zvnp/wQBec5i73O1yB7fRH0vvCQ5Y86cinGVAqFajYlj4WQEexFZ0HWmH+giRHtsh391cxY3q9s= 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 1692210558880200.0665412790928; Wed, 16 Aug 2023 11:29:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWLFy-0003pS-41; Wed, 16 Aug 2023 14:28:34 -0400 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 1qWLFu-0003oa-MO for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:31 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWLFs-0006p4-EB for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:30 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8512321881; Wed, 16 Aug 2023 18:28:26 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 388D3133F2; Wed, 16 Aug 2023 18:28:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SLwsAUkV3WTxbQAAMHmgww (envelope-from ); Wed, 16 Aug 2023 18:28:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692210506; h=from:from:reply-to: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=fsG/34ZSYIoS6eKANfLhgLDzptxFgaHF6zKNR/mzDrQ=; b=VnP0C3tUHcohV6lXL7AUcgVx3jAwOQlsnJFKIisjArXiq4iY7/feiYiH8zcpHXQMi6aZfO RQrCKOZ8SAsjTQpPiETJEStIoI3eCTGXS7oIb4i9uTBqdWefQzVDDdH97fTnh4BMh2sUS6 wesepf58S4iRLS0JvNraWIfkQ0qZJJY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692210506; h=from:from:reply-to: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=fsG/34ZSYIoS6eKANfLhgLDzptxFgaHF6zKNR/mzDrQ=; b=rux8gNpUSD0QIrC74vOGQu7Wshgium2xTuSuaBOABr71NYbLq0vH9oxA3rDcFR8PTdvsBW 0oLkTChDa2u4HaCg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH v2 3/4] migration/ram: Move xbzrle zero page handling into save_zero_page Date: Wed, 16 Aug 2023 15:28:16 -0300 Message-Id: <20230816182817.17590-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230816182817.17590-1-farosas@suse.de> References: <20230816182817.17590-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=195.135.220.28; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1692210559720100001 Content-Type: text/plain; charset="utf-8" It makes a bit more sense to have the zero page handling of xbzrle right where we save the zero page. Also invert the exit condition to remove one level of indentation which makes the next patch easier to grasp. Reviewed-by: Peter Xu Signed-off-by: Fabiano Rosas --- migration/ram.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 761f43dc34..82ff53beec 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1159,21 +1159,34 @@ static int save_zero_page_to_file(PageSearchStatus = *pss, RAMBlock *block, * * Returns the number of pages written. * + * @rs: current RAM state * @pss: current PSS channel * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page(PageSearchStatus *pss, RAMBlock *block, +static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *b= lock, ram_addr_t offset) { int len =3D save_zero_page_to_file(pss, block, offset); =20 - if (len) { - stat64_add(&mig_stats.zero_pages, 1); - ram_transferred_add(len); - return 1; + if (!len) { + return -1; } - return -1; + + stat64_add(&mig_stats.zero_pages, 1); + ram_transferred_add(len); + + /* + * Must let xbzrle know, otherwise a previous (now 0'd) cached + * page would be stale. + */ + if (rs->xbzrle_started) { + XBZRLE_cache_lock(); + xbzrle_cache_zero_page(block->offset + offset); + XBZRLE_cache_unlock(); + } + + return 1; } =20 /* @@ -2141,16 +2154,8 @@ static int ram_save_target_page_legacy(RAMState *rs,= PageSearchStatus *pss) return 1; } =20 - res =3D save_zero_page(pss, block, offset); + res =3D save_zero_page(rs, pss, block, offset); if (res > 0) { - /* Must let xbzrle know, otherwise a previous (now 0'd) cached - * page would be stale - */ - if (rs->xbzrle_started) { - XBZRLE_cache_lock(); - xbzrle_cache_zero_page(block->offset + offset); - XBZRLE_cache_unlock(); - } return res; } =20 --=20 2.35.3 From nobody Mon Feb 9 13:37:25 2026 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1692210563; cv=none; d=zohomail.com; s=zohoarc; b=ReIoh0Mg4QKMLZ6YUolhJlmoojnDMeDi6e/4911aXIhzE+pZAr7gQ3qMB3k4tuwQeT+cDFQxcW3+Uu9LU1XQx4QqSlxicfGRrT2nlvx6TBfewvj/Db/NZMjuUtt9TXJs5fhHC2DomvfwjTAui6skqgS3r5ls/GMbnQ/Q5xEBl3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692210563; 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=kcCEe0FZ0I1TnhM5Q0ji1I1YOz24/GfthYrnYqF+T0Q=; b=Q6YEwWwNFpR0Zl1mLcI+K/PWUCEbq7OYIETz+1n+bOqe1iXvtWeywoXMriQ1jK/PExCx03j/3lfcQ9qSKPRjZQLUMpqWg7byOCIfAuuf65JtVjJRscMkrPiot7YaHFbQmGNUcc45IkU4890C8LsZ6bQsUEyHTodGn31SR77pv74= 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 1692210563689378.9173231228415; Wed, 16 Aug 2023 11:29:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWLFy-0003pV-Gz; Wed, 16 Aug 2023 14:28:34 -0400 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 1qWLFv-0003oe-Gh for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:31 -0400 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWLFt-0006pN-B8 for qemu-devel@nongnu.org; Wed, 16 Aug 2023 14:28:31 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 48EE521888; Wed, 16 Aug 2023 18:28:28 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F104F133F2; Wed, 16 Aug 2023 18:28:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id QJoQLkoV3WTxbQAAMHmgww (envelope-from ); Wed, 16 Aug 2023 18:28:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1692210508; h=from:from:reply-to: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=kcCEe0FZ0I1TnhM5Q0ji1I1YOz24/GfthYrnYqF+T0Q=; b=wLUfwhQHU6xUkalLMUWLjLWXa6EC4TtLwrm5miDPRH1Ry6uDtmePVdBM2mrymq0cWP82IM dzGXLRt1ItNlo5hU9lfTrc5coAZPc7b+fqVr5M7VD4J2H4JmO41up/QcqOEqahZe9+rOUG CzgM+o9QX5ApNpSAlv0YsJkV86AqIJo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1692210508; h=from:from:reply-to: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=kcCEe0FZ0I1TnhM5Q0ji1I1YOz24/GfthYrnYqF+T0Q=; b=TvlbBIdR7EgvoWkGqoNum9ueWgNUXjSu9bkK5L4Z6kez4g9To0idHXIcTVTvata/RG/k3e Qgp3eZx2Auw4s8BQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras Subject: [PATCH v2 4/4] migration/ram: Merge save_zero_page functions Date: Wed, 16 Aug 2023 15:28:17 -0300 Message-Id: <20230816182817.17590-5-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230816182817.17590-1-farosas@suse.de> References: <20230816182817.17590-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1692210564231100002 Content-Type: text/plain; charset="utf-8" We don't need to do this in two pieces. One single function makes it easier to grasp, specially since it removes the indirection on the return value handling. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/ram.c | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 82ff53beec..13935ead1c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1128,32 +1128,6 @@ void ram_release_page(const char *rbname, uint64_t o= ffset) ram_discard_range(rbname, offset, TARGET_PAGE_SIZE); } =20 -/** - * save_zero_page_to_file: send the zero page to the file - * - * Returns the size of data written to the file, 0 means the page is not - * a zero page - * - * @pss: current PSS channel - * @block: block that contains the page we want to send - * @offset: offset inside the block for the page - */ -static int save_zero_page_to_file(PageSearchStatus *pss, RAMBlock *block, - ram_addr_t offset) -{ - uint8_t *p =3D block->host + offset; - QEMUFile *file =3D pss->pss_channel; - int len =3D 0; - - if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { - len +=3D save_page_header(pss, file, block, offset | RAM_SAVE_FLAG= _ZERO); - qemu_put_byte(file, 0); - len +=3D 1; - ram_release_page(block->idstr, offset); - } - return len; -} - /** * save_zero_page: send the zero page to the stream * @@ -1167,12 +1141,19 @@ static int save_zero_page_to_file(PageSearchStatus = *pss, RAMBlock *block, static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *b= lock, ram_addr_t offset) { - int len =3D save_zero_page_to_file(pss, block, offset); + uint8_t *p =3D block->host + offset; + QEMUFile *file =3D pss->pss_channel; + int len =3D 0; =20 - if (!len) { - return -1; + if (!buffer_is_zero(p, TARGET_PAGE_SIZE)) { + return 0; } =20 + len +=3D save_page_header(pss, file, block, offset | RAM_SAVE_FLAG_ZER= O); + qemu_put_byte(file, 0); + len +=3D 1; + ram_release_page(block->idstr, offset); + stat64_add(&mig_stats.zero_pages, 1); ram_transferred_add(len); =20 @@ -1186,7 +1167,7 @@ static int save_zero_page(RAMState *rs, PageSearchSta= tus *pss, RAMBlock *block, XBZRLE_cache_unlock(); } =20 - return 1; + return len; } =20 /* @@ -2154,9 +2135,8 @@ static int ram_save_target_page_legacy(RAMState *rs, = PageSearchStatus *pss) return 1; } =20 - res =3D save_zero_page(rs, pss, block, offset); - if (res > 0) { - return res; + if (save_zero_page(rs, pss, block, offset)) { + return 1; } =20 /* --=20 2.35.3