From nobody Sun Apr 12 00:55:04 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772619867; cv=none; d=zohomail.com; s=zohoarc; b=RTkiw91xxzVEuSKKEkgYteLyZn/UniPE9rYpYVEJ617UUWEVr2O9GGPTRzazUMJ9CXkPfxBTh32X2yG8r3KPvWJWKXYnvXfzeVgUjQKw8qqvN2qIfgVCN5g+Gm4JsCOZChqY8+sa6lg134oOzwuWQLMV1cxhYjBrHoQoLB7jcxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772619867; h=Content-Transfer-Encoding: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:Cc; bh=ldxoLp6KcXqfI0tesxvcwaPltES2CTPU4VCNfiMSSto=; b=DIRBnHdrhwQrB9HwgLOK3Xa/n9YeuEk3r6f/UrFxiX7xv5BSS2iNCbeqdOtRKPG4sYjPYwIHjRDXgdROYe5cobrAnOh/tkUMkaut1egbwz+Cc/JOUFVjhirKArOW9kGj98mzhOhevCCiYr4WDLs/ZXQlHehPBTO+gbkwNoA6h7E= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772619867167965.5628382882438; Wed, 4 Mar 2026 02:24:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxjNp-00072t-3W; Wed, 04 Mar 2026 05:23:13 -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 1vxjNm-00072F-TR for qemu-devel@nongnu.org; Wed, 04 Mar 2026 05:23:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxjNk-0002Zj-LR for qemu-devel@nongnu.org; Wed, 04 Mar 2026 05:23:10 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-1nXJusCLPa6GuA23nOFqRQ-1; Wed, 04 Mar 2026 05:23:03 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8968018002E7; Wed, 4 Mar 2026 10:23:02 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.89]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8BC921958DC2; Wed, 4 Mar 2026 10:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772619786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ldxoLp6KcXqfI0tesxvcwaPltES2CTPU4VCNfiMSSto=; b=UjhJrlNDoxEG/INRgqBG8dQEJGHlKcxpC7BbgPFjJdLJQHy3aSeZMxrX3CHWmyTdTCOwcM 5157J/hjrHARaVAbE9LlJ08RGO3f60GBq4XqZ+pqIaMORtDkwT8P8R9eByxe854UI1odBe /w1JomTYymGZcVOaycTJou71jj0Gg+c= X-MC-Unique: 1nXJusCLPa6GuA23nOFqRQ-1 X-Mimecast-MFC-AGG-ID: 1nXJusCLPa6GuA23nOFqRQ_1772619782 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, cohuck@redhat.com, sebott@redhat.com, peterx@redhat.com, philmd@linaro.org, alex.bennee@linaro.org Subject: [PATCH v8 2/6] target/arm/machine: Take account cpreg mig tolerances in case of mismatch Date: Wed, 4 Mar 2026 11:22:06 +0100 Message-ID: <20260304102249.1963784-3-eric.auger@redhat.com> In-Reply-To: <20260304102249.1963784-1-eric.auger@redhat.com> References: <20260304102249.1963784-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.322, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.141, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1772619868344158500 Content-Type: text/plain; charset="utf-8" If there is a mismatch between the cpreg indexes found on both ends, check whether a tolerance was registered for the given kvmidx. If any, silence warning/errors. Create dedicated helper functions that print the name of the culprit reg and analyze whether a tolerance is set. According set the level of traces and analyze whether the migration must eventually fail. Signed-off-by: Eric Auger --- target/arm/machine.c | 30 ++++++++++++++++++++---------- target/arm/trace-events | 2 ++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/target/arm/machine.c b/target/arm/machine.c index 476dad00ee7..13b8a0b2220 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1065,24 +1065,34 @@ static void handle_cpreg_missing_in_incoming_stream= (ARMCPU *cpu, uint64_t kvmidx { g_autofree gchar *name =3D print_register_name(kvmidx); =20 - warn_report("%s: %s " - "expected by the destination but not in the incoming strea= m: " - "skip it", __func__, name); + if (!arm_cpu_cpreg_has_mig_tolerance(cpu, kvmidx, + 0, 0, ToleranceNotOnBothEnds)) { + warn_report("%s: %s " + "expected by the destination but not in the incoming s= tream: " + "skip it", __func__, name); + } else { + trace_tolerate_cpreg_missing_in_incoming_stream(name); + } } =20 /* - * Handle the situation where @kvmidx is in the incoming stream - * but not on destination. This currently fails the migration but - * we plan to accomodate some exceptions, hence the boolean returned value. + * Handle the situation where @kvmidx is in the incoming + * stream but not on destination. This fails the migration if + * no cpreg mig tolerance is set for this @kvmidx */ static bool handle_cpreg_only_in_incoming_stream(ARMCPU *cpu, uint64_t kvm= idx) { g_autofree gchar *name =3D print_register_name(kvmidx); - bool fail =3D true; - - error_report("%s: %s in the incoming stream but unknown on the " - "destination: fail migration", __func__, name); + bool fail =3D false; =20 + if (!arm_cpu_cpreg_has_mig_tolerance(cpu, kvmidx, + 0, 0, ToleranceNotOnBothEnds)) { + error_report("%s: %s in the incoming stream but unknown on the " + "destination: fail migration", __func__, name); + fail =3D true; + } else { + trace_tolerate_cpreg_only_in_incoming_stream(name); + } return fail; } =20 diff --git a/target/arm/trace-events b/target/arm/trace-events index 2de0406f784..8502fb3265c 100644 --- a/target/arm/trace-events +++ b/target/arm/trace-events @@ -29,3 +29,5 @@ arm_psci_call(uint64_t x0, uint64_t x1, uint64_t x2, uint= 64_t x3, uint32_t cpuid =20 # machine.c cpu_post_load(uint32_t cpreg_vmstate_array_len, uint32_t cpreg_array_len) = "cpreg_vmstate_array_len=3D%d cpreg_array_len=3D%d" +tolerate_cpreg_missing_in_incoming_stream(char *name) "%s is missing in in= coming stream but this is explicitly tolerated" +tolerate_cpreg_only_in_incoming_stream(char *name) "%s is in incoming stre= am but not on destination but this is explicitly tolerated" --=20 2.53.0