From nobody Sun Apr 13 14:09:43 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601461820; cv=none; d=zohomail.com; s=zohoarc; b=jDJbepjgac8qWgj1sp4eFPMvfqpM4IateyVmYv1smuOUIj3iBNRFp2pw9lPb/ZMXPe0RqiHdEl4+QVUpYbo1UFebdtzAzSIECPaI2fDbX5DItX3OHVes2o5yQUZLG4o4foTYVd4NxDZybxeFDPmN2Kd2J+mTGqV8a6nouY2viFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601461820; h=Content-Type:Content-Transfer-Encoding:Cc: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=Iw7X2p7YYXMxl+sUC13M4JpxwUWm2sy3GOYYoD4ZpLQ=; b=h3UJQGWIYUYH8L8I0GDpIQTlkbTxkrNhAwt5EsJIq1xnW+iT9+2vGGgcM8//fqTMH7PHh25OGx68rIG9bI1IEyhumZTuYTpTyzDoSJYV0klrefthtRckbg7jncJoeF0pKoWUTouQw4FQdlEptv6qvW1/iuCLJQGIHC1wTSUvnGQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16014618202071010.4330431170479; Wed, 30 Sep 2020 03:30:20 -0700 (PDT) Received: from localhost ([::1]:60552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNZNK-0000OW-Te for importer@patchew.org; Wed, 30 Sep 2020 06:30:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNZ82-0004Ku-SN for qemu-devel@nongnu.org; Wed, 30 Sep 2020 06:14:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46274) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNZ80-00067a-Sq for qemu-devel@nongnu.org; Wed, 30 Sep 2020 06:14:30 -0400 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-540-65_F-2KSP0ac262DAl_17w-1; Wed, 30 Sep 2020 06:14:26 -0400 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 E8C8E802B47; Wed, 30 Sep 2020 10:14:24 +0000 (UTC) Received: from localhost (ovpn-114-33.ams2.redhat.com [10.36.114.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50BE178831; Wed, 30 Sep 2020 10:14:17 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601460868; 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=Iw7X2p7YYXMxl+sUC13M4JpxwUWm2sy3GOYYoD4ZpLQ=; b=X7weAn+V5QVRWVHzl6OrzRNp1IT+cKMbzOSFuP6nEqhl38PWqM/ksrhyF7g+/ciShBmb4g uy9psjF8c9Np8poSl3SK+0Rh/1sWfdYhBJnYfuvWaYqijZTa2rMSAjw7A1L4doDln6p8be DX06wqNb1jIilRUrNbS5zkfq/rEkusw= X-MC-Unique: 65_F-2KSP0ac262DAl_17w-1 From: Stefan Hajnoczi To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 16/17] util/vfio-helpers: Collect IOVA reserved regions Date: Wed, 30 Sep 2020 11:13:04 +0100 Message-Id: <20200930101305.305302-17-stefanha@redhat.com> In-Reply-To: <20200930101305.305302-1-stefanha@redhat.com> References: <20200930101305.305302-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/30 00:31:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Kevin Wolf , Fam Zheng , Eduardo Habkost , qemu-block@nongnu.org, Max Reitz , Eric Auger , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Eric Auger The IOVA allocator currently ignores host reserved regions. As a result some chosen IOVAs may collide with some of them, resulting in VFIO MAP_DMA errors later on. This happens on ARM where the MSI reserved window quickly is encountered: [0x8000000, 0x8100000]. since 5.4 kernel, VFIO returns the usable IOVA regions. So let's enumerate them in the prospect to avoid them, later on. Signed-off-by: Eric Auger Message-id: 20200929085550.30926-2-eric.auger@redhat.com Signed-off-by: Stefan Hajnoczi --- util/vfio-helpers.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 9ac307e3d4..fe9ca9ce38 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -40,6 +40,11 @@ typedef struct { uint64_t iova; } IOVAMapping; =20 +struct IOVARange { + uint64_t start; + uint64_t end; +}; + struct QEMUVFIOState { QemuMutex lock; =20 @@ -49,6 +54,8 @@ struct QEMUVFIOState { int device; RAMBlockNotifier ram_notifier; struct vfio_region_info config_region_info, bar_region_info[6]; + struct IOVARange *usable_iova_ranges; + uint8_t nb_iova_ranges; =20 /* These fields are protected by @lock */ /* VFIO's IO virtual address space is managed by splitting into a few @@ -236,6 +243,35 @@ static int qemu_vfio_pci_write_config(QEMUVFIOState *s= , void *buf, int size, int return ret =3D=3D size ? 0 : -errno; } =20 +static void collect_usable_iova_ranges(QEMUVFIOState *s, void *buf) +{ + struct vfio_iommu_type1_info *info =3D (struct vfio_iommu_type1_info *= )buf; + struct vfio_info_cap_header *cap =3D (void *)buf + info->cap_offset; + struct vfio_iommu_type1_info_cap_iova_range *cap_iova_range; + int i; + + while (cap->id !=3D VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE) { + if (!cap->next) { + return; + } + cap =3D (struct vfio_info_cap_header *)(buf + cap->next); + } + + cap_iova_range =3D (struct vfio_iommu_type1_info_cap_iova_range *)cap; + + s->nb_iova_ranges =3D cap_iova_range->nr_iovas; + if (s->nb_iova_ranges > 1) { + s->usable_iova_ranges =3D + g_realloc(s->usable_iova_ranges, + s->nb_iova_ranges * sizeof(struct IOVARange)); + } + + for (i =3D 0; i < s->nb_iova_ranges; i++) { + s->usable_iova_ranges[i].start =3D cap_iova_range->iova_ranges[i].= start; + s->usable_iova_ranges[i].end =3D cap_iova_range->iova_ranges[i].en= d; + } +} + static int qemu_vfio_init_pci(QEMUVFIOState *s, const char *device, Error **errp) { @@ -243,10 +279,13 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const= char *device, int i; uint16_t pci_cmd; struct vfio_group_status group_status =3D { .argsz =3D sizeof(group_st= atus) }; - struct vfio_iommu_type1_info iommu_info =3D { .argsz =3D sizeof(iommu_= info) }; + struct vfio_iommu_type1_info *iommu_info =3D NULL; + size_t iommu_info_size =3D sizeof(*iommu_info); struct vfio_device_info device_info =3D { .argsz =3D sizeof(device_inf= o) }; char *group_file =3D NULL; =20 + s->usable_iova_ranges =3D NULL; + /* Create a new container */ s->container =3D open("/dev/vfio/vfio", O_RDWR); =20 @@ -310,13 +349,35 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const= char *device, goto fail; } =20 + iommu_info =3D g_malloc0(iommu_info_size); + iommu_info->argsz =3D iommu_info_size; + /* Get additional IOMMU info */ - if (ioctl(s->container, VFIO_IOMMU_GET_INFO, &iommu_info)) { + if (ioctl(s->container, VFIO_IOMMU_GET_INFO, iommu_info)) { error_setg_errno(errp, errno, "Failed to get IOMMU info"); ret =3D -errno; goto fail; } =20 + /* + * if the kernel does not report usable IOVA regions, choose + * the legacy [QEMU_VFIO_IOVA_MIN, QEMU_VFIO_IOVA_MAX -1] region + */ + s->nb_iova_ranges =3D 1; + s->usable_iova_ranges =3D g_new0(struct IOVARange, 1); + s->usable_iova_ranges[0].start =3D QEMU_VFIO_IOVA_MIN; + s->usable_iova_ranges[0].end =3D QEMU_VFIO_IOVA_MAX - 1; + + if (iommu_info->argsz > iommu_info_size) { + iommu_info_size =3D iommu_info->argsz; + iommu_info =3D g_realloc(iommu_info, iommu_info_size); + if (ioctl(s->container, VFIO_IOMMU_GET_INFO, iommu_info)) { + ret =3D -errno; + goto fail; + } + collect_usable_iova_ranges(s, iommu_info); + } + s->device =3D ioctl(s->group, VFIO_GROUP_GET_DEVICE_FD, device); =20 if (s->device < 0) { @@ -365,8 +426,13 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const = char *device, if (ret) { goto fail; } + g_free(iommu_info); return 0; fail: + g_free(s->usable_iova_ranges); + s->usable_iova_ranges =3D NULL; + s->nb_iova_ranges =3D 0; + g_free(iommu_info); close(s->group); fail_container: close(s->container); @@ -716,6 +782,8 @@ void qemu_vfio_close(QEMUVFIOState *s) qemu_vfio_undo_mapping(s, &s->mappings[i], NULL); } ram_block_notifier_remove(&s->ram_notifier); + g_free(s->usable_iova_ranges); + s->nb_iova_ranges =3D 0; qemu_vfio_reset(s); close(s->device); close(s->group); --=20 2.26.2