Received: by 2002:a19:cb43:0:0:0:0:0 with SMTP id b64csp1242785lfg; Sun, 1 Mar 2020 02:43:01 -0800 (PST) X-Google-Smtp-Source: APXvYqzCUTbtIiqSeipN7RrNi8OrDQQZBlKBfj3LDiyhyOLmFf/RW2DyeMpwoJN3QS2H2pm0t/KK X-Received: by 2002:a0c:c250:: with SMTP id w16mr10360805qvh.24.1583059380958; Sun, 01 Mar 2020 02:43:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583059380; cv=none; d=google.com; s=arc-20160816; b=0w+l++hDKywfpWINLdxXxz2gl+9jZ9JLh6YE9NIjIRkCSDelZS49v1xexAAQ4M1KUp O6T6Um99ycrFx4Bc14texciJo3Btlnjgtkp4FZdL8Ok8x3I3kckn8jm86U1N0gkJtYlw EOtUtKEkG4/YiyQE+EXmSwUK64WSpQ2ytNBZPsDZKL7Z+EifGObEJ/EUVBShvxyYsWWs MiQVZcX+CYdN3tPOsiorELtiSkY6AzLfOfBZHLOFlm5z/yCBedhPM/A5dO4sn+n84fjP WdXdABsO1AGqw2HwYJInuMoNDosvx9B/mNgWOwnXquOiVXkgVMLhB/YtEJ4EGfvDjSgW PXPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=/PfT/l8PmlPfpYXOLH7rb/lsJEybZL4C79XAA00tJhE=; b=o9KmsQGmIYUa0cCP0B8CwR5KF3huM5ls0Bv7zp3HwZBNCCaf+VoJVar0OXfkOvj1o1 LZF1189Ugv0o5VL6datqVQf4umQ8293k2HCTR/Y/Fynw0lEWSh6MkzT0HmTmDqQKerNy VrlrkitBg4wRe1LVgBF1bJ4C00cvjqiuu63AGr/iEh7svpHzEg/mqN0ezvc353XCCniC jpC0WH5YWvlke/COhUKdmRu0XFKZlHors2+FVSPbu3qGId75yH1U5LVZjsabynSYIOwJ 0Fr14vwCsgcjZ232uFvRBeyocQGMINkAUWeztHqAS4De+x0QpxGfuxbrftTKAdS57/Gz xQEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dFQRdYej; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p18si251872qki.235.2020.03.01.02.43.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 01 Mar 2020 02:43:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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=@redhat.com header.s=mimecast20190719 header.b=dFQRdYej; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:47554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8M3o-0005qb-Df for alex.bennee@linaro.org; Sun, 01 Mar 2020 05:43:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53123) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8M23-0001wf-FL for qemu-arm@nongnu.org; Sun, 01 Mar 2020 05:41:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8M22-0001oq-F7 for qemu-arm@nongnu.org; Sun, 01 Mar 2020 05:41:11 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43897 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8M22-0001ok-BY for qemu-arm@nongnu.org; Sun, 01 Mar 2020 05:41:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583059270; 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=/PfT/l8PmlPfpYXOLH7rb/lsJEybZL4C79XAA00tJhE=; b=dFQRdYeju6sMEcbz1KFQahH9K2UHg5xSPlcPRU2KwxqC1B7w3zP5HRL2PQW1e9OLyjp3a3 j8+ZvIm6kBbjyhBo9wyP+mkyVtblf6vxRW/ETObkkgcse8z0xUNOtuti6TyJECxx6p+6gG hxGUQ1hIq+VUql/VQ7qH5ytaFd2Io5I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-jskvppMnNkanzehtZpWQ2g-1; Sun, 01 Mar 2020 05:41:06 -0500 X-MC-Unique: jskvppMnNkanzehtZpWQ2g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F22B189F760; Sun, 1 Mar 2020 10:41:05 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECA4560C80; Sun, 1 Mar 2020 10:41:00 +0000 (UTC) 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 Subject: [PATCH v2 6/6] hw/arm/virt: kvm: allow gicv3 by default if v2 cannot work Date: Sun, 1 Mar 2020 11:40:40 +0100 Message-Id: <20200301104040.15186-7-eric.auger@redhat.com> In-Reply-To: <20200301104040.15186-1-eric.auger@redhat.com> References: <20200301104040.15186-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maz@kernel.org, drjones@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: D5skVXVRxRwI At the moment if the end-user does not specify the gic-version along with KVM acceleration, v2 is set by default. However most of the systems now have GICv3 and sometimes they do not support GICv2 compatibility. This patch keeps the default v2 selection in all cases except in the KVM accelerated mode when either - the host does not support GICv2 in-kernel emulation or - number of VCPUS exceeds 8. Those cases did not work anyway so we do not break any compatibility. Now we get v3 selected in such a case. Signed-off-by: Eric Auger Reported-by: Dr. David Alan Gilbert --- 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 610bfc9ee9..2d12a7b0b8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1542,6 +1542,8 @@ static void virt_set_memmap(VirtMachineState *vms) */ static void finalize_gic_version(VirtMachineState *vms) { + unsigned int max_cpus =3D MACHINE(vms)->smp.max_cpus; + if (kvm_enabled()) { int probe_bitmap =3D kvm_arm_vgic_probe(); =20 @@ -1552,7 +1554,17 @@ static void finalize_gic_version(VirtMachineState *v= ms) =20 switch (vms->gic_version) { case VIRT_GIC_VERSION_NOSEL: - vms->gic_version =3D VIRT_GIC_VERSION_2; + if ((probe_bitmap & KVM_ARM_VGIC_V2 && max_cpus <=3D GIC_NCPU)= || + !kvm_irqchip_in_kernel()) { + vms->gic_version =3D VIRT_GIC_VERSION_2; + } else { + /* + * in case the host does not support v2 in-kernel emulatio= n or + * the end-user requested more than 8 VCPUs we now default + * to v3. In any case defaulting to v2 would be broken. + */ + vms->gic_version =3D VIRT_GIC_VERSION_3; + } break; case VIRT_GIC_VERSION_HOST: case VIRT_GIC_VERSION_MAX: --=20 2.20.1