From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9C36C55ABE for ; Fri, 20 Feb 2026 11:57:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vtP88-0004Gl-Ub; Fri, 20 Feb 2026 06:57:08 -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 1vtP87-0004GO-Vq for qemu-arm@nongnu.org; Fri, 20 Feb 2026 06:57:08 -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 1vtP85-0001js-Sl for qemu-arm@nongnu.org; Fri, 20 Feb 2026 06:57:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771588625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pemrUBU8/rbjL9/zoZ7MkscMiByl7zJxATlK5nEq+x0=; b=ZlQPvV4Y5eXmOXXL+iTC7S2dzhdhGCAlrIbE5+SwJBrdLn9j5BZwciBPQJ/zwvUglZjblN fORUJ3bdwgOt8XVen0s/W4h9X6V8IK+ha34gWQBfF4AnSYNL9dkUBORZapUQwWihUJOrw0 31OfaqSW0YD5QxRQchkUWFIK5ykajCg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-sblz7UmgOxSIi9vf1LckNA-1; Fri, 20 Feb 2026 06:57:04 -0500 X-MC-Unique: sblz7UmgOxSIi9vf1LckNA-1 X-Mimecast-MFC-AGG-ID: sblz7UmgOxSIi9vf1LckNA_1771588623 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48379489438so22734545e9.2 for ; Fri, 20 Feb 2026 03:57:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771588623; x=1772193423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pemrUBU8/rbjL9/zoZ7MkscMiByl7zJxATlK5nEq+x0=; b=DQYzkiq1qw1skJeOWOOcwjPRg2FORpaoCS4gM8BkwXXuWL6yofirhUVREQUSzSeopj ZGnrldOB1MIaRPhIqXzmcGIeVsHf8g2+7u6NWrFQrnaIlll4ackmiKBPbQ2jADRnRD2D 3LNrqvE7NPC0UY+KaryMcNa8axknrbHIxt76UBObnaZGOC6zxLPWiS0AjGChmKBEwK2t vJ8dqvpvDQ770ZwwRlwegtbGcxQ+bdTWMFnudZalGBYKvvSKApkou6bmzZrSsPyuP1g3 l+eCLiJ6Zy7B66iB/+KIRr4tDElR/OpPjlw5x/DMvnO2UFRC15tc3QdkPG/ZcyNuCff1 onxg== X-Forwarded-Encrypted: i=1; AJvYcCVYqXaCgXhg5YPT/GN6jhu/2QlJ2ub06cy9X2ulVw7nto9D+NLJkYJ45Iw0oElPe4Ppz/uLa/bU+A==@nongnu.org X-Gm-Message-State: AOJu0YzpDSKIp7xNz/t9/gT1WcaoqBRveudx0ddS8l/Hjl/gbqhDnVh9 jTPEltTkTwB5lGaVAc520rWh89L/SAy7B/LgBg4+FoPrcL9tU2VuOMgL1bdyPQpL+MhM1X3du9g 47jgiuG9+QeLwOqMgj9MT574rlYLSzhRBgrWFsUTkUprasAg5HzvZOQ== X-Gm-Gg: AZuq6aJodwGYV2DUCP03RYncDWrY9725Cso5g+jiIXiM7R7/uWKUGp+T5xOPBfiuroy mi4Li9Iuqu/FpcZ94Zg8cqjGjhincpK+mRzOlPwgeormzN9vyU+o3WGSwb3d7fEf5cpkF0N0Mzd 4JAiUuL7soYg2YbBp24aBaIJ0NEfgZd30KBLvBlbSvfNVPRBcYKm44aMGdDgfd6gdt1Wrcwxhhg vgUipiNJeCyuu6mdX7GhdqHJCQwI0ew4sDl3xHIsOf1J3lCLlkErqAWFqy43UzRRRPfOAnj2Zds H4nXIJcUP9uK5ItsgF7ffirbovYVuqVFL1MdQLXV70VwZVRoyWeetw+UsP5YENjSfX0fy0CoLwH TWBFqOp9j6hEukOqD+o+ey9+ouFTU6/Whpz7AvqNJkIwzAXSLADoaNj3ZZY66V3GgwMBNBZF2Fj c89ezEsqYw X-Received: by 2002:a05:600c:a087:b0:483:71f7:2794 with SMTP id 5b1f17b1804b1-48398a54b94mr145228685e9.15.1771588622599; Fri, 20 Feb 2026 03:57:02 -0800 (PST) X-Received: by 2002:a05:600c:a087:b0:483:71f7:2794 with SMTP id 5b1f17b1804b1-48398a54b94mr145228175e9.15.1771588622099; Fri, 20 Feb 2026 03:57:02 -0800 (PST) Received: from rh.fritz.box (p200300f6af2d8700b4c2d356c3fafe63.dip0.t-ipconnect.de. [2003:f6:af2d:8700:b4c2:d356:c3fa:fe63]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483a316c2aasm66102295e9.0.2026.02.20.03.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 03:57:01 -0800 (PST) From: Sebastian Ott To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: eric.auger@redhat.com, kvm@vger.kernel.org, kvmarm@lists.linux.dev, pbonzini@redhat.com, qemu-arm@nongnu.org, Sebastian Ott Subject: [PATCH v6 1/1] target/arm/kvm: add kvm-psci-version vcpu property Date: Fri, 20 Feb 2026 12:56:56 +0100 Message-ID: <20260220115656.4831-2-sebott@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260220115656.4831-1-sebott@redhat.com> References: <20260220115656.4831-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: y6YB5esuBDVcmw_hOYBXYdzYfhV332qHp9GXvjT2jdc_1771588623 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Received-SPF: pass client-ip=170.10.133.124; envelope-from=sebott@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.045, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Provide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3 Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case. Reviewed-by: Eric Auger Tested-by: Eric Auger Signed-off-by: Sebastian Ott --- docs/system/arm/cpu-features.rst | 11 ++++++++ target/arm/cpu.c | 8 +++++- target/arm/kvm.c | 48 ++++++++++++++++++++++++++++++-- 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-features.rst index 3db1f19401..ce19ae6a04 100644 --- a/docs/system/arm/cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -204,6 +204,17 @@ the list of KVM VCPU features and their descriptions. the guest scheduler behavior and/or be exposed to the guest userspace. +``kvm-psci-version`` + Set the Power State Coordination Interface (PSCI) firmware ABI version + that KVM provides to the guest. By default KVM will use the newest + version that it knows about (which is PSCI v1.3 in Linux v6.13). + + You only need to set this if you want to be able to migrate this + VM to a host machine running an older kernel that does not + recognize the PSCI version that this host's kernel defaults to. + + Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3. + TCG VCPU Features ================= diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 10f8280eef..60f391651d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1144,7 +1144,13 @@ static void arm_cpu_initfn(Object *obj) * picky DTB consumer will also provide a helpful error message. */ cpu->dtb_compatible = "qemu,unknown"; - cpu->psci_version = QEMU_PSCI_VERSION_0_1; /* By default assume PSCI v0.1 */ + if (!kvm_enabled()) { + /* By default KVM will use the newest PSCI version that it knows about. + * This can be changed using the kvm-psci-version property. + * For others assume PSCI v0.1 by default. + */ + cpu->psci_version = QEMU_PSCI_VERSION_0_1; + } cpu->kvm_target = QEMU_KVM_ARM_TARGET_NONE; if (tcg_enabled() || hvf_enabled()) { diff --git a/target/arm/kvm.c b/target/arm/kvm.c index ded582e0da..5453460965 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -485,6 +485,28 @@ static void kvm_steal_time_set(Object *obj, bool value, Error **errp) ARM_CPU(obj)->kvm_steal_time = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; } +static char *kvm_get_psci_version(Object *obj, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + + return g_strdup_printf("%d.%d", + (int) PSCI_VERSION_MAJOR(cpu->psci_version), + (int) PSCI_VERSION_MINOR(cpu->psci_version)); +} + +static void kvm_set_psci_version(Object *obj, const char *value, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + uint16_t maj, min; + + if (sscanf(value, "%hd.%hd", &maj, &min) != 2) { + error_setg(errp, "Invalid PSCI version."); + return; + } + + cpu->psci_version = PSCI_VERSION(maj, min); +} + /* KVM VCPU properties should be prefixed with "kvm-". */ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) { @@ -506,6 +528,12 @@ void kvm_arm_add_vcpu_properties(ARMCPU *cpu) kvm_steal_time_set); object_property_set_description(obj, "kvm-steal-time", "Set off to disable KVM steal time."); + + object_property_add_str(obj, "kvm-psci-version", kvm_get_psci_version, + kvm_set_psci_version); + object_property_set_description(obj, "kvm-psci-version", + "Set PSCI version. " + "Valid values are 0.1, 0.2, 1.0, 1.1, 1.2, 1.3"); } bool kvm_arm_pmu_supported(void) @@ -1976,8 +2004,12 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cs->start_powered_off) { cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_POWER_OFF; } - if (kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { - cpu->psci_version = QEMU_PSCI_VERSION_0_2; + if (cpu->psci_version != QEMU_PSCI_VERSION_0_1 && + kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PSCI_0_2)) { + /* + * Versions >= v0.2 are backward compatible with v0.2 + * omit the feature flag for v0.1 . + */ cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PSCI_0_2; } if (!arm_feature(env, ARM_FEATURE_AARCH64)) { @@ -2015,6 +2047,18 @@ int kvm_arch_init_vcpu(CPUState *cs) } } + if (cpu->psci_version) { + psciver = cpu->psci_version; + ret = kvm_set_one_reg(cs, KVM_REG_ARM_PSCI_VERSION, &psciver); + if (ret) { + error_report("KVM in this kernel does not support PSCI version %d.%d", + (int) PSCI_VERSION_MAJOR(psciver), + (int) PSCI_VERSION_MINOR(psciver)); + error_printf("Consider setting the kvm-psci-version property on the " + "migration source.\n"); + return ret; + } + } /* * KVM reports the exact PSCI version it is implementing via a * special sysreg. If it is present, use its contents to determine -- 2.52.0