Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp1026690lfm; Thu, 25 Jun 2020 00:06:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTrQ+xfTgvxzLXeoneomUsW04hN+jVdWzfRSfXWD+/+MTLC114sth5ag4NoaGKnH+hsqZ4 X-Received: by 2002:a05:6902:1006:: with SMTP id w6mr52415126ybt.411.1593068789852; Thu, 25 Jun 2020 00:06:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593068789; cv=none; d=google.com; s=arc-20160816; b=YVx/QQpAhBA064ICZuX6t/1WbFvIRp5WUTv2epiyNsSmL6CYkNQkf43iszKNcpMCqF ekYkyW16Y9CB7fYV/LPh7Gv6i6AJ9Z2e4SJReyITTRCfZacSL6dA56HziNElfhMaqEUr 3EZyoHlm7/QFQlmYDprjX3qWNEE+4KZtMzHsTaRbNNurc5zjk/yeH9d8B0hY8LjQ9WzD qgOFKoznjZe5u9e+GTFI0ClEqh9fFCkTjVF9EpN8/u/hZ4A1N6tEE+KL42TE6Yy6KwkP JvEmKWzFT+zz4xgCRC2XrPPKzQwZqwyJS7nkWZwFFiuDjcsQFsEbXdn99mgYCuCSM3+c HitQ== 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:mime-version:user-agent :message-id:in-reply-to:date:references:subject:to:from :dkim-signature; bh=urI8ZLuI8gYgxBNeoCT+usNMkwKZVyHbyyy82nxrsIY=; b=S7qPYDpsJF7C6gA9XuaD1LgB+0XGzz/jNwbz1hMwb0/xem+Vdg/5jYtFhfXtNGPB33 VnYuxXLnA2c+aTHejLt1tDobDPKgDYxSTrRZPAKsV5++zCyD7zbR5R/cnmzWjtpyAGE9 7k+U5UHBBrnQ5ys/r05m9FOu5suyk/DL7yhb2G73vr4D7xqOkQwm07vDP/wPHb/Shfsq s/y+IqYOIuXqWSHdgpCtlV+II+Pg3NqcEqVqjgmMZqadUxdbV3jk0RRdqp2Wsb0XIALx atRQc9+8q7SMqzlY9vdo8bNXq2/TS2CZDEXh2wh5DHvw/69O9dSNysRi/RzH2Kq69rCy mcVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=DZ9q4hMa; 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 h10si1123059ybg.116.2020.06.25.00.06.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jun 2020 00:06:29 -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=DZ9q4hMa; 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]:52930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joLxt-0005CH-6b for alex.bennee@linaro.org; Thu, 25 Jun 2020 03:06:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joLxe-0005CA-23 for qemu-arm@nongnu.org; Thu, 25 Jun 2020 03:06:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23915 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joLxa-0003iR-9L for qemu-arm@nongnu.org; Thu, 25 Jun 2020 03:06:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593068769; 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: in-reply-to:in-reply-to:references:references; bh=urI8ZLuI8gYgxBNeoCT+usNMkwKZVyHbyyy82nxrsIY=; b=DZ9q4hMa88Gw2VIFYJdaTvHNbQcBMPbtxO7RfWTGxFy+UIOBoc3SV5hjDN+MTgGyZWVYI7 MCg5c1KOzylVFXIdOtU+y+0MsPPPeVVuLIZiR7VnEdHSHSN7h80uMnJsniOUhUeO6E3VhV cGBSqACDUhnb7g20tQGuc7X18RqDk2k= 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-440-ODPLS9yHM4e0pwgupt9CCQ-1; Thu, 25 Jun 2020 03:06:07 -0400 X-MC-Unique: ODPLS9yHM4e0pwgupt9CCQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C4B91883608; Thu, 25 Jun 2020 07:06:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F3AB579325; Thu, 25 Jun 2020 07:05:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 80EC711384D4; Thu, 25 Jun 2020 09:05:56 +0200 (CEST) From: Markus Armbruster To: Eric Auger Subject: Re: [PATCH v5 2/5] virtio-iommu: Implement RESV_MEM probe request References: <20200624132625.27453-1-eric.auger@redhat.com> <20200624132625.27453-3-eric.auger@redhat.com> Date: Thu, 25 Jun 2020 09:05:56 +0200 In-Reply-To: <20200624132625.27453-3-eric.auger@redhat.com> (Eric Auger's message of "Wed, 24 Jun 2020 15:26:22 +0200") Message-ID: <87zh8r1v6z.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/25 00:45:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: peter.maydell@linaro.org, mst@redhat.com, qemu-devel@nongnu.org, peterx@redhat.com, jean-philippe@linaro.org, qemu-arm@nongnu.org, pbonzini@redhat.com, bbhushan2@marvell.com, eric.auger.pro@gmail.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Drl6IsABDtpw Eric Auger writes: > This patch implements the PROBE request. At the moment, > only THE RESV_MEM property is handled. The first goal is > to report iommu wide reserved regions such as the MSI regions > set by the machine code. On x86 this will be the IOAPIC MSI > region, [0xFEE00000 - 0xFEEFFFFF], on ARM this may be the ITS > doorbell. > > In the future we may introduce per device reserved regions. > This will be useful when protecting host assigned devices > which may expose their own reserved regions > > Signed-off-by: Eric Auger > Reviewed-by: Jean-Philippe Brucker > > --- > > v4 -> v5: > - assert if reserved region type is different from RESERVED or > MSI > > v3 -> v4: > - removed any reference to the NONE property that does not > exist anymore. > > v2 -> v3: > - on probe, do not fill the reminder of the buffer with zeroes > as the buffer was already zero initialized (Bharat) > > v1 -> v2: > - move the unlock back to the same place > - remove the push label and factorize the code after the out label > - fix a bunch of cpu_to_leX according to the latest spec revision > - do not remove sizeof(last) from free space > - check the ep exists > --- > include/hw/virtio/virtio-iommu.h | 2 + > hw/virtio/virtio-iommu.c | 92 ++++++++++++++++++++++++++++++-- > hw/virtio/trace-events | 1 + > 3 files changed, 91 insertions(+), 4 deletions(-) > > diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h > index e653004d7c..49eb105cd8 100644 > --- a/include/hw/virtio/virtio-iommu.h > +++ b/include/hw/virtio/virtio-iommu.h > @@ -53,6 +53,8 @@ typedef struct VirtIOIOMMU { > GHashTable *as_by_busptr; > IOMMUPciBus *iommu_pcibus_by_bus_num[PCI_BUS_MAX]; > PCIBus *primary_bus; > + ReservedRegion *reserved_regions; > + uint32_t nb_reserved_regions; > GTree *domains; > QemuMutex mutex; > GTree *endpoints; > diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c > index 483883ec1d..aabc3e36b1 100644 > --- a/hw/virtio/virtio-iommu.c > +++ b/hw/virtio/virtio-iommu.c > @@ -38,6 +38,7 @@ > > /* Max size */ > #define VIOMMU_DEFAULT_QUEUE_SIZE 256 > +#define VIOMMU_PROBE_SIZE 512 > > typedef struct VirtIOIOMMUDomain { > uint32_t id; > @@ -378,6 +379,63 @@ static int virtio_iommu_unmap(VirtIOIOMMU *s, > return ret; > } > > +static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep, > + uint8_t *buf, size_t free) > +{ > + struct virtio_iommu_probe_resv_mem prop = {}; > + size_t size = sizeof(prop), length = size - sizeof(prop.head), total; > + int i; > + > + total = size * s->nb_reserved_regions; > + > + if (total > free) { > + return -ENOSPC; > + } > + > + for (i = 0; i < s->nb_reserved_regions; i++) { > + prop.head.type = cpu_to_le16(VIRTIO_IOMMU_PROBE_T_RESV_MEM); > + prop.head.length = cpu_to_le16(length); > + prop.subtype = s->reserved_regions[i].type; > + assert(prop.subtype == VIRTIO_IOMMU_RESV_MEM_T_RESERVED || > + prop.subtype == VIRTIO_IOMMU_RESV_MEM_T_MSI); The assertion makes sense here: we're mapping from the generic ReservedRegion type (which is unsigned) to the specific virtio_iommu_probe_resv_mem subtype (which is uint8_t, but only these two values are valid). Howver, the assertion should test s->reserved_regions[i].type and go before the assignment, to ensure it doesn't truncate! Can I trigger the assertion with -device? My try to find the answer myself failed: $ qemu-system-x86_64 -nodefaults -S -display none -device virtio-iommu-pci,len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:99 qemu-system-x86_64: -device virtio-iommu-pci,len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:99: pc-i440fx-5.1 machine fails to create iommu-map device tree bindings Check you machine implements a hotplug handler for the virtio-iommu-pci device Check the guest is booted without FW or with -no-acpi By the way: s/Check you machine/Check your machine/. [...]