From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:690d:0:0:0:0:0 with SMTP id e13csp1932127lfc; Mon, 22 Feb 2021 09:47:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4Rlgjefbp1/0/fr/yPBOYQiacPEgXUcAWIRQqIXeVKyhRiNR6qmttcksf8vScwVQ/zPZr X-Received: by 2002:a5e:9612:: with SMTP id a18mr16118837ioq.209.1614016065829; Mon, 22 Feb 2021 09:47:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614016065; cv=none; d=google.com; s=arc-20160816; b=vjSSnRBIKsQnorih8/oMbkCOftZRi0eEAptooWzmbDcp9rQuHJtpcloLANMnz8OicY SClZ8EBqf8RCXgDflpieUfQd4W+OzckoRCDrAv/tDaBRQSCyc3bwakw/sJiSG7MMTOnE 5XFb8LlsmJ90OXlOoYJdRjD8uhFvKJ+5F/fYVfTGRUQo2ZWVxhjs6jB2TMHeY5b15wNj POoi6GNNQoVy6sBstfJLMuCQj5gZYyFyICY9yTy/gJyVNIqBG4tsqVyu0HTWZPNhbArB fB1sGnKMw1LwhU1XoxSIE0Y8+i70dhm0tBf3i0r72zBZeK5u7ebiunOct0iYJZb/tLXf DrUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:dkim-signature :sender:precedence:errors-to:list-subscribe:list-help:list-post :list-unsubscribe:list-id; bh=ap6wVunjnHQO5CinJJgI7vpNWx2oOiKw2tFNPevDbBQ=; b=NhWrtDoiTUOrv7pFgJJp9wImudjHDL1QV+p2bzxhBwNwC9o1TwfZZJgchdybDkyHMr huAB+myTyJFcnK+35MAbGAhhYcAtAZaqYG9/LsLP32XfeG7C+czt86S7+bYWyr6cfUGN SzALubYfqHBS+/l6M1ylHyoNDfq0sw+/rs3ImfbTHMh7Qt4yf38VoWJLXT2PoyUvGR20 vQgtyRsQExFsoP548iT5c92Cds1PG+7xz+RVWO4zhfT1KWN+IjWD3yXii6dOfC2+rwkU Xh+IGsDhXjXRgE6jKMPdb/h3Wk9jI1DrTUuoPLdJAuYRkEveV8IvIwa2fo9tj+h52t7n Uiiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hktoStxs; spf=pass (google.com: domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id s4si20116546ilv.10.2021.02.22.09.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 09:47:45 -0800 (PST) Received-SPF: pass (google.com: domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hktoStxs; spf=pass (google.com: domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from list by lists.xenproject.org with outflank-mailman.88313.165980 (Exim 4.92) (envelope-from ) id 1lEFID-0007fm-DM; Mon, 22 Feb 2021 17:46:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 88313.165980; Mon, 22 Feb 2021 17:46:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lEFID-0007fe-9U; Mon, 22 Feb 2021 17:46:45 +0000 Received: by outflank-mailman (input) for mailman id 88313; Mon, 22 Feb 2021 17:46:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lEFIB-0007f2-V8 for xen-devel@lists.xenproject.org; Mon, 22 Feb 2021 17:46:43 +0000 Received: from us-smtp-delivery-124.mimecast.com (unknown [63.128.21.124]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id b3979496-2e51-40c7-899d-9e13db34dcc0; Mon, 22 Feb 2021 17:46:43 +0000 (UTC) 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-126-MITzUUf3Oqye6SI3VLeV4w-1; Mon, 22 Feb 2021 12:46:41 -0500 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 BFE62C291; Mon, 22 Feb 2021 17:46:37 +0000 (UTC) Received: from gondolin (ovpn-113-115.ams2.redhat.com [10.36.113.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CA0B5D6B1; Mon, 22 Feb 2021 17:46:23 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b3979496-2e51-40c7-899d-9e13db34dcc0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614016003; 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=ap6wVunjnHQO5CinJJgI7vpNWx2oOiKw2tFNPevDbBQ=; b=hktoStxsYtrUntRoNr2igTcCuInFkkkhEbKLWbzp1SAclnmEoiZnGvDKNq6MHDLf7xC+TB DDrTspxmCwGlb5ecER1nUOR3Wp0GquQBq8UPSPX5dbTFdN3C3ctjuK9OIpHrSQyMx28ZY2 KzBqZ8gnCQziAaW6MtGOFBvviyMPFyY= X-MC-Unique: MITzUUf3Oqye6SI3VLeV4w-1 Date: Mon, 22 Feb 2021 18:46:20 +0100 From: Cornelia Huck To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Cc: qemu-devel@nongnu.org, Aurelien Jarno , Peter Maydell , Anthony Perard , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Halil Pasic , Huacai Chen , xen-devel@lists.xenproject.org, Marcel Apfelbaum , David Gibson , qemu-arm@nongnu.org, Stefano Stabellini , Paolo Bonzini , kvm@vger.kernel.org, BALATON Zoltan , Leif Lindholm , Richard Henderson , Radoslaw Biernacki , Alistair Francis , Paul Durrant , Eduardo Habkost , "Michael S. Tsirkin" , Thomas Huth , Jiaxun Yang , =?UTF-8?B?SGVydsOp?= Poussineau , Greg Kurz , Christian Borntraeger , "Edgar E. Iglesias" , David Hildenbrand , Mark Cave-Ayland , Aleksandar Rikalo , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v2 11/11] softmmu/vl: Exit gracefully when accelerator is not supported Message-ID: <20210222184620.57119057.cohuck@redhat.com> In-Reply-To: <20210219173847.2054123-12-philmd@redhat.com> References: <20210219173847.2054123-1-philmd@redhat.com> <20210219173847.2054123-12-philmd@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-TUID: rkeJThLjRXlO On Fri, 19 Feb 2021 18:38:47 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > Before configuring an accelerator, check it is valid for > the current machine. Doing so we can return a simple error > message instead of criptic one. s/criptic/cryptic/ >=20 > Before: >=20 > $ qemu-system-arm -M raspi2b -enable-kvm > qemu-system-arm: /build/qemu-ETIdrs/qemu-4.2/exec.c:865: cpu_address_sp= ace_init: Assertion `asidx =3D=3D 0 || !kvm_enabled()' failed. > Aborted >=20 > $ qemu-system-aarch64 -M xlnx-zcu102 -enable-kvm -smp 6 > qemu-system-aarch64: kvm_init_vcpu: kvm_arch_init_vcpu failed (0): Inva= lid argument >=20 > After: >=20 > $ qemu-system-arm -M raspi2b -enable-kvm > qemu-system-aarch64: invalid accelerator 'kvm' for machine raspi2b >=20 > $ qemu-system-aarch64 -M xlnx-zcu102 -enable-kvm -smp 6 > qemu-system-aarch64: -accel kvm: invalid accelerator 'kvm' for machine = xlnx-zcu102 >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > softmmu/vl.c | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/softmmu/vl.c b/softmmu/vl.c > index b219ce1f357..f2c4074310b 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -2133,6 +2133,7 @@ static int do_configure_accelerator(void *opaque, Q= emuOpts *opts, Error **errp) > const char *acc =3D qemu_opt_get(opts, "accel"); > AccelClass *ac =3D accel_find(acc); > AccelState *accel; > + MachineClass *mc; > int ret; > bool qtest_with_kvm; > =20 > @@ -2145,6 +2146,12 @@ static int do_configure_accelerator(void *opaque, = QemuOpts *opts, Error **errp) > } > return 0; > } > + mc =3D MACHINE_GET_CLASS(current_machine); > + if (!qtest_chrdev && !machine_class_valid_for_accelerator(mc, ac->na= me)) { Shouldn't qtest be already allowed in any case in the checking function? > + *p_init_failed =3D true; > + error_report("invalid accelerator '%s' for machine %s", acc, mc-= >name); > + return 0; > + } > accel =3D ACCEL(object_new_with_class(OBJECT_CLASS(ac))); > object_apply_compat_props(OBJECT(accel)); > qemu_opt_foreach(opts, accelerator_set_property, 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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74FDEC433E0 for ; Mon, 22 Feb 2021 17:56:46 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1534464E15 for ; Mon, 22 Feb 2021 17:56:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1534464E15 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEFRt-0008TR-4X for qemu-devel@archiver.kernel.org; Mon, 22 Feb 2021 12:56:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEFIF-0007hY-FE for qemu-devel@nongnu.org; Mon, 22 Feb 2021 12:46:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEFIC-0001q6-4g for qemu-devel@nongnu.org; Mon, 22 Feb 2021 12:46:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614016003; 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=ap6wVunjnHQO5CinJJgI7vpNWx2oOiKw2tFNPevDbBQ=; b=hktoStxsYtrUntRoNr2igTcCuInFkkkhEbKLWbzp1SAclnmEoiZnGvDKNq6MHDLf7xC+TB DDrTspxmCwGlb5ecER1nUOR3Wp0GquQBq8UPSPX5dbTFdN3C3ctjuK9OIpHrSQyMx28ZY2 KzBqZ8gnCQziAaW6MtGOFBvviyMPFyY= 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-126-MITzUUf3Oqye6SI3VLeV4w-1; Mon, 22 Feb 2021 12:46:41 -0500 X-MC-Unique: MITzUUf3Oqye6SI3VLeV4w-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 BFE62C291; Mon, 22 Feb 2021 17:46:37 +0000 (UTC) Received: from gondolin (ovpn-113-115.ams2.redhat.com [10.36.113.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CA0B5D6B1; Mon, 22 Feb 2021 17:46:23 +0000 (UTC) Date: Mon, 22 Feb 2021 18:46:20 +0100 From: Cornelia Huck To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v2 11/11] softmmu/vl: Exit gracefully when accelerator is not supported Message-ID: <20210222184620.57119057.cohuck@redhat.com> In-Reply-To: <20210219173847.2054123-12-philmd@redhat.com> References: <20210219173847.2054123-1-philmd@redhat.com> <20210219173847.2054123-12-philmd@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Received-SPF: pass client-ip=63.128.21.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , kvm@vger.kernel.org, Paul Durrant , David Hildenbrand , qemu-devel@nongnu.org, "Edgar E. Iglesias" , Stefano Stabellini , "Michael S. Tsirkin" , Huacai Chen , Halil Pasic , Christian Borntraeger , =?UTF-8?B?SGVydsOp?= Poussineau , Anthony Perard , xen-devel@lists.xenproject.org, Leif Lindholm , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Alistair Francis , Richard Henderson , Greg Kurz , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, David Gibson , Radoslaw Biernacki , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , qemu-ppc@nongnu.org, Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 19 Feb 2021 18:38:47 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > Before configuring an accelerator, check it is valid for > the current machine. Doing so we can return a simple error > message instead of criptic one. s/criptic/cryptic/ >=20 > Before: >=20 > $ qemu-system-arm -M raspi2b -enable-kvm > qemu-system-arm: /build/qemu-ETIdrs/qemu-4.2/exec.c:865: cpu_address_sp= ace_init: Assertion `asidx =3D=3D 0 || !kvm_enabled()' failed. > Aborted >=20 > $ qemu-system-aarch64 -M xlnx-zcu102 -enable-kvm -smp 6 > qemu-system-aarch64: kvm_init_vcpu: kvm_arch_init_vcpu failed (0): Inva= lid argument >=20 > After: >=20 > $ qemu-system-arm -M raspi2b -enable-kvm > qemu-system-aarch64: invalid accelerator 'kvm' for machine raspi2b >=20 > $ qemu-system-aarch64 -M xlnx-zcu102 -enable-kvm -smp 6 > qemu-system-aarch64: -accel kvm: invalid accelerator 'kvm' for machine = xlnx-zcu102 >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > softmmu/vl.c | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/softmmu/vl.c b/softmmu/vl.c > index b219ce1f357..f2c4074310b 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -2133,6 +2133,7 @@ static int do_configure_accelerator(void *opaque, Q= emuOpts *opts, Error **errp) > const char *acc =3D qemu_opt_get(opts, "accel"); > AccelClass *ac =3D accel_find(acc); > AccelState *accel; > + MachineClass *mc; > int ret; > bool qtest_with_kvm; > =20 > @@ -2145,6 +2146,12 @@ static int do_configure_accelerator(void *opaque, = QemuOpts *opts, Error **errp) > } > return 0; > } > + mc =3D MACHINE_GET_CLASS(current_machine); > + if (!qtest_chrdev && !machine_class_valid_for_accelerator(mc, ac->na= me)) { Shouldn't qtest be already allowed in any case in the checking function? > + *p_init_failed =3D true; > + error_report("invalid accelerator '%s' for machine %s", acc, mc-= >name); > + return 0; > + } > accel =3D ACCEL(object_new_with_class(OBJECT_CLASS(ac))); > object_apply_compat_props(OBJECT(accel)); > qemu_opt_foreach(opts, accelerator_set_property,