From nobody Tue Dec 16 04:36:33 2025 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=1751906582; cv=none; d=zohomail.com; s=zohoarc; b=GcA5tNTGuxdSuhPgYzFwz0ztdvrkAr7ZFA5xF1hLpn71OuH1X5JwQTynUcOv2SgIkoR1MpWy/+I8LWvRCZe6kM26j6gp370nBkcMPkZYBT8vhWPQ1srHDD5HgKVQ79iiQWeg75IxlAZJwLcCKWnnPtkbp8IwOaf+etVxjizjFjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751906582; h=Content-Transfer-Encoding:Cc:Cc: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; bh=EvJkfowQMft0+a7DbFIwvzF/37WIAn27JEekr737Ov4=; b=mcHG4Td9c+QJ4x7ZdfE2459BlsBTjtkqkFPQiJ414oEJIJELRRCq4f5uW4zZKcoHZVnLipFnjlm9wNVYyQRaXmlBz/mUhm8PQNuIB410F1373hV/kejXtTphI8KgpsO0zQKEi8wzR5AyvMrg8IEu4W34qIkJaCKGY4ZFXb4gTq8= 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 1751906582039922.02516763699; Mon, 7 Jul 2025 09:43:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uYovT-0005Yf-JP; Mon, 07 Jul 2025 12:42:44 -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 1uYovA-0004ni-8v for qemu-devel@nongnu.org; Mon, 07 Jul 2025 12:42:24 -0400 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 1uYouz-00062i-Fy for qemu-devel@nongnu.org; Mon, 07 Jul 2025 12:42:14 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-Qj6cZiQlP0GU32wQXxBILw-1; Mon, 07 Jul 2025 12:42:04 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8196E1955F38; Mon, 7 Jul 2025 16:42:02 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.44.32.187]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DDAE01800288; Mon, 7 Jul 2025 16:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751906531; h=from:from:reply-to:subject:subject: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=EvJkfowQMft0+a7DbFIwvzF/37WIAn27JEekr737Ov4=; b=Lyeq0KzWUj1kmLJfh+JJ3cfcVKllSykkn1um5yeSwuuvxVhs26e+cSvQKtlqmzpPBzswPV 4TpD1YfV15ejZX5OnAk2gJa4a3tWH5YW9Otn0CUBsn6pYlXi9Cpgwv/7DcSYf/OeDCKhIp Zhj2928FGmJPCWUztLGgmDroG/nH/5k= X-MC-Unique: Qj6cZiQlP0GU32wQXxBILw-1 X-Mimecast-MFC-AGG-ID: Qj6cZiQlP0GU32wQXxBILw_1751906522 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, miguel.luis@oracle.com, peter.maydell@linaro.org, richard.henderson@linaro.org, maz@kernel.org, gkulkarni@amperecomputing.com, gankulkarni@os.amperecomputing.com Cc: hi@alyssa.is Subject: [PATCH v9 5/5] hw/arm/virt: Allow virt extensions with KVM Date: Mon, 7 Jul 2025 18:40:31 +0200 Message-ID: <20250707164129.1167837-6-eric.auger@redhat.com> In-Reply-To: <20250707164129.1167837-1-eric.auger@redhat.com> References: <20250707164129.1167837-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 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=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @redhat.com) X-ZM-MESSAGEID: 1751906582760116600 Content-Type: text/plain; charset="utf-8" From: Haibo Xu Up to now virt support on guest has been only supported with TCG. Now it becomes feasible to use it with KVM acceleration. Check neither in-kernel GICv3 nor aarch64=3Doff is used along with KVM EL2. Signed-off-by: Haibo Xu Signed-off-by: Miguel Luis Signed-off-by: Eric Auger Reviewed-by: Richard Henderson --- v8 -> v9: - remove the migration blocker from the machine code as it is now in the GIC code itself. v7 -> v8: - add the migration blocker - s/only is/is only - check aarch64=3Doff - update the commit message v6 -> v7: - rebase on top of "hw/arm/virt: Make EL2 accelerator check an accept-list". I dared to keep Richard's R-b though. v2 -> v3: - check gic version/in-kernel implementation when kvm el2 is set (Peter) v1 -> v2: - fixed test ordering: virt && ((kvm && !kvm_el2) || hvf) [Richard] - tweeked the commit title & message --- hw/arm/virt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 550a272fbb..6f5339aade 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -792,6 +792,13 @@ static void create_gic(VirtMachineState *vms, MemoryRe= gion *mem) default: g_assert_not_reached(); } + + if (kvm_enabled() && vms->virt && + (revision !=3D 3 || !kvm_irqchip_in_kernel())) { + error_report("KVM EL2 is only supported with in-kernel GICv3"); + exit(1); + } + vms->gic =3D qdev_new(gictype); qdev_prop_set_uint32(vms->gic, "revision", revision); qdev_prop_set_uint32(vms->gic, "num-cpu", smp_cpus); @@ -2066,6 +2073,10 @@ static void virt_post_cpus_gic_realized(VirtMachineS= tate *vms, memory_region_init_ram(pvtime, NULL, "pvtime", pvtime_size, NU= LL); memory_region_add_subregion(sysmem, pvtime_reg_base, pvtime); } + if (!aarch64 && vms->virt) { + error_report("vcpu with both EL1_32BIT and HAS_EL2 is not supp= orted"); + exit(1); + } =20 CPU_FOREACH(cpu) { if (pmu) { @@ -2211,7 +2222,8 @@ static void machvirt_init(MachineState *machine) exit(1); } =20 - if (vms->virt && !tcg_enabled() && !qtest_enabled()) { + if (vms->virt && !(kvm_enabled() && kvm_arm_el2_supported()) && + !tcg_enabled() && !qtest_enabled()) { error_report("mach-virt: %s does not support providing " "Virtualization extensions to the guest CPU", current_accel_name()); --=20 2.49.0