From nobody Fri May 9 21:46:24 2025
Delivered-To: importer@patchew.org
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;
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=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1584032651; cv=none;
d=zohomail.com; s=zohoarc;
b=GzCSSF31/CtBqv87rIbGSBJ1ytO8dipTq0dla1y5gUEWTeUkoCF+xS67OT6f+uX7wZQ0mgYDh+K5Gbe4IVNeaR0fWUYTfE2KUxqdEes6SgWLOw9e875YVuWNHuiX3QTZ1Z0SuppGQIM+E4KgAc5QwH4QzP83cPdhK7cGmmlJ2nM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1584032651;
h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=KTIuh78cMB59hpCH/7alRZC339vDDeP7d5J9NS8IDKc=;
b=j+SCrJLTQaz3moJnuKNptPDsp8JSg1cI43AXnYoYTr5aXdbmlEDg3UHxy+8eJenkUXgV4AmOJbXOfUNvXQTnbqaounuWC6kRfANyIdXxfR1KBIhvPMHPxW37u7s6nRQatE328/MoC6fy0j8nB3pN8JPz/oUdf4D3fJOhCSzC8+c=
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=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1584032651810693.1771225606892;
Thu, 12 Mar 2020 10:04:11 -0700 (PDT)
Received: from localhost ([::1]:45992 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1jCRFi-0006pY-JZ
for importer@patchew.org; Thu, 12 Mar 2020 13:04:10 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:35952)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <peter.maydell@linaro.org>) id 1jCQxt-0000vz-Gc
for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <peter.maydell@linaro.org>) id 1jCQxs-0005KE-4g
for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:45 -0400
Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37817)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.71) (envelope-from <peter.maydell@linaro.org>)
id 1jCQxr-0005Jn-UA
for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:45:44 -0400
Received: by mail-wm1-x32b.google.com with SMTP id a141so7117476wme.2
for <qemu-devel@nongnu.org>; Thu, 12 Mar 2020 09:45:43 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j15sm36838640wrp.85.2020.03.12.09.45.41
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 12 Mar 2020 09:45:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=KTIuh78cMB59hpCH/7alRZC339vDDeP7d5J9NS8IDKc=;
b=vIQ7c1kdFihJyJgt8OTI4KkvxngEdn4+YSLhpCL0SJ6y43JBpS5wJKJNFznjdtDShN
p7aW2ZQ4K7SoQsSEgKS94ctVU7Mlm02pDrkpv//ZBaWiggqIXQr4ZEqYOAD8obeRBfOB
jsa3CbET2iHQNfzMSzUbudWSK8RiXlAIJBpj4grBINnpjizb84enWrto9g5Zt0QhYqwJ
CP+l6kE998sS1g1q8gvDBia0IkE4l1Bu2dRL/fZZhNPRX0nX3LMG7TjXPm6vAYtwYcQF
ly7RKiiAhQl/8dKOqM8g3UDHg1EPAa5z7Co6g5S7drm1f2S8PHIDzkvdtlKoEzcdfVYX
rsOg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=KTIuh78cMB59hpCH/7alRZC339vDDeP7d5J9NS8IDKc=;
b=NlR2GC5KSS9FNG4b41cA7b5M7J4Sj0GsG/ltOejGmpBbBhnWy2Wy5zbWRsuho0qosJ
2wEhXda8j5GJMFXItbe1aovSmY+Cicw9Cqf1HYvbifqs/hrC4LCAzKWGK/iGKqZHqqJ9
qL13Hhi8X2QlIluQQQgn6NyVzs/3bIH9ZaXA0odh+k6h/aICwT4R8eQQDCC0zNsdyqxS
2e6padlOd2KUxBgpp2rKil/c2kbFp6cKrGZ+Vj3HoXspyIcklbt7C9mNQSIKRbgc6R6o
Gir7jFoeJQPOoNohjNdfld3bGvnhCtUp8v/by8tQbplMXTfoYwtAA/6Eam06tAsHBwEc
0KvA==
X-Gm-Message-State: ANhLgQ13FIonTHYdRGM/gseBABlF3Ns07dGO5K0B7Zygvim4HFaQUhuc
S3QNCZfcovPfmaQ4yUTR00U1gef38ZnbqA==
X-Google-Smtp-Source:
ADFU+vtJiC4yyh9KLUG2vn7iPAKG7Z055CBbFZjVkUCo+8smM5qJEn6qKx7vnTLP9uTsJao1CAujWQ==
X-Received: by 2002:a7b:c10c:: with SMTP id w12mr3125030wmi.162.1584031542313;
Thu, 12 Mar 2020 09:45:42 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 34/36] hw/arm/virt: kvm: Restructure finalize_gic_version()
Date: Thu, 12 Mar 2020 16:44:57 +0000
Message-Id: <20200312164459.25924-35-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200312164459.25924-1-peter.maydell@linaro.org>
References: <20200312164459.25924-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 2a00:1450:4864:20::32b
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
Content-Type: text/plain; charset="utf-8"
From: Eric Auger <eric.auger@redhat.com>
Restructure the finalize_gic_version with switch cases and
clearly separate the following cases:
- KVM mode / in-kernel irqchip
- KVM mode / userspace irqchip
- TCG mode
In KVM mode / in-kernel irqchip , we explictly check whether
the chosen version is supported by the host. If the end-user
explicitly sets v2/v3 and this is not supported by the host,
then the user gets an explicit error message. Note that for
old kernels where the CREATE_DEVICE ioctl doesn't exist then
we will now fail if the user specifically asked for gicv2,
where previously we (probably) would have succeeded.
In KVM mode / userspace irqchip we immediatly output an error
in case the end-user explicitly selected v3. Also we warn the
end-user about the unexpected usage of gic-version=3Dhost in
that case as only userspace GICv2 is supported.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 20200311131618.7187-6-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/virt.c | 88 +++++++++++++++++++++++++++++++++++++++------------
1 file changed, 67 insertions(+), 21 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a94bc5ddae5..90966580a3d 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1543,33 +1543,79 @@ static void virt_set_memmap(VirtMachineState *vms)
*/
static void finalize_gic_version(VirtMachineState *vms)
{
- if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST ||
- vms->gic_version =3D=3D VIRT_GIC_VERSION_MAX) {
- if (!kvm_enabled()) {
- if (vms->gic_version =3D=3D VIRT_GIC_VERSION_HOST) {
- error_report("gic-version=3Dhost requires KVM");
- exit(1);
- } else {
- /* "max": currently means 3 for TCG */
- vms->gic_version =3D VIRT_GIC_VERSION_3;
- }
- } else {
- int probe_bitmap =3D kvm_arm_vgic_probe();
+ if (kvm_enabled()) {
+ int probe_bitmap;
=20
- if (!probe_bitmap) {
+ if (!kvm_irqchip_in_kernel()) {
+ switch (vms->gic_version) {
+ case VIRT_GIC_VERSION_HOST:
+ warn_report(
+ "gic-version=3Dhost not relevant with kernel-irqchip=
=3Doff "
+ "as only userspace GICv2 is supported. Using v2 ...");
+ return;
+ case VIRT_GIC_VERSION_MAX:
+ case VIRT_GIC_VERSION_NOSEL:
+ vms->gic_version =3D VIRT_GIC_VERSION_2;
+ return;
+ case VIRT_GIC_VERSION_2:
+ return;
+ case VIRT_GIC_VERSION_3:
error_report(
- "Unable to determine GIC version supported by host");
+ "gic-version=3D3 is not supported with kernel-irqchip=
=3Doff");
exit(1);
- } else {
- if (probe_bitmap & KVM_ARM_VGIC_V3) {
- vms->gic_version =3D VIRT_GIC_VERSION_3;
- } else {
- vms->gic_version =3D VIRT_GIC_VERSION_2;
- }
}
}
- } else if (vms->gic_version =3D=3D VIRT_GIC_VERSION_NOSEL) {
+
+ probe_bitmap =3D kvm_arm_vgic_probe();
+ if (!probe_bitmap) {
+ error_report("Unable to determine GIC version supported by hos=
t");
+ exit(1);
+ }
+
+ switch (vms->gic_version) {
+ case VIRT_GIC_VERSION_HOST:
+ case VIRT_GIC_VERSION_MAX:
+ if (probe_bitmap & KVM_ARM_VGIC_V3) {
+ vms->gic_version =3D VIRT_GIC_VERSION_3;
+ } else {
+ vms->gic_version =3D VIRT_GIC_VERSION_2;
+ }
+ return;
+ case VIRT_GIC_VERSION_NOSEL:
+ vms->gic_version =3D VIRT_GIC_VERSION_2;
+ break;
+ case VIRT_GIC_VERSION_2:
+ case VIRT_GIC_VERSION_3:
+ break;
+ }
+
+ /* Check chosen version is effectively supported by the host */
+ if (vms->gic_version =3D=3D VIRT_GIC_VERSION_2 &&
+ !(probe_bitmap & KVM_ARM_VGIC_V2)) {
+ error_report("host does not support in-kernel GICv2 emulation"=
);
+ exit(1);
+ } else if (vms->gic_version =3D=3D VIRT_GIC_VERSION_3 &&
+ !(probe_bitmap & KVM_ARM_VGIC_V3)) {
+ error_report("host does not support in-kernel GICv3 emulation"=
);
+ exit(1);
+ }
+ return;
+ }
+
+ /* TCG mode */
+ switch (vms->gic_version) {
+ case VIRT_GIC_VERSION_NOSEL:
vms->gic_version =3D VIRT_GIC_VERSION_2;
+ break;
+ case VIRT_GIC_VERSION_MAX:
+ vms->gic_version =3D VIRT_GIC_VERSION_3;
+ break;
+ case VIRT_GIC_VERSION_HOST:
+ error_report("gic-version=3Dhost requires KVM");
+ exit(1);
+ case VIRT_GIC_VERSION_2:
+ case VIRT_GIC_VERSION_3:
+ break;
}
}
=20
--=20
2.20.1