Received: by 2002:a19:f015:0:0:0:0:0 with SMTP id p21csp761041lfc; Wed, 11 Mar 2020 06:19:08 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvtB/6+gdtEN0XgGUIqCHiiD3mIOd3YvrNtujCjO6fxztMwHNSVibMkUu3/7Io0vSKbZtfF X-Received: by 2002:ac8:7b2f:: with SMTP id l15mr2513520qtu.320.1583932748112; Wed, 11 Mar 2020 06:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583932748; cv=none; d=google.com; s=arc-20160816; b=AOcI2HzHCtWhjcoN8usG9oKBW2HLFaWKRG4QZfXDN0EeebInCJgCslsZQ0T4eSwezs RnGVGMVMCXJwMn7dvOXcku8lGP8avcvQ9xdY+QMCesyVM74aZFmuzUG35DFK/QYjqQ4D K0XRzkqNeTkY1+NmLZYohQ7qLm3yiTwBUuef7bBQZw9NGi2PJx+RWBuNPxM/kn6GeyZx y/+zqgMO8uf9LmXFLyHoFWACX30CkzUl+kYctJ/mLm1V90xmEipkJYWM0buPNUVFH1P8 zELl/yyQQif17e+iPvklNqa/J13X1QnyK1DRMos01HFb1aUt/7owef+iU81hIpoTkJJV DSUA== 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=S1eU7BPm/c9T0kTdmTbB7QHipunZUQL/LFlPAkqMmDI=; b=jraG/Th3x3mda5q5mfQgHdqBAi1fJlLuz1jovt1EnnVJl5Q94ocBHdwWCaey6Lqb91 CjnNMb/8uEF2GTpu9SzfXceaFHiusQ/inPlMEBaKRZlJ85xjkLOKTMxG3m5rrYWAaX4V 5LN0zXBBFy8D38wZDcecMw5vZRFPUbg7YOpRYkfC20vzDKkgN8d1dAlhLRGQH4TA1suE J8iQMDV8Hd6kA3FnWo6PAyoPeOWhg4ktw9Y2xXljnqtYRsbRYAXLGixeSDNksegpdMZ0 TstpD7FAkwKsLvue2gEZVj9HidJkulH71QOlIvKJZ2uc6uDyWwdNJ1aoD2h7stNDEgqO gSAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=U0l5RQcj; 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=fail (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 i7si943488qkk.245.2020.03.11.06.19.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Mar 2020 06:19:08 -0700 (PDT) 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=fail header.i=@redhat.com header.s=mimecast20190719 header.b=U0l5RQcj; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:51714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC1GN-0007v8-F2 for alex.bennee@linaro.org; Wed, 11 Mar 2020 09:19:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56792) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC1EM-0002I3-Jy for qemu-arm@nongnu.org; Wed, 11 Mar 2020 09:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC1EL-0008NV-FY for qemu-arm@nongnu.org; Wed, 11 Mar 2020 09:17:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47529 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 1jC1EL-0008Me-Ac for qemu-arm@nongnu.org; Wed, 11 Mar 2020 09:17:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583932621; 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=S1eU7BPm/c9T0kTdmTbB7QHipunZUQL/LFlPAkqMmDI=; b=U0l5RQcjhlCf77OzLAamCLMfjnkMfgDbu1VHh6buSbcbQql6kWv8xZwEQfz+VZoWLtzXyF 2/k3QR70dFmZAkirDtYAexfiJ0X60KDst/qtxe+gol2Iilw9+MsdWLbqtx8GLDIeJV4Dsu F/GSgiZ1R1E5NFucKC6W2aHE4A18nOM= 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-274-Vk1Gs3q6NJqrvPL7Lp3yKA-1; Wed, 11 Mar 2020 09:16:59 -0400 X-MC-Unique: Vk1Gs3q6NJqrvPL7Lp3yKA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B894189F760; Wed, 11 Mar 2020 13:16:58 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C1B573880; Wed, 11 Mar 2020 13:16:52 +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 v5 6/6] hw/arm/virt: kvm: allow gicv3 by default if v2 cannot work Date: Wed, 11 Mar 2020 14:16:18 +0100 Message-Id: <20200311131618.7187-7-eric.auger@redhat.com> In-Reply-To: <20200311131618.7187-1-eric.auger@redhat.com> References: <20200311131618.7187-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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, richard.henderson@linaro.org, philmd@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: XMRpLJMJxaOa 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 Reviewed-by: Andrew Jones --- v4 -> v5: - else if (max_cpus > GIC_NCPU) - Added Drew's R-b v3 -> v4: - Deal with the case where v3 is not supported by the host and the number of vcpus exceeds 8 v2 -> v3: - add () --- hw/arm/virt.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 90966580a3..94f93dda54 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1543,6 +1543,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; =20 @@ -1582,7 +1584,20 @@ static void finalize_gic_version(VirtMachineState *v= ms) } return; 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= ) { + vms->gic_version =3D VIRT_GIC_VERSION_2; + } else if (probe_bitmap & KVM_ARM_VGIC_V3) { + /* + * 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; + } else if (max_cpus > GIC_NCPU) { + error_report("host only supports in-kernel GICv2 emulation= " + "but more than 8 vcpus are requested"); + exit(1); + } break; case VIRT_GIC_VERSION_2: case VIRT_GIC_VERSION_3: --=20 2.20.1