From patchwork Tue Apr 22 19:27:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883149 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2602044wrs; Tue, 22 Apr 2025 13:13:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV/mH5Pq8lm7svapkl/QE1B8lGgyMp/QS5uvzKaBNBdQXNGGms/3lgfraObfX1H6wq+CQk8lg==@linaro.org X-Google-Smtp-Source: AGHT+IEAhM82MWNNTVrCmiD5HBHsXWAia1dV/pxl7+o0fGboyNCjIzfA1r4cvsafZJ6XtBHlc62K X-Received: by 2002:a05:6402:518e:b0:5ec:7909:1a with SMTP id 4fb4d7f45d1cf-5f62852954fmr13269864a12.12.1745352795763; Tue, 22 Apr 2025 13:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745352795; cv=none; d=google.com; s=arc-20240605; b=bnyVSUtKo/ZpoNBiZ/8mqrSzRJv0BtsN7eTbvKBVpzXvnV14CVDHDQW2I5sQx7Orxc seCISVy+eRfptsp1dVRtgRx6WIsM1O0oZNXunqtf//ttWJiMKgoUNr4GXYbbirY3XaPh RxyK1vYUbogqtt/CCyCcbaP/o9OehLJ3mC+Hk8SiT/7ViXsmeLaUEef3mwMwXTzk4Mfi NG3psyKN8HGhbKzwTSIOsQZq2EB+3rDNymwn7MknRub7wTfse3b7JHTVlVK9TCkFHXbe 8Vgvm1XCBCvEFxmNrz3Dc5196TD0HhjcZmwaD6ZDVnoKuIkgZSIbb7yTh0DPMIAcLH+r v2zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2WoakTEoTh5W+Edqv/m7cqa7TN4j7HTie5YrJRYbIMU=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=J987cTsK3X+34XY1XtmeGl7EUhzPTnwhaD+0FbnoOG+8VxgMBJHuPeF3hCxEyLutb5 M/Y4EdCkor3FR8EpirgLN7nf208JS203rH8HLzO6AncNKTVKT+Oa/mpyPqobxhRLtTMj uaEs1e/WDTAZOnusrp3EhJn2DQNRTs9UqqIArD9u+3UYWFtoHlVBLam6eGTY+75MtXxl d093IVKRNsw99PfskOSWRUs9NrFL/4myEnnY4b2Tz974AHF8KWgGbGeriQOQ/gmv0ez1 BnEbEToRfXRE8uPFzYdqfoer/y5ze5Aeq6cXFJ6RQKiDxTUQycZjLz5TmdZxMhTA/7mW 3xng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CX+RGNph; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5f62554cd44si6888325a12.39.2025.04.22.13.13.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 13:13:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CX+RGNph; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7JPZ-0006eB-BD; Tue, 22 Apr 2025 15:36:05 -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 1u7JOy-0005AQ-Oa for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:31 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JOw-00074O-MZ for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:28 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22438c356c8so59119215ad.1 for ; Tue, 22 Apr 2025 12:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350525; x=1745955325; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2WoakTEoTh5W+Edqv/m7cqa7TN4j7HTie5YrJRYbIMU=; b=CX+RGNphhqJ8AHWCwBqGlOhZ1suuubvGlDYDLZu5NjwfdOWDownPUc2JScikSfCn/K Ezbi8TKR/PZnrS2fDpX3XZjHD1YFnurBXzqJQsS8QARYJHIZYmKH/ymy8DBbw+CaoOD2 OGdySFlv4+WmTAVgVxPhvjsmNljYrk25EuYc1rKQjcY7CqTczqd71I4ePQleLlfCLiIT KtLWtBMbubLvoEiA7O7Bkdp4IT97olrB/RRLAYGco5qfZoXmluFJuH9+67r7YR0U2Wdz AvP8ilCcPcgOxJ3FsfiRI+YWuuMOrLuNm+/QBQIQNtxgJZw7dsX2WQpeQb8RjKs65xrb l34Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350525; x=1745955325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2WoakTEoTh5W+Edqv/m7cqa7TN4j7HTie5YrJRYbIMU=; b=sa1nJHCU8fZlp11/dIzFtbHsHMruvbLoIZ855e9E8V80dusHzIJHuzjcltOLtxujCu Ucg2/rPCp/H92mgyzY9f3MBbZSGxtoaAI0wUsCtLpSOayKyO/I2LM7yxSK4DPoQgu2RG fHR7blkx4CBEpRhSVwAvMPHXt512bhp1Qdx6NuFqj6b0/ACFPxNfG0j41s+XKRZAv8Se MqUzZFfmTF2XY26zC8bxWbbXME/t/b9XSQgMK3jfGkBQJBMTD1vvWEQyqYsXrj7ShWvp rex71XLfIHGYH3Xl8jXJFhLxmIUYQO0+ZtJRrqrnkknG64qspZAgYMTVqLdms30NNMuG 1tew== X-Gm-Message-State: AOJu0YwExeeN17RP0CSAiWkubW+PfYB/uX4YsUMRAtOYbZHcR3Sb/r97 67n6fBAIdpCsAxr+oXCzCICySlde4NIyA8Szh1aNXQ7WHS1p1B2Ywoi/XFD7JodBDkUhTdfboiN C X-Gm-Gg: ASbGnctNvsiQy70DJCt9OLLelCyCB6qvE/4a6Qzjl9yU6mxEKUXooXBfh/mvmBQvrQY q0e2ZaKGKpj8UAzg8f5dXxO+5L+9R1OfwhXmhhhKdlofqxV91dVvJsW6RR1NUdTlVOr2fSJBbfF FP0ccoODwm1l/jd8uhE+rXQARulcPVBQ1GW/DLOGjeo2wHXS/iByYg7hS0yIW38OGPrjHseDsnw 0gWywyjcB53VrKhOg7slMym7NQl/MeCwfHL7q4oAlb1kLkAoHFHhtklpNmGRWE2PB1MNZtga8Z6 9UNQpo5/Fc/Qb+OK5O+S3ePbr+OHQIHoXCjn/7P0PmpLM+u8wtPmuIRJF2cTs+gUxjKtXyV9Ie0 = X-Received: by 2002:a17:902:dac5:b0:224:826:279e with SMTP id d9443c01a7336-22c53630377mr225992365ad.50.1745350525406; Tue, 22 Apr 2025 12:35:25 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf1f1sm88996795ad.237.2025.04.22.12.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:35:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PATCH 099/147] page-vary: Move and rename qemu_target_page_bits_min Date: Tue, 22 Apr 2025 12:27:28 -0700 Message-ID: <20250422192819.302784-100-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.google.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, 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Rename to migration_legacy_page_bits, to make it clear that we cannot change the value without causing a migration break. Move to page-vary.h and page-vary-target.c. Define via TARGET_PAGE_BITS if not TARGET_PAGE_BITS_VARY. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/exec/page-vary.h | 9 +++++++++ include/exec/target_page.h | 1 - migration/savevm.c | 6 +++--- page-target.c | 5 ----- page-vary-target.c | 9 +++++++++ 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h index 54ddde308a..101c25911c 100644 --- a/include/exec/page-vary.h +++ b/include/exec/page-vary.h @@ -49,4 +49,13 @@ bool set_preferred_target_page_bits(int bits); */ void finalize_target_page_bits(void); +/** + * migration_legacy_page_bits + * + * For migration compatibility with qemu v2.9, prior to the introduction + * of the configuration/target-page-bits section, return the value of + * TARGET_PAGE_BITS that the target had then. + */ +int migration_legacy_page_bits(void); + #endif /* EXEC_PAGE_VARY_H */ diff --git a/include/exec/target_page.h b/include/exec/target_page.h index 8e89e5cbe6..e4bd7f7767 100644 --- a/include/exec/target_page.h +++ b/include/exec/target_page.h @@ -63,7 +63,6 @@ static inline int qemu_target_page_bits(void) return TARGET_PAGE_BITS; } -int qemu_target_page_bits_min(void); size_t qemu_target_pages_to_MiB(size_t pages); #endif diff --git a/migration/savevm.c b/migration/savevm.c index c33200a33f..0c12e373b4 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -50,6 +50,7 @@ #include "system/cpus.h" #include "system/memory.h" #include "exec/target_page.h" +#include "exec/page-vary.h" #include "trace.h" #include "qemu/iov.h" #include "qemu/job.h" @@ -339,7 +340,7 @@ static int configuration_pre_load(void *opaque) * predates the variable-target-page-bits support and is using the * minimum possible value for this CPU. */ - state->target_page_bits = qemu_target_page_bits_min(); + state->target_page_bits = migration_legacy_page_bits(); return 0; } @@ -462,8 +463,7 @@ static const VMStateInfo vmstate_info_capability = { */ static bool vmstate_target_page_bits_needed(void *opaque) { - return qemu_target_page_bits() - > qemu_target_page_bits_min(); + return qemu_target_page_bits() > migration_legacy_page_bits(); } static const VMStateDescription vmstate_target_page_bits = { diff --git a/page-target.c b/page-target.c index 321e43d06f..8fcd5443b5 100644 --- a/page-target.c +++ b/page-target.c @@ -9,11 +9,6 @@ #include "qemu/osdep.h" #include "exec/target_page.h" -int qemu_target_page_bits_min(void) -{ - return TARGET_PAGE_BITS_MIN; -} - /* Convert target pages to MiB (2**20). */ size_t qemu_target_pages_to_MiB(size_t pages) { diff --git a/page-vary-target.c b/page-vary-target.c index 84ddeb7c26..6251d948cf 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -23,6 +23,15 @@ #include "exec/page-vary.h" #include "exec/target_page.h" +int migration_legacy_page_bits(void) +{ +#ifdef TARGET_PAGE_BITS_VARY + return TARGET_PAGE_BITS_MIN; +#else + return TARGET_PAGE_BITS; +#endif +} + bool set_preferred_target_page_bits(int bits) { #ifdef TARGET_PAGE_BITS_VARY