From patchwork Thu Apr 24 00:48:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883877 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3207067wrs; Wed, 23 Apr 2025 18:21:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUsV9Fw0vXSwKB4sYfFF9gN6UfJOXRVNCLEOf6lykHuay9HsaSykdjDozMpToX9XurjrccQYQ==@linaro.org X-Google-Smtp-Source: AGHT+IEheDHRfUFvq7Zwh/8wuIUpyHKEgShr6jc7fR0iznMQ7jqhlB1KLvzyfE4rrf8r5xCdXsS3 X-Received: by 2002:a05:622a:180b:b0:476:b7cf:4d42 with SMTP id d75a77b69052e-47eb34b922emr10745781cf.27.1745457660148; Wed, 23 Apr 2025 18:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745457660; cv=none; d=google.com; s=arc-20240605; b=D2TuPUThQWh44WekcFjgwz1RQ4zmmFwkVNCbM0AIy+7/2mzzt1Ex4Wbd7ZDHyjKkKw ZQHQZWLo0SPx8eRwhxyNRMKGCIY3IawCa02v4q4CmePxloul8nlSgWYug6qRj7JtJwbW Z823hvep961LQMfQhkIgBhaRa8dWajbXaVRNRRP4mvfaIP9Pp971J2oy+3L1TbCBjN0L WMYpbMjKxPAyf0AB7GlTNjNvARLncRxfr6eYNC6bDpZYmJl37mWlf1Z5I8P61TftnAka t6DoyLkJCHPtSkiUcN7C/QhO7iOQkUil+9SVujp592WnC/mcjHapzhokAyJmQesJiWMt CYbQ== 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=Dzwev4Mp1sc6NEu+mp6yXY8f6dZtrOf1lXFYz4VLpOq2KZQkq8YB/gTwb6AT/Q9VbY gl93t8p5xWu3QZMQoV8gnXMDVFQ27i0G19A7P4jcIg6XBqJtz6O0pjd7s1fKY0lBXMtf Zj1UJfuz0MgmS2CGsN21E0k3/9nQfqBK0isZL05oPgK7mlHwbuDqthfRHrzwOIR5M6GZ Y7bcxOvOPCgMAvs2ew58naLxCwshzg/UusnSsAF4E3bEi5GhcuBN12LZR2/vvxoDBzKX pUD5l9BTGALYkl+5FB+qYDuuwbTI7ufGyjKB8nrjzNUoJLo2cU6exVbCRJFS0ce8/XIg AqXw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=seyH1gVK; 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 d75a77b69052e-47e9f3c039bsi5444461cf.85.2025.04.23.18.20.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 18:21:00 -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=seyH1gVK; 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 1u7kw6-0003GO-I1; Wed, 23 Apr 2025 20:59:33 -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 1u7ktX-0005uL-Fi for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:56:53 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7ktV-00056Y-JF for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:56:51 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-736b34a71a1so465128b3a.0 for ; Wed, 23 Apr 2025 17:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745456208; x=1746061008; 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=seyH1gVKy5vzE/OlWmJxQ8KRoUIVeDACDqtjeD5YeekRsaAi3mnNAiSXkB4i6rVbU6 jo8m7cdAB/iX44ZFIjKmmjWPmoz451tVHHs9b8CTAvSDYUMTJpE/G8akULl6uFemOhc+ nFsugiV9/T8rPTKY9OJRzkb9UptavdolwYvMMTfOHW89980ohmGYRcOSZ+3L09AOCfy9 mMqnQFKk98fEMgepAWIIlwhHOFv27llkOwp62it2YorpTVfxhXFg0gzggDsoHbldohig 07e1BzqKHiW7FmXfTOYQleMHKuT44gE1UwJJaZefxR8/zyYS5r0ZQoOxLlwUjvvbbdVW JCag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745456208; x=1746061008; 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=I7TTekuts1kttTzI0oMDZADL95y8D2kEQl5EOTMpECulrd4SJz7I08+NZuhBA4dOLk lKx0auLQNHgH4XhB3Wjkm9+C98F6szICc+b7E+lIJGS4bKabuQ8MlXbuaLP+kXCD7NrM KNTeMU1fuDpod2ZMFP5+96t1B1i8I99kKh4U4iSx9EOcP+RT7YgIvkNeWHWo9Bm68SEP 6EbiFYcfiTAsG3gxQ8soW9DzP3IUR5NiJh4DZRq5qM/1vuQgmQt6WY1KkHG0msvwXyr9 H8r3nZr+uByYyoY4dfBLkxHN5O4+GQbTM0qoVZ6vTMEegnFAvYiw1zoN7BRg5QhglqB1 JgJQ== X-Gm-Message-State: AOJu0YwptTCkdC0t44qfl1+5xpZ8HFTlQNqHX+tb4xDWvuZ+x9TuAKKP eumlf59+xcFiXyw3eFLNP/OOlsW71kfEhEoOlRaggkaBQLAB4ZwYFLJV0SNHZ8fPeL7AqPdfXfy + X-Gm-Gg: ASbGncvBSnQsRbU4pmLOlfQO4EpefmzGrTMSwgt+qaozc5LHgk+JopyGMfedr6gqEiW 7+HLJTlqkCXCiZ41nytJd+s3iHkHaI4+oU0DgPH3rCY1KRPEawpgAl6YWn4DH4VmEF7173Xm7Hh z6szdkPsfOVqywnjB53x1vdjxe/DEv/YtIC5K+Nb/elCfQpm2V7Ho2VW+8JVfj+bdDf1HBN/yjW PTU8XyuLSOAa8ed+ivKJOqRA5M14QkPYgNLw542PBeyCLp/+4HMrjud1XX+6cBwYq+P+F90PV0L 0uNZjOLkZpRZ5NCwylh6BsDprr9xp7s7FgWxNytdvU3kiwhht3TtBZ4UgaZfqLkQ4qo2qjIjOdU 0MR2guazHbg== X-Received: by 2002:a05:6a21:6d8d:b0:1f3:47d6:aa05 with SMTP id adf61e73a8af0-20444d275ccmr1038104637.0.1745456207751; Wed, 23 Apr 2025 17:56:47 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b15fa907fcdsm119775a12.54.2025.04.23.17.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:56:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 099/148] page-vary: Move and rename qemu_target_page_bits_min Date: Wed, 23 Apr 2025 17:48:44 -0700 Message-ID: <20250424004934.598783-100-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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